BindInNullPostgresTest: don't depend on method ordering, fix NPE if a…

…ssumption fails
jdbi · Jan 21, 2017 · af01fff · af01fff
1 parent 0827868
commit af01fff
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/test/java/org/skife/jdbi/v2/sqlobject/BindInNullPostgresTest.java b/src/test/java/org/skife/jdbi/v2/sqlobject/BindInNullPostgresTest.java
@@ -33,12 +33,9 @@ public class BindInNullPostgresTest {
     private static Handle handle;
 
     @BeforeClass
-    public static void isPostgresInstalled() {
+    public static void init() {
         assumeTrue(Boolean.parseBoolean(System.getenv("TRAVIS")));
-    }
 
-    @BeforeClass
-    public static void init() {
         handle = new DBI("jdbc:postgresql:jdbi_test", "postgres", "").open();
 
         handle.execute("create table something (id int primary key, name varchar(100))");
@@ -50,8 +47,10 @@ public static void init() {
 
     @AfterClass
     public static void exit() {
-        handle.execute("drop table something");
-        handle.close();
+        if (handle != null) {
+            handle.execute("drop table something");
+            handle.close();
+        }
     }
 
     @Test