[jboss-svn-commits] JBL Code SVN: r7465 - in labs/jbossesb/trunk: product/core/rosetta product/core/rosetta/tests/src/org/jboss/soa/esb product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests product/core/rosetta/tests/src/org/jboss/soa/esb/testutils product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests product/core/services/tests/src/org/jboss/soa/esb/services/registry product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr qa/junit/src/org/jboss/soa/esb/actions qa/junit/src/org/jboss/soa/esb/listeners/message qa/junit/src/org/jboss/soa/esb/messagestore qa/junit/src/org/jboss/soa/esb/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 8 09:03:51 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-11-08 09:03:45 -0500 (Wed, 08 Nov 2006)
New Revision: 7465
Added:
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/HsqldbUtil.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
Removed:
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/HsqldbUtil.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/TestUtil.java
Modified:
labs/jbossesb/trunk/product/core/rosetta/build.xml
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java
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/services/registry/RegistryUnitTest.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/CbrProxyActionUnitTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
Log:
Building a testutil.jar so we can reuse these class in qa and tb.
Modified: labs/jbossesb/trunk/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-11-08 14:03:45 UTC (rev 7465)
@@ -71,6 +71,9 @@
includes="**/*.class"
excludes="test/**"
/>
+ <jar destfile="${org.jboss.esb.rosetta.distrib.dir}/lib/test-util.jar"
+ basedir="${org.jboss.esb.internal.dest}/tests/"
+ includes="org/jboss/soa/esb/testutils/**/*.class"/>
</target>
Deleted: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/HsqldbUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/HsqldbUtil.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/HsqldbUtil.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -1,64 +0,0 @@
-package org.jboss.soa.esb.common.tests;
-
-import java.sql.DriverManager;
-import java.sql.Statement;
-
-import org.hsqldb.Server;
-/**
- * Utility to start and stop a hsql Database.
- *
- * @author <a href="mailto:kurt.stam at jboss.com">Kurt Stam</a>
- *
- */
-public class HsqldbUtil
-{
- final private static String THREAD_NAME = "hypersonic-unittest";
- /**
- * Starts the hsql database in it's own thread.
- * Don't forget to shut it down when you're done.
- *
- * @param databaseFile - i.e. build/hsqltestdb
- * @param databaseName - i.e. jbossesb
- * @throws Exception
- */
- public static void startHsqldb(final String databaseFile,
- final String databaseName) throws Exception
- {
- // Start DB in new thread, or else it will block us
- Thread serverThread = new Thread(THREAD_NAME) {
- public void run() {
- try {
- // Create startup arguments
- String[] args = new String[4];
- args[0] = "-database.0";
- args[1] = databaseFile;
- args[2] = "-dbname.0";
- args[3] = databaseName;
-
- // Start server
- Server.main(args);
- } catch (Exception e) {
- e.printStackTrace();
- }
- //log.error("Failed to start database", e);
- }
- };
- serverThread.run();
- }
- /**
- *
- * @param url
- * @param username
- * @param password
- * @throws Exception
- */
- public static void stopHsqldb(String url, String username, String password) throws Exception {
- java.sql.Connection connection = DriverManager.getConnection(
- url, username, password);
- Statement statement = connection.createStatement();
- String shutdownCommand = "SHUTDOWN COMPACT";
- statement.executeQuery(shutdownCommand);
- }
-
-
-}
Deleted: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/TestUtil.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -1,54 +0,0 @@
-package org.jboss.soa.esb.common.tests;
-
-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;
-
-public class TestUtil
-{
- private static Logger log = Logger.getLogger(TestUtil.class);
- private static String _prefix=null;
- /**
- * When performing file system interaction, the user.dir may differ (i.e. running the
- * tests from within eclipse).
- */
- public static String getPrefix()
- {
- if (_prefix==null) {
- _prefix="";
- String baseDir = System.getProperty("user.dir");
- log.log(Priority.INFO, baseDir);
- if (!baseDir.endsWith("product")) {
- _prefix = "product/";
- }
- }
- return _prefix;
- }
- /**
- * Sets the jbossesb-properties.xml to use for test
- */
- 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";
- 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();
- }
-
-}
Copied: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/HsqldbUtil.java (from rev 7462, labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/HsqldbUtil.java)
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/HsqldbUtil.java 2006-11-08 12:48:25 UTC (rev 7462)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/HsqldbUtil.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -0,0 +1,64 @@
+package org.jboss.soa.esb.testutils;
+
+import java.sql.DriverManager;
+import java.sql.Statement;
+
+import org.hsqldb.Server;
+/**
+ * Utility to start and stop a hsql Database.
+ *
+ * @author <a href="mailto:kurt.stam at jboss.com">Kurt Stam</a>
+ *
+ */
+public class HsqldbUtil
+{
+ final private static String THREAD_NAME = "hypersonic-unittest";
+ /**
+ * Starts the hsql database in it's own thread.
+ * Don't forget to shut it down when you're done.
+ *
+ * @param databaseFile - i.e. build/hsqltestdb
+ * @param databaseName - i.e. jbossesb
+ * @throws Exception
+ */
+ public static void startHsqldb(final String databaseFile,
+ final String databaseName) throws Exception
+ {
+ // Start DB in new thread, or else it will block us
+ Thread serverThread = new Thread(THREAD_NAME) {
+ public void run() {
+ try {
+ // Create startup arguments
+ String[] args = new String[4];
+ args[0] = "-database.0";
+ args[1] = databaseFile;
+ args[2] = "-dbname.0";
+ args[3] = databaseName;
+
+ // Start server
+ Server.main(args);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //log.error("Failed to start database", e);
+ }
+ };
+ serverThread.run();
+ }
+ /**
+ *
+ * @param url
+ * @param username
+ * @param password
+ * @throws Exception
+ */
+ public static void stopHsqldb(String url, String username, String password) throws Exception {
+ java.sql.Connection connection = DriverManager.getConnection(
+ url, username, password);
+ Statement statement = connection.createStatement();
+ String shutdownCommand = "SHUTDOWN COMPACT";
+ statement.executeQuery(shutdownCommand);
+ }
+
+
+}
Added: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -0,0 +1,80 @@
+package org.jboss.soa.esb.testutils;
+
+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;
+
+public class TestEnvironmentUtil
+{
+ private static Logger log = Logger.getLogger(TestEnvironmentUtil.class);
+
+ public static String getUserDir()
+ {
+ return getUserDir("product");
+ }
+ /**
+ * When performing file system interaction, the user.dir may differ (i.e. running the
+ * tests from within eclipse).
+ */
+ public static String getUserDir(String dir)
+ {
+ String userDir="";
+ String baseDir = System.getProperty("user.dir");
+ log.log(Priority.INFO, baseDir);
+ if (!baseDir.endsWith(dir)) {
+ userDir = dir + "/";
+ }
+ return userDir;
+ }
+
+ /**
+ * When performing file system interaction, the user.dir may differ (i.e. running the
+ * tests from within eclipse).
+ */
+ public static String getUserDir(String eclipseDir, String antDir)
+ {
+ String _prefix="";
+ String baseDir = System.getProperty("user.dir");
+ log.log(Priority.INFO, baseDir);
+ if (!baseDir.endsWith(eclipseDir)) {
+ _prefix = eclipseDir + "/";
+ } else {
+ _prefix = antDir;
+ }
+ return _prefix;
+ }
+
+ public static void setESBPropertiesFileToUse()
+ {
+ //Set the jbossesb properties file in System, so we can pick up the one for testing
+ String jbossesbPropertiesFile = getUserDir() + "etc/test/resources/jbossesb-unittest-properties.xml";
+ System.setProperty("org.jboss.soa.esb.propertyFile", jbossesbPropertiesFile);
+ }
+ /**
+ * Sets the jbossesb-properties.xml to use for test
+ */
+ public static void setESBPropertiesFileToUse(String dir)
+ {
+ //Set the jbossesb properties file in System, so we can pick up the one for testing
+ String jbossesbPropertiesFile = getUserDir(dir) + "etc/test/resources/jbossesb-unittest-properties.xml";
+ 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();
+ }
+
+}
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -54,10 +54,10 @@
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.common.tests.HsqldbUtil;
-import org.jboss.soa.esb.common.tests.TestUtil;
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.services.util.FileUtil;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -213,8 +213,8 @@
@BeforeClass
public static void runBeforeAllTests() throws Exception {
try {
- DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
- TestUtil.setESBPropertiesFileToUse();
+ DOMConfigurator.configure(TestEnvironmentUtil.getUserDir() + "etc/test/resources/log4j.xml");
+ TestEnvironmentUtil.setESBPropertiesFileToUse();
//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/services/registry/juddi-unittest.properties";
System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
@@ -231,13 +231,13 @@
if ("org.hsqldb.jdbcDriver".equals(mDbDriver)) {
database = "hsqldb";
//Bring up hsql on default port 9001
- HsqldbUtil.startHsqldb(TestUtil.getPrefix() + "build/hsqltestdb", "juddi");
+ HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "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 = TestUtil.getPrefix() + "install/jUDDI-registry/sql/" + database + "/";
+ String sqlDir = TestEnvironmentUtil.getUserDir() + "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"));
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -28,10 +28,10 @@
import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.xml.DOMConfigurator;
-import org.jboss.soa.esb.common.tests.TestUtil;
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.testutils.TestEnvironmentUtil;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -83,7 +83,7 @@
@BeforeClass
public static void runBeforeAllTests() throws Exception
{
- DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
+ DOMConfigurator.configure(TestEnvironmentUtil.getUserDir() + "etc/test/resources/log4j.xml");
}
public static junit.framework.Test suite() {
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-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -41,14 +41,14 @@
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;
-import org.jboss.soa.esb.common.tests.TestUtil;
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;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -131,14 +131,14 @@
@BeforeClass
public static void runBeforeAllTests() {
- TestUtil.setESBPropertiesFileToUse();
+ TestEnvironmentUtil.setESBPropertiesFileToUse();
System.out.println(Configuration.dump());
try {
if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
- HsqldbUtil.startHsqldb(TestUtil.getPrefix() + "build/hsqltestdb", "jbossesb");
+ HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "build/hsqltestdb", "jbossesb");
//Get the registry-schema create scripts
String database = "hsqldb";
- String sqlDir = TestUtil.getPrefix() + "install/message-store/sql/" + database + "/";
+ String sqlDir = TestEnvironmentUtil.getUserDir() + "install/message-store/sql/" + database + "/";
//Drop what is there now, if exists. We want to start fresh.
String sqlCreateCmd = MessageStoreUnitTest.readTextFile(new File(sqlDir + "create_database.sql"));
String sqlDropCmd = MessageStoreUnitTest.readTextFile(new File(sqlDir + "drop_database.sql"));
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -38,9 +38,9 @@
import org.apache.log4j.Priority;
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.common.tests.HsqldbUtil;
-import org.jboss.soa.esb.common.tests.TestUtil;
import org.jboss.soa.esb.services.util.FileUtil;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -162,8 +162,8 @@
@BeforeClass
public static void runBeforeAllTests() {
try {
- DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
- TestUtil.setESBPropertiesFileToUse();
+ DOMConfigurator.configure(TestEnvironmentUtil.getUserDir() + "etc/test/resources/log4j.xml");
+ TestEnvironmentUtil.setESBPropertiesFileToUse();
//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/services/registry/juddi-unittest.properties";
System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
@@ -180,13 +180,13 @@
if ("org.hsqldb.jdbcDriver".equals(mDbDriver)) {
database = "hsqldb";
//Bring up hsql on default port 9001
- HsqldbUtil.startHsqldb(TestUtil.getPrefix() + "build/hsqltestdb", "juddi");
+ HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir() + "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 = TestUtil.getPrefix() + "install/jUDDI-registry/sql/" + database + "/";
+ String sqlDir = TestEnvironmentUtil.getUserDir() + "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"));
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -29,12 +29,12 @@
import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.xml.DOMConfigurator;
-import org.jboss.soa.esb.common.tests.TestUtil;
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.routing.MessageRouter;
import org.jboss.soa.esb.services.routing.MessageRouterException;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -97,8 +97,8 @@
public static void runBeforeAllTests() throws Exception
{
try {
- DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
- TestUtil.setESBPropertiesFileToUse();
+ DOMConfigurator.configure(TestEnvironmentUtil.getUserDir() + "etc/test/resources/log4j.xml");
+ TestEnvironmentUtil.setESBPropertiesFileToUse();
} catch (Exception e) {
e.printStackTrace();
System.out.println("We should stop testing, since we don't any config properties");
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/CbrProxyActionUnitTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/CbrProxyActionUnitTest.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/CbrProxyActionUnitTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -37,7 +37,6 @@
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.tests.HsqldbUtil;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.message.ActionProcessingPipeline;
import org.jboss.soa.esb.listeners.message.EsbListenerController;
@@ -45,7 +44,8 @@
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.services.routing.MessageRouter;
import org.jboss.soa.esb.services.util.FileUtil;
-import org.jboss.soa.esb.util.TestUtil;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -131,8 +131,8 @@
public static void runBeforeAllTests()
{
try {
- DOMConfigurator.configure(TestUtil.getPrefix("product") + "etc/test/resources/log4j.xml");
- TestUtil.setESBPropertiesFileToUse("product");
+ DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product") + "etc/test/resources/log4j.xml");
+ TestEnvironmentUtil.setESBPropertiesFileToUse("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/actions/juddi-unittest.properties";
System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
@@ -149,13 +149,13 @@
if ("org.hsqldb.jdbcDriver".equals(mDbDriver)) {
database = "hsqldb";
//Bring up hsql on default port 9001
- HsqldbUtil.startHsqldb(TestUtil.getPrefix("product") + "build/hsqltestdb", "juddi");
+ HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir("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 = TestUtil.getPrefix("product") + "install/jUDDI-registry/sql/" + database + "/";
+ String sqlDir = TestEnvironmentUtil.getUserDir("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"));
@@ -179,7 +179,7 @@
//Now we can bring up the ContentBasedRouter
logger.info("Testing to see if we can instantiate one");
- String deploymentConfigFile = TestUtil.getPrefix("qa")
+ String deploymentConfigFile = TestEnvironmentUtil.getUserDir("qa")
+ "junit/src/org/jboss/soa/esb/actions/CbrProxyActionUnitTest.xml";
_proc = new EsbListenerController(deploymentConfigFile);
new Thread(_proc).start();
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -36,7 +36,6 @@
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.common.tests.HsqldbUtil;
import org.jboss.soa.esb.couriers.Courier;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.couriers.CourierFactory;
@@ -48,7 +47,8 @@
import org.jboss.soa.esb.services.registry.RegistryFactory;
import org.jboss.soa.esb.services.routing.MessageRouter;
import org.jboss.soa.esb.services.util.FileUtil;
-import org.jboss.soa.esb.util.TestUtil;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -119,8 +119,8 @@
public static void runBeforeAllTests()
{
try {
- DOMConfigurator.configure(TestUtil.getPrefix("product") + "etc/test/resources/log4j.xml");
- TestUtil.setESBPropertiesFileToUse("product");
+ DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product") + "etc/test/resources/log4j.xml");
+ TestEnvironmentUtil.setESBPropertiesFileToUse("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/services/registry/juddi-unittest.properties";
System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
@@ -137,13 +137,13 @@
if ("org.hsqldb.jdbcDriver".equals(mDbDriver)) {
database = "hsqldb";
//Bring up hsql on default port 9001
- HsqldbUtil.startHsqldb(TestUtil.getPrefix("product") + "build/hsqltestdb", "juddi");
+ HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir("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 = TestUtil.getPrefix("product","..") + "install/jUDDI-registry/sql/" + database + "/";
+ String sqlDir = TestEnvironmentUtil.getUserDir("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"));
@@ -167,7 +167,7 @@
//Now we can bring up the ContentBasedRouter
logger.info("Testing to see if we can instantiate one");
- String deploymentConfigFile = TestUtil.getPrefix("qa")
+ String deploymentConfigFile = TestEnvironmentUtil.getUserDir("qa")
+ "junit/src/org/jboss/soa/esb/listeners/message/CbrJmsQueueListenerTest.xml";
_proc = new EsbListenerController(deploymentConfigFile);
new Thread(_proc).start();
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-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -40,7 +40,7 @@
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.util.TestUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
/**
* @author dbrum
@@ -50,7 +50,7 @@
private static Logger logger = Logger.getLogger(MessageStoreTest.class);
public void testMultiClientLoad() throws Exception {
- TestUtil.setESBPropertiesFileToUse("product");
+ TestEnvironmentUtil.setESBPropertiesFileToUse("product");
MessageStoreTest.runBeforeAllTests();
int clients = 5;
@@ -77,7 +77,7 @@
List<URI> uriList = new ArrayList<URI>();
- TestUtil.setESBPropertiesFileToUse("product");
+ TestEnvironmentUtil.setESBPropertiesFileToUse("product");
MessageStoreTest.runBeforeAllTests();
//get the database store
@@ -124,16 +124,16 @@
protected static void runBeforeAllTests() throws Exception{
- TestUtil.setESBPropertiesFileToUse("product");
+ TestEnvironmentUtil.setESBPropertiesFileToUse("product");
if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
- HsqldbUtil.startHsqldb(TestUtil.getPrefix("product") + "build/hsqltestdb", "jbossesb");
+ HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir("product") + "build/hsqltestdb", "jbossesb");
//Get the registry-schema create scripts
String database = "hsqldb";
- logger.info("TestUtil.getPrefixForQA() returns: " + TestUtil.getPrefix("product"));
- String sqlDir = "../" + TestUtil.getPrefix("product") + "install/message-store/sql/" + database + "/";
+ logger.info("TestUtil.getPrefixForQA() returns: " + TestEnvironmentUtil.getUserDir("product"));
+ String sqlDir = "../" + TestEnvironmentUtil.getUserDir("product") + "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"));
+ 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();
Deleted: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/TestUtil.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/TestUtil.java 2006-11-08 13:35:33 UTC (rev 7464)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/TestUtil.java 2006-11-08 14:03:45 UTC (rev 7465)
@@ -1,67 +0,0 @@
-package org.jboss.soa.esb.util;
-
-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;
-
-public class TestUtil
-{
- private static Logger log = Logger.getLogger(TestUtil.class);
- /**
- * When performing file system interaction, the user.dir may differ (i.e. running the
- * tests from within eclipse).
- */
- public static String getPrefix(String eclipseDir)
- {
- String _prefix="";
- String baseDir = System.getProperty("user.dir");
- log.log(Priority.INFO, baseDir);
- if (!baseDir.endsWith(eclipseDir)) {
- _prefix = eclipseDir + "/";
- }
- return _prefix;
- }
- /**
- * When performing file system interaction, the user.dir may differ (i.e. running the
- * tests from within eclipse).
- */
- public static String getPrefix(String eclipseDir, String antDir)
- {
- String _prefix="";
- String baseDir = System.getProperty("user.dir");
- log.log(Priority.INFO, baseDir);
- if (!baseDir.endsWith(eclipseDir)) {
- _prefix = eclipseDir + "/";
- } else {
- _prefix = antDir;
- }
- return _prefix;
- }
- /**
- * Sets the jbossesb-properties.xml to use for test
- */
- public static void setESBPropertiesFileToUse(String dir)
- {
- //Set the jbossesb properties file in System, so we can pick up the one for testing
- String jbossesbPropertiesFile = getPrefix(dir) + "etc/test/resources/jbossesb-unittest-properties.xml";
- 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();
- }
-
-}
More information about the jboss-svn-commits
mailing list