From ed49251310e4cd7b0072b350b4212312e15ba786 Mon Sep 17 00:00:00 2001 From: Stefan Neuhaus Date: Wed, 4 Oct 2017 20:54:02 +0200 Subject: [PATCH] Cleanup test --- .../analyzer/CentralAnalyzerTest.java | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java index 3aace07d4..3a52a769b 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java @@ -55,12 +55,10 @@ public class CentralAnalyzerTest { CentralAnalyzer instance = new CentralAnalyzer(); instance.searcher = centralSearch; + specifySha1SumFor(dependency); final List expectedMavenArtifacts = Collections.emptyList(); new Expectations() {{ - dependency.getSha1sum(); - returns(SHA1_SUM); - centralSearch.searchSha1(SHA1_SUM); returns(expectedMavenArtifacts); }}; @@ -78,12 +76,10 @@ public class CentralAnalyzerTest { CentralAnalyzer instance = new CentralAnalyzer(); instance.searcher = centralSearch; + specifySha1SumFor(dependency); final List expectedMavenArtifacts = Collections.emptyList(); new Expectations() {{ - dependency.getSha1sum(); - returns(SHA1_SUM); - centralSearch.searchSha1(SHA1_SUM); result = new IOException("Could not connect to MavenCentral (500): Internal Server Error"); result = new IOException("Could not connect to MavenCentral (500): Internal Server Error"); @@ -103,11 +99,9 @@ public class CentralAnalyzerTest { CentralAnalyzer instance = new CentralAnalyzer(); instance.searcher = centralSearch; + specifySha1SumFor(dependency); new Expectations() {{ - dependency.getSha1sum(); - returns(SHA1_SUM); - centralSearch.searchSha1(SHA1_SUM); result = new FileNotFoundException("Artifact not found in Central"); }}; @@ -123,11 +117,9 @@ public class CentralAnalyzerTest { CentralAnalyzer instance = new CentralAnalyzer(); instance.searcher = centralSearch; + specifySha1SumFor(dependency); new Expectations() {{ - dependency.getSha1sum(); - returns(SHA1_SUM); - centralSearch.searchSha1(SHA1_SUM); result = new IOException("no internet connection"); }}; @@ -143,11 +135,9 @@ public class CentralAnalyzerTest { CentralAnalyzer instance = new CentralAnalyzer(); instance.searcher = centralSearch; + specifySha1SumFor(dependency); new Expectations() {{ - dependency.getSha1sum(); - returns(SHA1_SUM); - centralSearch.searchSha1(SHA1_SUM); result = new IOException("no internet connection"); }}; @@ -166,4 +156,17 @@ public class CentralAnalyzerTest { } }; } + + /** + * Specifies the mock dependency's SHA1 sum. + * + * @param dependency then dependency + */ + @SuppressWarnings("PMD.NonStaticInitializer") + private void specifySha1SumFor(final Dependency dependency) { + new Expectations() {{ + dependency.getSha1sum(); + returns(SHA1_SUM); + }}; + } }