test: undid some test changes I didn't intend to commit

Author: stevebillings

src/test/java/com/synopsys/integration/blackduck/imageinspector/api/ImageInspectorApiIntTest.java

@@ -53,8 +53,7 @@ public class ImageInspectorApiIntTest {
     private static final String MULTILAYER_IMAGE_TARFILE = "build/images/test/centos_minus_vim_plus_bacula.tar";
     private static final String NOPKGMGR_IMAGE_TARFILE = "build/images/test/nopkgmgr.tar";
     // TODO need to build this:
-    //private static final String OCI_IMAGE_TARFILE = "/tmp/ccc/centos_minus_vim_plus_bacula-oci.tar";
-    private static final String OCI_IMAGE_TARFILE = "/tmp/ggg/u_multi_tagged.tar";
+    private static final String OCI_IMAGE_TARFILE = "/tmp/ccc/centos_minus_vim_plus_bacula-oci.tar";
 
     private static Os os;
     private static ImageInspectorApi imageInspectorApi;
@@ -232,12 +231,12 @@ public void testAppOnlyFileSystem() throws IntegrationException, IOException, In
         assertTrue(containerFileSystemFile.length() < 80000000);
     }
 
-    /////@Disabled
+    @Disabled
     @Test
     public void testOciImage() throws IntegrationException, IOException, InterruptedException {
         ComponentHierarchyBuilder componentHierarchyBuilder = new ComponentHierarchyBuilder(packageGetter);
-        Mockito.when(os.getLinuxDistroNameFromEtcDir(Mockito.any(File.class))).thenReturn(Optional.of("ubuntu"));
-        Mockito.when(os.deriveOs(Mockito.any(String.class))).thenReturn(ImageInspectorOsEnum.UBUNTU);
+        Mockito.when(os.getLinuxDistroNameFromEtcDir(Mockito.any(File.class))).thenReturn(Optional.of("centos"));
+        Mockito.when(os.deriveOs(Mockito.any(String.class))).thenReturn(ImageInspectorOsEnum.CENTOS);
         Mockito.when(rpmPkgMgr.isApplicable(Mockito.any(File.class))).thenReturn(true);
         Mockito.when(rpmPkgMgr.getType()).thenReturn(PackageManagerEnum.RPM);
         Mockito.when(rpmPkgMgr.getImagePackageManagerDirectory(Mockito.any(File.class))).thenReturn(new File("."));
@@ -248,10 +247,10 @@ public void testOciImage() throws IntegrationException, IOException, Interrupted
                 .setDockerTarfilePath(OCI_IMAGE_TARFILE)
                 //.setBlackDuckProjectName(PROJECT)
                 //.setBlackDuckProjectVersion(PROJECT_VERSION)
-                .setGivenImageRepo("testrepo")
-                .setGivenImageTag("testtag")
+                //.setGivenImageRepo("testrepo")
+                //.setGivenImageTag("testtag")
                 .setContainerFileSystemOutputPath(containerFileSystemOutputFilePath)
-                .setCurrentLinuxDistro("UBUNTU")
+                .setCurrentLinuxDistro("CENTOS")
                 .setCleanupWorkingDir(true)
                 .build();
         SimpleBdioDocument bdioDocument = imageInspectorApi.getBdio(componentHierarchyBuilder, imageInspectionRequest);