[jboss-svn-commits] JBL Code SVN: r7180 - labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore

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

Author: daniel.brum at jboss.com
Date: 2006-10-27 15:00:24 -0400 (Fri, 27 Oct 2006)
New Revision: 7180

Modified:
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/TestUtil.java
Log:
bug fixing/cleanup

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java	2006-10-27 18:59:32 UTC (rev 7179)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java	2006-10-27 19:00:24 UTC (rev 7180)
@@ -75,7 +75,7 @@
 				System.out.println("null was found... not adding uid to list...");
 		}
 		
-		logger.info("total messages persisted to db: " + (writeList.size()));
+		logger.info("total messages persisted to db: " + (writeList.size()-1));
 		
 		//loop back reading the messages from the db
 		Vector<Message> readList = new Vector<Message> ();
@@ -86,7 +86,7 @@
 				logger.error(e);
 			}
 		}
-		logger.info("total messages read from db: " + (readList.size()));		
+		logger.info("total messages read from db: " + (readList.size()-1));		
 		logger.info("time to finish write/read for this client: " + (System.currentTimeMillis()-startTime) + " milliseconds.");
 
 	}

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2006-10-27 18:59:32 UTC (rev 7179)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2006-10-27 19:00:24 UTC (rev 7180)
@@ -21,7 +21,10 @@
 
 package org.jboss.soa.esb.messagestore;
 
+import java.io.File;
 import java.net.URI;
+import java.sql.Connection;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -29,6 +32,7 @@
 import junit.framework.TestCase;
 
 import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.persistence.format.db.DBConnectionManager;
 import org.jboss.soa.esb.common.Configuration;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
@@ -121,7 +125,21 @@
 		
 		TestUtil.setESBPropertiesFileToUse();						
 		if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
-			HsqldbUtil.startHsqldb("home/dbrum/dev/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql", "jbossesb");
+			HsqldbUtil.startHsqldb(TestUtil.getPrefix() + "build/hsqltestdb", "jbossesb");
+			//Get the registry-schema create scripts
+			String database = "hsqldb";
+			String sqlDir = TestUtil.getPrefix() + "install/message-store/sql/" + database + "/";
+			//Drop what is there now, if exists. We want to start fresh.				
+			String sqlCreateCmd    = TestUtil.readTextFile(new File(sqlDir + "create_database.sql"));
+			String sqlDropCmd      = TestUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
+			
+			DBConnectionManager mgr = DBConnectionManager.getInstance();
+			Connection con = mgr.getConnection();
+			Statement stmnt = con.createStatement();
+			System.out.println("Dropping the schema if exist");
+			stmnt.execute(sqlDropCmd);
+			System.out.println("Creating the message store schema");
+			stmnt.execute(sqlCreateCmd);
 		}
 		
 	}

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/TestUtil.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/TestUtil.java	2006-10-27 18:59:32 UTC (rev 7179)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/TestUtil.java	2006-10-27 19:00:24 UTC (rev 7180)
@@ -1,5 +1,10 @@
 package org.jboss.soa.esb.messagestore;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
 
@@ -20,7 +25,7 @@
 			if (!baseDir.endsWith("product")) {
 				_prefix = "product/";
 			}
-		}
+		}		
 		return _prefix;
 	}
 	/**
@@ -28,10 +33,22 @@
 	 */
 	public static void setESBPropertiesFileToUse()
 	{
-		//Set the jbossesb properties file in System, so we can pick up the one for testing
+
+//		String jbossesbPropertiesFile = getPrefix() + "etc/test/resources/jbossesb-unittest-properties.xml";
 		String jbossesbPropertiesFile = "jbossesb-unittest-properties.xml";
-//		System.out.println("looking for prop file: " + jbossesbPropertiesFile);
 		System.setProperty("org.jboss.soa.esb.propertyFile", jbossesbPropertiesFile);
 	}
 	
+	public static String readTextFile(File file) throws IOException 
+    {
+        StringBuffer sb = new StringBuffer(1024);
+        BufferedReader reader = new BufferedReader(new FileReader(file.getPath()));
+        char[] chars = new char[1];
+        while( (reader.read(chars)) > -1){
+            sb.append(String.valueOf(chars)); 
+            chars = new char[1];
+        }
+        reader.close();
+        return sb.toString();
+    }
 }