[jboss-svn-commits] JBL Code SVN: r8451 - labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners

[jboss-svn-commits at lists.jboss.org]

Author: mark.little at jboss.com
Date: 2006-12-20 12:35:47 -0500 (Wed, 20 Dec 2006)
New Revision: 8451

Modified:
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
Log:


Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2006-12-20 17:29:09 UTC (rev 8450)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2006-12-20 17:35:47 UTC (rev 8451)
@@ -28,6 +28,7 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
 import java.util.Properties;
@@ -131,13 +132,12 @@
 				e.printStackTrace();
 				return;
 			}
-			java.sql.Connection con = DriverManager.getConnection(mDbUrl,
-					mDbUsername, mDbPassword);
+			con = DriverManager.getConnection(mDbUrl, mDbUsername, mDbPassword);
 			Statement stmnt = con.createStatement();
 			stmnt.execute(sqlDropCmd);
 			stmnt.execute(sqlCreateCmd);
 			stmnt.execute(sqlInsertPubCmd);
-			con.close();
+			stmnt.close();
 		}
 		catch (Throwable e)
 		{
@@ -147,6 +147,22 @@
 			assertTrue(false);
 		}
 	}
+	
+	protected final void runAfterAllTests ()
+	{
+		try
+		{
+			Statement stmnt = con.createStatement();
+			
+			stmnt.execute("SHUTDOWN");
+			stmnt.close();
+			
+			con.close();
+		}
+		catch (Exception ex)
+		{
+		}
+	}
 
 	protected static final String TMP_DIR = System
 			.getProperty("java.io.tmpdir");
@@ -167,6 +183,8 @@
 	private static String mDbUsername;
 
 	private static String mDbPassword;
+	
+	private static Connection con;
 
 	public static class MockMessageAwareAction
 	{

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java	2006-12-20 17:29:09 UTC (rev 8450)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java	2006-12-20 17:35:47 UTC (rev 8451)
@@ -78,8 +78,12 @@
 	public void tearDown()
 	{
 		_returnFile.delete();
+		
+		runAfterAllTests();
 	}
 	
+	// TODO more refactoring, since oneText is duplicated a lot!
+	
 	protected void oneTest () throws Exception
 	{	
 		// Write wome messages to EPR obtained from configuration file