Improve unit tests

2 files changed, 8 insertions, 5 deletions

diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapClassLoaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/JdbcDriverHolderTest.java
index 81790aeb189..223842a08d4 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapClassLoaderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/JdbcDriverHolderTest.java
@@ -19,26 +19,29 @@
  */
 package org.sonar.batch.bootstrap;
 
-import org.junit.Test;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
 
 import java.io.File;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
+import org.junit.Test;
 
-public class BootstrapClassLoaderTest {
+public class JdbcDriverHolderTest {
 
   @Test
   public void testClassLoader() throws URISyntaxException {
     /* foo.jar has just one file /foo/foo.txt */
     assertNull(getClass().getClassLoader().getResource("foo/foo.txt"));
 
-    URL url = getClass().getResource("/org/sonar/batch/bootstrap/BootstrapClassLoaderTest/foo.jar");
+    URL url = getClass().getResource("/org/sonar/batch/bootstrap/JdbcDriverHolderTest/foo.jar");
     JdbcDriverHolder classloader = new JdbcDriverHolder(new File(url.toURI()));
     assertNotNull(classloader.getClassLoader());
     assertNotNull(classloader.getClassLoader().getResource("foo/foo.txt"));
 
+    classloader.stop();
+    assertNull(classloader.getClassLoader());
   }
+
 }
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BootstrapClassLoaderTest/foo.jar b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/JdbcDriverHolderTest/foo.jar
index c2bde4e5fff..c2bde4e5fff 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BootstrapClassLoaderTest/foo.jar
+++ b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/JdbcDriverHolderTest/foo.jar