diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java index 897c5ad23..3d4537e04 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java @@ -86,7 +86,7 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { * * @return the list of arguments to begin populating the ProcessBuilder */ - private List buildArgumentList() { + protected List buildArgumentList() { // Use file.separator as a wild guess as to whether this is Windows final List args = new ArrayList(); if (!SystemUtils.IS_OS_WINDOWS) { diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java index f6508b203..031c6d64a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import org.junit.Assume; import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeNotNull; import org.junit.Before; import org.junit.Test; import org.owasp.dependencycheck.BaseTest; @@ -81,7 +82,7 @@ public class AssemblyAnalyzerTest extends BaseTest { @Test public void testAnalysis() throws Exception { - //File f = new File(AssemblyAnalyzerTest.class.getClassLoader().getResource("GrokAssembly.exe").getPath()); + assumeNotNull(analyzer.buildArgumentList()); File f = BaseTest.getResourceAsFile(this, "GrokAssembly.exe"); Dependency d = new Dependency(f); analyzer.analyze(d, null); @@ -104,7 +105,7 @@ public class AssemblyAnalyzerTest extends BaseTest { @Test public void testLog4Net() throws Exception { - //File f = new File(AssemblyAnalyzerTest.class.getClassLoader().getResource("log4net.dll").getPath()); + assumeNotNull(analyzer.buildArgumentList()); File f = BaseTest.getResourceAsFile(this, "log4net.dll"); Dependency d = new Dependency(f); @@ -116,9 +117,10 @@ public class AssemblyAnalyzerTest extends BaseTest { @Test public void testNonexistent() { + assumeNotNull(analyzer.buildArgumentList()); + // Tweak the log level so the warning doesn't show in the console String oldProp = System.getProperty(LOG_KEY, "info"); - //File f = new File(AssemblyAnalyzerTest.class.getClassLoader().getResource("log4net.dll").getPath()); File f = BaseTest.getResourceAsFile(this, "log4net.dll"); File test = new File(f.getParent(), "nonexistent.dll"); Dependency d = new Dependency(test);