Update SessionLeakTest to init Cluster first, be more resilient.

tolbertam · olim7t · commit 62c27f71da21 · 2015-04-03T12:43:20.000+02:00
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
@@ -15,43 +15,38 @@ public void connectionLeakTest() throws Exception {
         // Checking for JAVA-342
         CCMBridge ccmBridge;
         ccmBridge = CCMBridge.create("test", 1);
+        Cluster cluster = null;
+        try {
+            // create a new cluster object and ensure 0 sessions and connections
+            cluster = Cluster.builder().addContactPoints(CCMBridge.IP_PREFIX + '1').build();
+            cluster.init();
 
-        // give the driver time to close other sessions in this class
-        //Thread.sleep(10);
-
-        // create a new cluster object and ensure 0 sessions and connections
-        Cluster cluster = Cluster.builder().addContactPoints(CCMBridge.IP_PREFIX + '1').build();
-
-        int corePoolSize = cluster.getConfiguration()
-                .getPoolingOptions()
-                .getCoreConnectionsPerHost(HostDistance.LOCAL);
-
-        assertEquals(cluster.manager.sessions.size(), 0);
-        assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 0);
+            int corePoolSize = cluster.getConfiguration()
+                    .getPoolingOptions()
+                    .getCoreConnectionsPerHost(HostDistance.LOCAL);
 
-        // ensure sessions.size() returns with 1 control connection + core pool size.
-        Session session = cluster.connect();
-        assertEquals(cluster.manager.sessions.size(), 1);
-        assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1 + corePoolSize);
+            assertEquals(cluster.manager.sessions.size(), 0);
+            // Should be 1 control connection after initialization.
+            assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1);
 
-        // ensure sessions.size() returns to 0 with only 1 active connection (the control connection)
-        session.close();
-        assertEquals(cluster.manager.sessions.size(), 0);
-        assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1);
+            // ensure sessions.size() returns with 1 control connection + core pool size.
+            Session session = cluster.connect();
+            assertEquals(cluster.manager.sessions.size(), 1);
+            assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1 + corePoolSize);
 
-        try {
-            Session thisSession;
+            // ensure sessions.size() returns to 0 with only 1 active connection (the control connection)
+            session.close();
+            assertEquals(cluster.manager.sessions.size(), 0);
+            assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1);
 
             // ensure bootstrapping a node does not create additional connections
-
-
             ccmBridge.bootstrapNode(2);
             assertEquals(cluster.manager.sessions.size(), 0);
             assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1);
 
             // ensure a new session gets registered and core connections are established
             // there should be corePoolSize more connections to accommodate for the new host.
-            thisSession = cluster.connect();
+            Session thisSession = cluster.connect();
             assertEquals(cluster.manager.sessions.size(), 1);
 
             assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1 + (corePoolSize * 2));
@@ -60,26 +55,14 @@ public void connectionLeakTest() throws Exception {
             thisSession.close();
 
             assertEquals(cluster.manager.sessions.size(), 0);
-
             assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1);
-
-
         } finally {
-            // ensure we decommission node2 for the rest of the tests
-
-            assertEquals(cluster.manager.sessions.size(), 0);
-            assertEquals((int) cluster.getMetrics().getOpenConnections().getValue(), 1);
-
             if(cluster != null){
                 cluster.close();
-
             }
-
             if (ccmBridge != null) {
                 ccmBridge.remove();
             }
-
-
         }
     }
 }
