svn commit: r1693358 - /commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java

[ps...@apache.org]

Author: psteitz
Date: Wed Jul 29 22:59:34 2015
New Revision: 1693358

URL: http://svn.apache.org/r1693358
Log:
Suppress console output; but verify stack trace contains abandoning method.

Modified:
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java?rev=1693358&r1=1693357&r2=1693358&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java Wed Jul 29 22:59:34 2015
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.sql.Connection;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
@@ -41,6 +43,8 @@ import org.junit.Test;
  */
 public class TestAbandonedBasicDataSource extends TestBasicDataSource {
 
+    private StringWriter sw;
+
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -50,6 +54,8 @@ public class TestAbandonedBasicDataSourc
         ds.setRemoveAbandonedOnBorrow(true);
         ds.setRemoveAbandonedOnMaintenance(true);
         ds.setRemoveAbandonedTimeout(10000);
+        sw = new StringWriter();
+        ds.setAbandonedLogWriter(new PrintWriter(sw));
     }
 
     // ---------- Abandoned Test -----------
@@ -90,6 +96,7 @@ public class TestAbandonedBasicDataSourc
         // Second close on conn1 is OK as of dbcp 1.3
         conn1.close();
         assertEquals(0, ds.getNumActive());
+        assertTrue(sw.toString().contains("testAbandonedClose"));
     }
 
     @Test
@@ -122,6 +129,7 @@ public class TestAbandonedBasicDataSourc
 
         try { conn1.close(); } catch (SQLException ex) { }
         assertEquals(0, ds.getNumActive());
+        assertTrue(sw.toString().contains("testAbandonedCloseWithExceptions"));
     }
 
     /**