Merge branch 'master' of https://github.com/blackducksoftware/synopsy…

…s-detect
blackducksoftware · Oct 7, 2019 · 3b984c3 · 3b984c3
2 parents bb814ed + 51b73d7
commit 3b984c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/test/java/com/synopsys/integration/detect/integration/DetectOnDetectHappyPath.java b/src/test/java/com/synopsys/integration/detect/integration/DetectOnDetectHappyPath.java
@@ -95,7 +95,8 @@ public void testBomCreatedInBlackDuck() throws Exception {
         assertEquals(codeLocationNameSuffixesToCheck.size(), matches);
 
         List<VersionBomComponentView> bomComponents = projectBomService.getComponentsForProjectVersion(projectVersionWrapper.getProjectVersionView());
-        Optional<VersionBomComponentView> blackDuckCommonComponent = bomComponents.stream().filter(versionBomComponentView -> "blackduck-common".equals(versionBomComponentView.getComponentName())).findFirst();
+        // We used to look for blackduck-common, but we adopt new versions faster than KB can pick them up
+        Optional<VersionBomComponentView> blackDuckCommonComponent = bomComponents.stream().filter(versionBomComponentView -> "jackson-core".equals(versionBomComponentView.getComponentName())).findFirst();
         assertTrue(blackDuckCommonComponent.isPresent());
     }
 

diff --git a/src/test/java/com/synopsys/integration/detect/integration/SignatureScanTest.java b/src/test/java/com/synopsys/integration/detect/integration/SignatureScanTest.java
@@ -15,7 +15,7 @@
 
 @Tag("integration")
 public class SignatureScanTest extends BlackDuckIntegrationTest {
-    private static final long ONE_MILLION_BYTES = 1_000_000;
+    private static final long HALF_MILLION_BYTES = 500_000;
 
     @Test
     @ExtendWith(TempDirectory.class)
@@ -66,7 +66,7 @@ private void assertDirectoryStructureForOfflineScan(@TempDirectory.TempDir Path
 
         File[] dataFiles = dataDirectory.listFiles();
         assertEquals(1, dataFiles.length);
-        assertTrue(dataFiles[0].length() > ONE_MILLION_BYTES);
+        assertTrue(dataFiles[0].length() > HALF_MILLION_BYTES);
     }
 
 }