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

updated so compilation/tests work on linux

Browse Source 
Former-commit-id: 3759e9438065138e6339aa3a56c81c08215406e4
This commit is contained in:
Jeremy Long
2014-02-22 15:30:50 -05:00
parent f08919a829
commit 221537601f
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java
View File

@@ -59,7 +59,14 @@ public class DriverLoaderTest {
@Test @Test
public void testLoad_String() throws Exception { public void testLoad_String() throws Exception {
String className = "org.h2.Driver"; String className = "org.h2.Driver";
DriverLoader.load(className); Driver d = null;
try {
d = DriverLoader.load(className);
} finally {
if (d != null) {
DriverManager.deregisterDriver(d);
}
}
} }
/** /**
@@ -68,7 +75,7 @@ public class DriverLoaderTest {
@Test(expected = DriverLoadException.class) @Test(expected = DriverLoadException.class)
public void testLoad_String_ex() throws Exception { public void testLoad_String_ex() throws Exception {
String className = "bad.Driver"; String className = "bad.Driver";
DriverLoader.load(className); Driver d = DriverLoader.load(className);
} }
/** /**
@@ -82,9 +89,16 @@ public class DriverLoaderTest {
File driver = new File(testClassPath, "../../src/test/resources/mysql-connector-java-5.1.27-bin.jar"); File driver = new File(testClassPath, "../../src/test/resources/mysql-connector-java-5.1.27-bin.jar");
assertTrue("MySQL Driver JAR file not found in src/test/resources?", driver.isFile()); assertTrue("MySQL Driver JAR file not found in src/test/resources?", driver.isFile());
DriverLoader.load(className, driver.getAbsolutePath()); Driver d = null;
Driver d = DriverManager.getDriver("jdbc:mysql://localhost:3306/dependencycheck"); try {
d = DriverLoader.load(className, driver.getAbsolutePath());
d = DriverManager.getDriver("jdbc:mysql://localhost:3306/dependencycheck");
assertNotNull(d); assertNotNull(d);
} finally {
if (d != null) {
DriverManager.deregisterDriver(d);
}
}
} }
/** /**
@@ -99,7 +113,14 @@ public class DriverLoaderTest {
final File dir2 = new File(testClassPath, "../../src/test/resources/"); final File dir2 = new File(testClassPath, "../../src/test/resources/");
final String paths = String.format("%s" + File.pathSeparator + "%s", dir1.getAbsolutePath(), dir2.getAbsolutePath()); final String paths = String.format("%s" + File.pathSeparator + "%s", dir1.getAbsolutePath(), dir2.getAbsolutePath());
DriverLoader.load(className, paths); Driver d = null;
try {
d = DriverLoader.load(className, paths);
} finally {
if (d != null) {
DriverManager.deregisterDriver(d);
}
}
} }
/** /**
@@ -113,7 +134,7 @@ public class DriverLoaderTest {
File driver = new File(testClassPath, "../../src/test/resources/mysql-connector-java-5.1.27-bin.jar"); File driver = new File(testClassPath, "../../src/test/resources/mysql-connector-java-5.1.27-bin.jar");
assertTrue("MySQL Driver JAR file not found in src/test/resources?", driver.isFile()); assertTrue("MySQL Driver JAR file not found in src/test/resources?", driver.isFile());
DriverLoader.load(className, driver.getAbsolutePath()); Driver d = DriverLoader.load(className, driver.getAbsolutePath());
} }
/** /**
@@ -125,6 +146,6 @@ public class DriverLoaderTest {
//we know this is in target/test-classes //we know this is in target/test-classes
File testClassPath = (new File(this.getClass().getClassLoader().getResource("org.mortbay.jetty.jar").getPath())).getParentFile(); File testClassPath = (new File(this.getClass().getClassLoader().getResource("org.mortbay.jetty.jar").getPath())).getParentFile();
File driver = new File(testClassPath, "../../src/test/bad/mysql-connector-java-5.1.27-bin.jar"); File driver = new File(testClassPath, "../../src/test/bad/mysql-connector-java-5.1.27-bin.jar");
DriverLoader.load(className, driver.getAbsolutePath()); Driver d = DriverLoader.load(className, driver.getAbsolutePath());
} }
} }