[jboss-svn-commits] JBL Code SVN: r8447 - 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:15:00 -0500 (Wed, 20 Dec 2006)
New Revision: 8447

Modified:
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
Log:
close connection (attempt to get CI running on Windows).

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:13:16 UTC (rev 8446)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2006-12-20 17:15:00 UTC (rev 8447)
@@ -45,7 +45,7 @@
 import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
 
 public class ListenerManagerBaseTest extends BaseTest
-{	
+{
 
 	static void bytesToFile(File file, byte[] text) throws Exception
 	{
@@ -69,66 +69,87 @@
 		out.close();
 		return out.toString();
 	}
-	
+
 	protected void runBeforeAllTests()
 	{
-		try {
-			DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product","../product") + "/etc/test/resources/log4j.xml");
-			TestEnvironmentUtil.setESBPropertiesFileToUse("product","../product");
+		try
+		{
+			DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product",
+					"../product")
+					+ "/etc/test/resources/log4j.xml");
+			TestEnvironmentUtil.setESBPropertiesFileToUse("product",
+					"../product");
 			// Set the juddi properties file in System so juddi will pick it up
 			// later and use the test values.
 			String juddiPropertiesFile = "/org/jboss/soa/esb/listeners/juddi-unittest.properties";
 			System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
 			// Read this properties file to get the db connection string
 			Properties props = new Properties();
-			InputStream inStream = Class.class.getResourceAsStream(juddiPropertiesFile);
+			InputStream inStream = Class.class
+					.getResourceAsStream(juddiPropertiesFile);
 
 			props.load(inStream);
-			mDbDriver    = props.getProperty("juddi.jdbcDriver");
-			mDbUrl       = props.getProperty("juddi.jdbcUrl");
-			mDbUsername  = props.getProperty("juddi.jdbcUsername");
-			mDbPassword  = props.getProperty("juddi.jdbcPassword");
-			
-			String database="not tested yet";
-			if ("org.hsqldb.jdbcDriver".equals(mDbDriver)) {
+			mDbDriver = props.getProperty("juddi.jdbcDriver");
+			mDbUrl = props.getProperty("juddi.jdbcUrl");
+			mDbUsername = props.getProperty("juddi.jdbcUsername");
+			mDbPassword = props.getProperty("juddi.jdbcPassword");
+
+			String database = "not tested yet";
+			if ("org.hsqldb.jdbcDriver".equals(mDbDriver))
+			{
 				database = "hsqldb";
 				// Bring up hsql on default port 9001
-				HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir("product","../product") + "/build/hsqltestdb", "juddi");
-			} else if ("com.mysql.jdbc.Driver".equals(mDbDriver)) {
+				HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir(
+						"product", "../product")
+						+ "/build/hsqltestdb", "juddi");
+			}
+			else if ("com.mysql.jdbc.Driver".equals(mDbDriver))
+			{
 				database = "mysql";
 			} // add and test your own database..
-			
+
 			// Get the registry-schema create scripts
-			String sqlDir = TestEnvironmentUtil.getUserDir("product","../product") + "/install/jUDDI-registry/sql/" + database + "/";
+			String sqlDir = TestEnvironmentUtil.getUserDir("product",
+					"../product")
+					+ "/install/jUDDI-registry/sql/" + database + "/";
 			// Drop what is there now, if exists. We want to start fresh.
-			String sqlDropCmd      = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
-			String sqlCreateCmd    = FileUtil.readTextFile(new File(sqlDir + "create_database.sql"));
-			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "insert_publishers.sql"));
-			
+			String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
+					+ "drop_database.sql"));
+			String sqlCreateCmd = FileUtil.readTextFile(new File(sqlDir
+					+ "create_database.sql"));
+			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
+					+ "insert_publishers.sql"));
+
 			try
 			{
 				Class.forName(mDbDriver);
 			}
-			catch (Exception e) 
+			catch (Exception e)
 			{
-				System.out.println("ERROR: failed to load " + database + " JDBC driver.");
+				System.out.println("ERROR: failed to load " + database
+						+ " JDBC driver.");
 				e.printStackTrace();
 				return;
 			}
-			java.sql.Connection con = DriverManager.getConnection(mDbUrl, mDbUsername, mDbPassword);
+			java.sql.Connection con = DriverManager.getConnection(mDbUrl,
+					mDbUsername, mDbPassword);
 			Statement stmnt = con.createStatement();
 			stmnt.execute(sqlDropCmd);
 			stmnt.execute(sqlCreateCmd);
 			stmnt.execute(sqlInsertPubCmd);
-			
-		} catch (Throwable e) {
+			con.close();
+		}
+		catch (Throwable e)
+		{
 			e.printStackTrace();
-			System.out.println("We should stop testing, since we don't have a db.");
+			System.out
+					.println("We should stop testing, since we don't have a db.");
 			assertTrue(false);
 		}
 	}
 
-	protected static final String TMP_DIR = System.getProperty("java.io.tmpdir");
+	protected static final String TMP_DIR = System
+			.getProperty("java.io.tmpdir");
 
 	protected static Logger _logger = Logger
 			.getLogger(ListenerManagerBaseTest.class);
@@ -140,10 +161,13 @@
 	ListenerManager _manager;
 
 	private static String mDbDriver;
+
 	private static String mDbUrl;
+
 	private static String mDbUsername;
+
 	private static String mDbPassword;
-	
+
 	public static class MockMessageAwareAction
 	{
 		Random _rand = new Random(System.currentTimeMillis());
@@ -151,7 +175,7 @@
 		ConfigTree _config;
 
 		public MockMessageAwareAction(ConfigTree config)
-		{		
+		{
 			_config = config;
 		}
 
@@ -160,12 +184,12 @@
 			String id = message.getHeader().getCall().getMessageID()
 					.toASCIIString();
 			long lSleep = Math.abs(_rand.nextInt()) % 300;
-			
+
 			_logger.info("Random sleep on " + Thread.currentThread() + "="
 					+ lSleep + "-Message id=" + id);
 			Thread.sleep(lSleep);
 			bytesToFile(_returnFile, message.getBody().getContents());
-			
+
 			return message;
 		}
 	}