[jboss-svn-commits] JBL Code SVN: r7284 - in labs/jbossesb/trunk/product/core/services: src/org/jboss/internal/soa/esb/persistence/format/db tests/src/org/jboss/soa/esb/esb/persistence/tests

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

Author: kurt.stam at jboss.com
Date: 2006-11-01 14:40:04 -0500 (Wed, 01 Nov 2006)
New Revision: 7284

Modified:
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBConnectionManager.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
Log:
Fixing test

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBConnectionManager.java	2006-11-01 19:03:09 UTC (rev 7283)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBConnectionManager.java	2006-11-01 19:40:04 UTC (rev 7284)
@@ -65,6 +65,7 @@
 		_logger.info("Initializing DBConnectionManager");		
 		pooledDS = new ComboPooledDataSource();
 		
+		
 		pooledDS.setDriverClass(Configuration.getStoreDriver());
 		pooledDS.setJdbcUrl(Configuration.getStoreUrl());
 		pooledDS.setUser(Configuration.getStoreUser());

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	2006-11-01 19:03:09 UTC (rev 7283)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	2006-11-01 19:40:04 UTC (rev 7284)
@@ -26,6 +26,8 @@
  *
  *
  */
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -35,9 +37,6 @@
 import java.sql.Connection;
 import java.sql.Statement;
 
-import junit.framework.TestCase;
-
-import org.jboss.soa.esb.services.persistence.MessageStoreType;
 import org.jboss.internal.soa.esb.persistence.format.db.DBConnectionManager;
 import org.jboss.soa.esb.common.Configuration;
 import org.jboss.soa.esb.common.tests.HsqldbUtil;
@@ -47,38 +46,31 @@
 import org.jboss.soa.esb.message.format.MessageType;
 import org.jboss.soa.esb.services.persistence.MessageStore;
 import org.jboss.soa.esb.services.persistence.MessageStoreFactory;
+import org.jboss.soa.esb.services.persistence.MessageStoreType;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 
-public class MessageStoreUnitTest extends TestCase{
+public class MessageStoreUnitTest {
 	
 //	private static Logger log = Logger.getLogger(MessageStoreUnitTest.class);
 	
 	@Test
 	public void testDefaultMessageStore() {
-		TestUtil.setESBPropertiesFileToUse();
-		MessageStoreUnitTest.runBeforeAllTests();
 		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
 		assertEquals((store != null), true);
-		MessageStoreUnitTest.runAfterAllTests();
 	}
 	
 	@Test
 	public void testURIMessageStore() {
-		TestUtil.setESBPropertiesFileToUse();
-		
 		//only DB supported for now
-		MessageStoreUnitTest.runBeforeAllTests();
 		MessageStore store1 = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
 		assertEquals((store1 != null), true);
-		MessageStoreUnitTest.runAfterAllTests();
 	}
 	
 	@Test
 	public void testStoreAndRetrieve() {
-		TestUtil.setESBPropertiesFileToUse();
-		MessageStoreUnitTest.runBeforeAllTests();
-		
 		//add new messages
 		Message msg1 = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
 		Message msg2 = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
@@ -125,24 +117,20 @@
 		} catch (Exception e) {			
 			e.printStackTrace();
 		}
-		
-		MessageStoreUnitTest.runAfterAllTests();
 	}
 	
 	@Test
 	public void testDBConnectionManager() {
-		TestUtil.setESBPropertiesFileToUse();
-		MessageStoreUnitTest.runBeforeAllTests();
 		MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
 		assertEquals((store != null), true);		
 		DBConnectionManager mgr = DBConnectionManager.getInstance();
 		assertEquals((mgr != null), true);
-		MessageStoreUnitTest.runAfterAllTests();
 	}	
 		
-	
-	private static void runBeforeAllTests() {
-		TestUtil.setESBPropertiesFileToUse();				
+	@BeforeClass
+	public static void runBeforeAllTests() {
+		TestUtil.setESBPropertiesFileToUse();
+		System.out.println(Configuration.dump());
 		try {			
 			if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
 				HsqldbUtil.startHsqldb(TestUtil.getPrefix() + "build/hsqltestdb", "jbossesb");
@@ -153,6 +141,14 @@
 				String sqlCreateCmd    = MessageStoreUnitTest.readTextFile(new File(sqlDir + "create_database.sql"));
 				String sqlDropCmd      = MessageStoreUnitTest.readTextFile(new File(sqlDir + "drop_database.sql"));
 				
+				try {
+					Class.forName(Configuration.getStoreDriver());
+				} catch (Exception e) {
+					System.out.println("ERROR: failed to load " + database + " JDBC driver.");
+					e.printStackTrace();
+					return;
+				}
+				
 				DBConnectionManager mgr = DBConnectionManager.getInstance();
 				Connection con = mgr.getConnection();
 				Statement stmnt = con.createStatement();
@@ -168,7 +164,8 @@
 		}
 	}
 	
-	private static void runAfterAllTests() {		
+	@AfterClass
+	public static void runAfterAllTests() {		
 		try {
 			if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver"))
 				HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),