github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-26 02:51:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated use of extending BuildFileTest with BuildFileRule now that the latter is available in ant-testutil

Browse Source 
Former-commit-id: c06ccc49f15012ef545b94d8e601c5ae0f012190
This commit is contained in:
Hans Joachim Desserud
2015-06-05 23:36:16 +02:00
parent 214b88ea1c
commit 12ce2275e0
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java
View File

@@ -18,34 +18,41 @@
package org.owasp.dependencycheck.taskdefs; package org.owasp.dependencycheck.taskdefs;
import java.io.File; import java.io.File;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileRule;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase; import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase;
import org.owasp.dependencycheck.utils.Settings; import org.owasp.dependencycheck.utils.Settings;
import static org.junit.Assert.assertTrue;
/** /**
* *
* @author Jeremy Long * @author Jeremy Long
*/ */
public class DependencyCheckTaskTest extends BuildFileTest { public class DependencyCheckTaskTest {
//TODO: The use of deprecated class BuildFileTestcan possibly
//be replaced with BuildFileRule. However, it currently isn't included in the ant-testutil jar. @Rule
//This should be fixed in ant-testutil 1.9.5, so we can check back once that has been released. public BuildFileRule buildFile = new BuildFileRule();
//Reference: http://mail-archives.apache.org/mod_mbox/ant-user/201406.mbox/%3C000001cf87ba$8949b690$9bdd23b0$@de%3E
@Rule
public ExpectedException expectedException = ExpectedException.none();
@Before @Before
@Override
public void setUp() throws Exception { public void setUp() throws Exception {
Settings.initialize(); Settings.initialize();
BaseDBTestCase.ensureDBExists(); BaseDBTestCase.ensureDBExists();
final String buildFile = this.getClass().getClassLoader().getResource("build.xml").getPath(); final String buildFile = this.getClass().getClassLoader().getResource("build.xml").getPath();
configureProject(buildFile); this.buildFile.configureProject(buildFile);
} }
@After @After
@Override
public void tearDown() { public void tearDown() {
//no cleanup... //no cleanup...
//executeTarget("cleanup"); //executeTarget("cleanup");
@@ -63,7 +70,7 @@ public class DependencyCheckTaskTest extends BuildFileTest {
throw new Exception("Unable to delete 'target/DependencyCheck-Report.html' prior to test."); throw new Exception("Unable to delete 'target/DependencyCheck-Report.html' prior to test.");
} }
} }
executeTarget("test.fileset"); buildFile.executeTarget("test.fileset");
assertTrue("DependencyCheck report was not generated", report.exists()); assertTrue("DependencyCheck report was not generated", report.exists());
@@ -82,7 +89,7 @@ public class DependencyCheckTaskTest extends BuildFileTest {
throw new Exception("Unable to delete 'target/DependencyCheck-Report.xml' prior to test."); throw new Exception("Unable to delete 'target/DependencyCheck-Report.xml' prior to test.");
} }
} }
executeTarget("test.filelist"); buildFile.executeTarget("test.filelist");
assertTrue("DependencyCheck report was not generated", report.exists()); assertTrue("DependencyCheck report was not generated", report.exists());
} }
@@ -100,7 +107,7 @@ public class DependencyCheckTaskTest extends BuildFileTest {
throw new Exception("Unable to delete 'target/DependencyCheck-Vulnerability.html' prior to test."); throw new Exception("Unable to delete 'target/DependencyCheck-Vulnerability.html' prior to test.");
} }
} }
executeTarget("test.dirset"); buildFile.executeTarget("test.dirset");
assertTrue("DependencyCheck report was not generated", report.exists()); assertTrue("DependencyCheck report was not generated", report.exists());
} }
@@ -109,7 +116,7 @@ public class DependencyCheckTaskTest extends BuildFileTest {
*/ */
@Test @Test
public void testGetFailBuildOnCVSS() { public void testGetFailBuildOnCVSS() {
expectBuildException("failCVSS", "asdfasdfscore"); expectedException.expect(BuildException.class);
System.out.println(this.getOutput()); buildFile.executeTarget("failCVSS");
} }
} }