[jboss-svn-commits] JBL Code SVN: r8055 - labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Dec 4 16:42:36 EST 2006
Author: b_georges
Date: 2006-12-04 16:42:33 -0500 (Mon, 04 Dec 2006)
New Revision: 8055
Removed:
labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStore_brokentest.java
Modified:
labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
Log:
Modified: labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
===================================================================
--- labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java 2006-12-04 21:29:40 UTC (rev 8054)
+++ labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java 2006-12-04 21:42:33 UTC (rev 8055)
@@ -26,12 +26,12 @@
import java.util.Vector;
import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreType;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
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;
Modified: labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
===================================================================
--- labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java 2006-12-04 21:29:40 UTC (rev 8054)
+++ labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java 2006-12-04 21:42:33 UTC (rev 8055)
@@ -21,6 +21,8 @@
package org.jboss.soa.esb.messagestore;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.net.URI;
import java.sql.Connection;
@@ -29,10 +31,10 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
+import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreType;
+import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.internal.soa.esb.persistence.format.db.DBConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.message.Message;
@@ -40,61 +42,52 @@
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.jboss.soa.esb.testutils.TestEnvironmentUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
* @author dbrum
*
*/
-public class MessageStoreTest extends TestCase {
+public class MessageStoreTest {
private static Logger logger = Logger.getLogger(MessageStoreTest.class);
+ @Test
public void testMultiClientLoad() throws Exception {
- TestUtil.setESBPropertiesFileToUse();
- MessageStoreTest.runBeforeAllTests();
int clients = 5;
-
Thread[] xx = new Thread[clients];
for (int i=0; i<clients; i++) {
xx[i] = new Thread(new MessageStoreClient());
}
-
for (int i=0; i<clients; i++) {
xx[i].start();
}
-
//clean up the threads
for (int i=0; i<clients; i++) {
xx[i] = null;
}
-
}
+ @Test
public void testSingleLoad() throws Exception {
long startTime=System.currentTimeMillis();
int requestors = 1000; //number of persist calls to make
-
-
List<URI> uriList = new ArrayList<URI>();
-
- TestUtil.setESBPropertiesFileToUse();
- MessageStoreTest.runBeforeAllTests();
-
//get the database store
MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
-
//messages to persist
Message msg[] = { MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML),
MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED)};
-
//set some content inside the Messages
for (int x=0; x<msg.length; x++) {
msg[x].getBody().setContents("TEST BODY".getBytes());
msg[x].getProperties().setProperty("prop"+x, "val"+x);
msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));
}
-
//loop through adding the messages
-
Random rndMsg = new Random();
for (int x=0; x<=requestors; x++) {
URI uid = store.addMessage(msg[rndMsg.nextInt(2)]);
@@ -103,68 +96,60 @@
else
uriList.add(uid);
}
-
logger.info("total messages persisted to db: " + (uriList.size()-1));
-
//loop back reading the messages from the db
List<Message> messages = new ArrayList<Message>();
for (int x=0; x<uriList.size(); x++) {
messages.add(store.getMessage(uriList.get(x)));
}
-
-
-
logger.info("total messages read from db: " + (uriList.size()));
logger.info("time to finish write/read for this client: " + (System.currentTimeMillis() - startTime) + " milliseconds.");
-
- MessageStoreTest.runAfterAllTests();
-
}
- protected static void runBeforeAllTests() throws Exception{
-
- TestUtil.setESBPropertiesFileToUse();
- if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
- 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);
+ @BeforeClass
+ public static void runBeforeAllTests()
+ {
+ try {
+ DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product","../product") + "etc/test/resources/log4j.xml");
+ TestEnvironmentUtil.setESBPropertiesFileToUse("product","../product");
+ if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
+ HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir("product") + "build/hsqltestdb", "jbossesb");
+ //Get the registry-schema create scripts
+ String database = "hsqldb";
+ logger.info("TestUtil.getPrefixForQA() returns: " + TestEnvironmentUtil.getUserDir("product"));
+ String sqlDir = TestEnvironmentUtil.getUserDir("product","../product") + "install/message-store/sql/" + database + "/";
+ //Drop what is there now, if exists. We want to start fresh.
+ String sqlCreateCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "create_database.sql"));
+ String sqlDropCmd = TestEnvironmentUtil.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);
+ }
+ } catch (Throwable e) {
+ e.printStackTrace();
+ System.out.println("We should stop testing, since we don't have a db.");
+ assertTrue(false);
}
}
- private static void runAfterAllTests() throws Exception{
-
+ @AfterClass
+ public static void runAfterAllTests() throws Exception{
+ Thread.sleep(2000);
if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
Configuration.getStoreUser(),Configuration.getStorePwd() );
}
}
-// public static void main(String args[]) {
-// //fire up the DB connections into the pool and give it 5 seconds to establish the connections
-// DBConnectionManager2.getInstance();
-//
-// MessageStoreTest test = new MessageStoreTest();
-// try {
-//// test.testSingleLoad();
-// test.testMultiClientLoad();
-// } catch (Exception e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// }
+ public static junit.framework.Test suite() {
+ return new JUnit4TestAdapter(MessageStoreTest.class);
+ }
}
Deleted: labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStore_brokentest.java
===================================================================
--- labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStore_brokentest.java 2006-12-04 21:29:40 UTC (rev 8054)
+++ labs/jbossesb/workspace/b_georges/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStore_brokentest.java 2006-12-04 21:42:33 UTC (rev 8055)
@@ -1,118 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author daniel.brum at jboss.com
- */
-
-package org.jboss.soa.esb.messagestore;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreType;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-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 junit.framework.TestCase;
-
-/**
- * @author dbrum
- *
- */
-public class MessageStore_brokentest extends TestCase {
- private static Logger logger = Logger.getLogger(MessageStore_brokentest.class);
-
- public void test() throws Exception {
- int requestors = 1000; //number of persist calls to make
- List<URI> uriList = new ArrayList<URI>();
-
- TestUtil.setESBPropertiesFileToUse();
- MessageStore_brokentest.runBeforeAllTests();
-
- //get the database store
- MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
-
- //messages to persist
- Message msg[] = { MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML),
- MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED)};
-
- //set some content inside the Messages
- for (int x=0; x<msg.length; x++) {
- msg[x].getBody().setContents("TEST BODY".getBytes());
- msg[x].getProperties().setProperty("prop"+x, "val"+x);
- msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));
- }
-
- //loop through adding the messages
-
- Random rndMsg = new Random();
- for (int x=0; x<=requestors; x++) {
- URI uid = store.addMessage(msg[rndMsg.nextInt(2)]);
- uriList.add(uid);
- }
-
- logger.info("total messages persisted to db: " + (uriList.size()-1));
-
- //loop back reading the messages from the db
- List<Message> messages = new ArrayList<Message>();
- for (int x=0; x<uriList.size(); x++) {
- messages.add(store.getMessage(uriList.get(x)));
- }
- logger.info("total messages read from db: " + (messages.size()-1));
-
- MessageStore_brokentest.runAfterAllTests();
-
- }
-
- protected static void runBeforeAllTests() throws Exception{
-
- 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");
- }
-
- }
-
- private static void runAfterAllTests() throws Exception{
-
- if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
- HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
- Configuration.getStoreUser(),Configuration.getStorePwd() );
- }
- }
-
- public static void main(String args[]) {
- MessageStore_brokentest test = new MessageStore_brokentest();
- try {
- test.test();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
-
-}
More information about the jboss-svn-commits
mailing list