From 2682187fa3da93c5a21354a9cbe119c1eed1756b Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 27 Oct 2013 14:28:47 -0400 Subject: [PATCH] updated test cases Former-commit-id: b828cccfbc3ddbdb72fa1eacfbd7d500e7fa70be --- .../analyzer/ArchiveAnalyzerTest.java | 92 +++++++++++++++++-- 1 file changed, 85 insertions(+), 7 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java index e59a09e73..d6f6354b0 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java @@ -66,6 +66,9 @@ public class ArchiveAnalyzerTest { expResult.add("zip"); expResult.add("war"); expResult.add("ear"); + expResult.add("tar"); + expResult.add("gz"); + expResult.add("tgz"); Set result = instance.getSupportedExtensions(); assertEquals(expResult, result); } @@ -86,7 +89,7 @@ public class ArchiveAnalyzerTest { */ @Test public void testSupportsExtension() { - String extension = "tar"; //not supported + String extension = "7z"; //not supported ArchiveAnalyzer instance = new ArchiveAnalyzer(); boolean expResult = false; boolean result = instance.supportsExtension(extension); @@ -155,6 +158,81 @@ public class ArchiveAnalyzerTest { } } + /** + * Test of analyze method, of class ArchiveAnalyzer. + */ + @Test + public void testAnalyzeTar() throws Exception { + ArchiveAnalyzer instance = new ArchiveAnalyzer(); + try { + instance.initialize(); + + File file = new File(this.getClass().getClassLoader().getResource("file.tar").getPath()); + Dependency dependency = new Dependency(file); + Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); + Engine engine = new Engine(); + + int initial_size = engine.getDependencies().size(); + instance.analyze(dependency, engine); + int ending_size = engine.getDependencies().size(); + + assertTrue(initial_size < ending_size); + + } finally { + instance.close(); + } + } + + /** + * Test of analyze method, of class ArchiveAnalyzer. + */ + @Test + public void testAnalyzeTarGz() throws Exception { + ArchiveAnalyzer instance = new ArchiveAnalyzer(); + try { + instance.initialize(); + + File file = new File(this.getClass().getClassLoader().getResource("file.tar.gz").getPath()); + Dependency dependency = new Dependency(file); + Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); + Engine engine = new Engine(); + + int initial_size = engine.getDependencies().size(); + instance.analyze(dependency, engine); + int ending_size = engine.getDependencies().size(); + + assertTrue(initial_size < ending_size); + + } finally { + instance.close(); + } + } + + /** + * Test of analyze method, of class ArchiveAnalyzer. + */ + @Test + public void testAnalyzeTgz() throws Exception { + ArchiveAnalyzer instance = new ArchiveAnalyzer(); + try { + instance.initialize(); + + File file = new File(this.getClass().getClassLoader().getResource("file.tgz").getPath()); + Dependency dependency = new Dependency(file); + Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); + Engine engine = new Engine(); + + int initial_size = engine.getDependencies().size(); + instance.analyze(dependency, engine); + int ending_size = engine.getDependencies().size(); + + assertTrue(initial_size < ending_size); + + } finally { + instance.close(); + } + } + /** * Test of analyze method, of class ArchiveAnalyzer. */ @@ -168,13 +246,13 @@ public class ArchiveAnalyzerTest { Dependency dependency = new Dependency(file); Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); Engine engine = new Engine(); - - int initial_size = engine.getDependencies().size(); +// boolean failed = false; +// try { instance.analyze(dependency, engine); - int ending_size = engine.getDependencies().size(); - - assertTrue(initial_size == ending_size); - +// } catch (java.lang.UnsupportedClassVersionError ex) { +// failed = true; +// } +// assertTrue(failed); } finally { instance.close(); }