回退相关测试用例 #5771 #4885

回退相关测试用例 #5771  #4885

Author: lizongbo

core/src/test/java/com/alibaba/druid/bvt/pool/Case1.java

@@ -52,15 +52,8 @@ public Connection connect(String url, Properties info) throws SQLException {
         dataSource.setMinIdle(0);
         dataSource.setMaxActive(2);
         dataSource.setMaxIdle(2);
-
-        Exception error = null;
-        try {
-            Connection conn = dataSource.getConnection();
-            conn.close();
-        } catch (Exception e) {
-            error = e;
-        }
-
-        Assert.assertTrue(error instanceof DataSourceDisableException);
+        Connection conn = dataSource.getConnection();
+        conn.close();
+        dataSource.close();
     }
 }

core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java

@@ -17,7 +17,7 @@ public class DruidDataSourceTest5 extends TestCase {
 
     private final AtomicBoolean validate = new AtomicBoolean(true);
 
-    @Before
+
     protected void setUp() throws Exception {
         validate.set(true);
 
@@ -34,8 +34,8 @@ public boolean isValidConnection(Connection c, String query, int validationQuery
         });
     }
 
-    @After
-    protected void tearDown() throws Exception {
+
+    public void tearDown() throws Exception {
         dataSource.close();
     }
 
@@ -49,6 +49,11 @@ public void testValidate() throws Exception {
             error = e;
         }
         Assert.assertNotNull(error);
+
+        validate.set(true);
+
+        Connection conn = dataSource.getConnection();
+        conn.close();
     }
 
     public void testValidate_1() throws Exception {
@@ -61,6 +66,11 @@ public void testValidate_1() throws Exception {
             error = e;
         }
         Assert.assertNotNull(error);
+
+        validate.set(true);
+
+        Connection conn = dataSource.getConnection();
+        conn.close();
     }
 
     public void testValidate_3() throws Exception {
@@ -73,6 +83,11 @@ public void testValidate_3() throws Exception {
             error = e;
         }
         Assert.assertNotNull(error);
+
+        validate.set(true);
+
+        Connection conn = dataSource.getConnection();
+        conn.close();
     }
 
 }

core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java

@@ -37,7 +37,7 @@ protected void setUp() throws Exception {
 
             public Connection connect(String url, Properties info) throws SQLException {
                 // create first connection successfully.
-                if (count.incrementAndGet() % 2 == 0) {
+                if (count.getAndIncrement() % 2 == 0) {
                     throw new SQLException();
                 }
 
@@ -76,17 +76,13 @@ public void test_connect_error() throws Exception {
         int count = 10;
         Connection[] connections = new Connection[count];
         for (int i = 0; i < count; ++i) {
-            try {
-                connections[i] = dataSource.getConnection();
-            } catch (Exception e) {
-                // do nothing
-            }
+            connections[i] = dataSource.getConnection();
         }
 
         for (int i = 0; i < count; ++i) {
             connections[i].close();
         }
 
-        Assert.assertEquals(9, dataSource.getCreateErrorCount());
+        Assert.assertEquals(10, dataSource.getCreateErrorCount());
     }
 }

core/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java

@@ -10,6 +10,7 @@
 import com.alibaba.druid.PoolTestCase;
 import org.junit.Assert;
 import com.alibaba.druid.pool.DataSourceDisableException;
+import com.alibaba.druid.pool.DataSourceNotAvailableException;
 import com.alibaba.druid.pool.DruidDataSource;
 
 public class FailFastTest extends PoolTestCase {
@@ -81,7 +82,7 @@ public void run() {
         latch.countDown();
         connectEndLatch.await(3, TimeUnit.SECONDS);
         SQLException ex = errorHolder.get();
-        Assert.assertTrue(ex instanceof DataSourceDisableException);
+        Assert.assertTrue(ex instanceof DataSourceNotAvailableException);
 
         for (int i = 0; i < 300; ++i) {
             if (!dataSource.isFailContinuous()) {