test: add SharedTimerClassLoaderLeakTest to the regular test suite

pgjdbc · Feb 12, 2017 · b355327 · b355327
1 parent f1190d8
commit b355327
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/jdbc41/Jdbc41TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/jdbc41/Jdbc41TestSuite.java
@@ -16,6 +16,7 @@
         SchemaTest.class,
         AbortTest.class,
         CloseOnCompletionTest.class,
+        SharedTimerClassLoaderLeakTest.class,
         GetObjectTest.class}
     )
 public class Jdbc41TestSuite {

diff --git a/.../util/SharedTimerClassLoaderLeakTest.java → ...dbc41/SharedTimerClassLoaderLeakTest.java b/.../util/SharedTimerClassLoaderLeakTest.java → ...dbc41/SharedTimerClassLoaderLeakTest.java
@@ -3,7 +3,7 @@
  * See the LICENSE file in the project root for more information.
  */
 
-package org.postgresql.test.util;
+package org.postgresql.test.jdbc4.jdbc41;
 
 import org.postgresql.Driver;
 
@@ -17,6 +17,10 @@
 /**
  * Test case that verifies that the use of {@link org.postgresql.util.SharedTimer} within
  * {@link org.postgresql.Driver} does not cause ClassLoader leaks
+ *
+ * The class is placed in {@code jdbc41} package so it won't be tested in JRE6 build.
+ * {@link JUnitClassloaderRunner} does not support JRE6, so we have to skip the test there.
+ *
  * @author Mattias Jiderhamn
  */
 @RunWith(JUnitClassloaderRunner.class)