[jboss-svn-commits] JBL Code SVN: r5580 - in labs/jbossesb/trunk/product: config config/lib core/common core/common/tests core/common/tests/src/org/jboss/soa/esb/common/tests core/common/tests/src/org/jboss/soa/esb/connection core/services/src/org/jboss/soa/esb/services/beans core/services/tests/src/org/jboss/soa/esb/services/EJB/test
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 7 18:36:51 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-08-07 18:36:33 -0400 (Mon, 07 Aug 2006)
New Revision: 5580
Added:
labs/jbossesb/trunk/product/config/lib/hsqldb.jar
Modified:
labs/jbossesb/trunk/product/config/deployment.properties-example
labs/jbossesb/trunk/product/core/common/
labs/jbossesb/trunk/product/core/common/tests/build.xml
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/AbandonedConnectionFuncTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/ConnectionPoolFuncTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderFuncTest.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/NotificationHandlerBean.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerUnitTest.java
Log:
Fixing db connection tests
Modified: labs/jbossesb/trunk/product/config/deployment.properties-example
===================================================================
--- labs/jbossesb/trunk/product/config/deployment.properties-example 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/config/deployment.properties-example 2006-08-07 22:36:33 UTC (rev 5580)
@@ -15,13 +15,13 @@
######################################################################
# reference to jboss esb configuration file
# mail server host
-org.jboss.soa.esb.mail.smtp.host=mail.mydomain.com
+org.jboss.soa.esb.mail.smtp.host=mail.osserver.net
# smtp port of the host
org.jboss.soa.esb.mail.smtp.port=25
# email user account
-org.jboss.soa.esb.mail.smtp.user=user
+org.jboss.soa.esb.mail.smtp.user=
# email account password
-org.jboss.soa.esb.mail.smtp.password=password
+org.jboss.soa.esb.mail.smtp.password=
# reference to object store config
org.jboss.esb.config.objstore=/cygwin/home/kstam/dev1.6/loanbrokerdemo/conf/ObjStore.xml
#
@@ -53,19 +53,22 @@
# databases too.
#
# postgres : pg74.216.jdbc2ee.jar
-org.jboss.esb.test.db.driver.jar=pg74.216.jdbc2ee.jar
+# hsql : hsqldb.jar
+org.jboss.esb.test.db.driver.jar=hsqldb.jar
# database driver
# postgres : org.postgresql.Driver
+# hsql : org.hsqldb.jdbcDriver
# oracle : oracle.jdbc.driver.OracleDriver
-org.jboss.esb.test.db.driver=org.postgresql.Driver
+org.jboss.esb.test.db.driver=org.hsqldb.jdbcDriver
# database url
# postgres : jdbc:postgresql://localhost:5432/jbossesb
+# hsql : jdbc:hsqldb:.
# oracle : jdbc:oracle:thin:@localhost:1523:jbossesb
-org.jboss.esb.test.db.url=jdbc:postgresql://localhost:5432/jbossesb
+org.jboss.esb.test.db.url=jdbc:hsqldb:.
# database user
-org.jboss.esb.test.db.user=postgres
+org.jboss.esb.test.db.user=sa
# database password
-org.jboss.esb.test.db.password=postgres
+org.jboss.esb.test.db.password=
#
######################################################################
Added: labs/jbossesb/trunk/product/config/lib/hsqldb.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/config/lib/hsqldb.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: labs/jbossesb/trunk/product/core/common
___________________________________________________________________
Name: svn:ignore
+
build
Modified: labs/jbossesb/trunk/product/core/common/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-07 22:36:33 UTC (rev 5580)
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<project name="build.common.tests" default="org.jboss.esb.common.tests.compile" basedir=".">
+ <property name="org.jboss.esb.internal.dest" value="${basedir}/../../../build"/>
<property name="org.jboss.esb.module.src.dir" value="../src"/>
<property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/common"/>
<property name="org.jboss.esb.module.tests.src.dir" value="${basedir}/src"/>
@@ -10,13 +11,23 @@
<property environment="env"/>
<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ejb3_embedded"/>
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.deploy.lib.dir" value="${org.jboss.esb.root.dir}/config/lib/"/>
+
+ <!-- Set deployment properties filename -->
+ <property name="org.jboss.esb.deployment.properties" value="../../../config/deployment.properties"/>
+ <!-- Load Build Properties File -->
+ <property file="${org.jboss.esb.deployment.properties}"/>
+ <property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/common/tests/resources/conf"/>
+
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
<path id="org.jboss.esb.tests.base.classpath">
<fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+ <fileset dir="../${org.jboss.esb.deploy.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
+ <pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
<fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="jboss-ejb3-all.jar hibernate-all.jar thirdparty-all"/>
</path>
@@ -54,6 +65,7 @@
<!-- T E S T -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.common.internal.test">
+
<property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/common"/>
<property name="org.jboss.esb.module.classes.instr.dir" value="${org.jboss.esb.module.tests.coverage.dir}/instr" />
@@ -91,7 +103,6 @@
<batchtest todir="${org.jboss.esb.tests.report.dir}">
<fileset dir="${org.jboss.esb.module.tests.src.dir}">
<include name="**/**UnitTest.java"/>
- <exclude name="**/connection/**"/>
<include name="**/**FuncTest.java"/>
</fileset>
</batchtest>
@@ -106,6 +117,12 @@
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=true" />
+
+ <sysproperty key="org.jboss.esb.test.db.driver" value="${org.jboss.esb.test.db.driver}"/>
+ <sysproperty key="org.jboss.esb.test.db.url" value="${org.jboss.esb.test.db.url}"/>
+ <sysproperty key="org.jboss.esb.test.db.user" value="${org.jboss.esb.test.db.user}"/>
+ <sysproperty key="org.jboss.esb.test.db.password" value="${org.jboss.esb.test.db.password}"/>
+ <sysproperty key="log4j.configuration" value="log4j.xml"/>
</junit>
<junitreport>
<fileset dir="${org.jboss.esb.tests.report.dir}">
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-08-07 22:36:33 UTC (rev 5580)
@@ -24,6 +24,7 @@
import java.util.HashMap;
import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
import junit.framework.TestCase;
@@ -52,7 +53,7 @@
protected Logger log = Logger.getLogger(getClass());
/** Contains user and or deployment specific paramater */
- private static HashMap<String,String> SYSTEM_PARAMETERS;
+ public static HashMap<String,String> SYSTEM_PARAMETERS;
/**
* Default class constructor.
*/
@@ -78,10 +79,10 @@
private HashMap<String,String> readSystemParameters()
{
//Reading system parameter
- String dbDriver = System.getProperty(DB_DRIVER , "org.postgresql.Driver");
- String dbUrl = System.getProperty(DB_PASSWORD, "jdbc:postgresql://localhost:5432/jbossesb");
- String dbUsername = System.getProperty(DB_USERNAME, "postgres");
- String dbPassword = System.getProperty(DB_PASSWORD, "postgres");
+ String dbDriver = System.getProperty(DB_DRIVER , "org.hsqldb.jdbcDriver");
+ String dbUrl = System.getProperty(DB_URL, "jdbc:hsqldb:.");
+ String dbUsername = System.getProperty(DB_USERNAME, "sa");
+ String dbPassword = System.getProperty(DB_PASSWORD, "");
//Setting the paremeters in the HashMap
HashMap<String,String> systemParameters = new HashMap<String,String>();
systemParameters.put(DB_DRIVER, dbDriver);
@@ -89,6 +90,12 @@
systemParameters.put(DB_USERNAME, dbUsername);
systemParameters.put(DB_PASSWORD, dbPassword);
+ log.log(Priority.INFO, "DB parameters:");
+ log.log(Priority.INFO, "Driver=" + dbDriver);
+ log.log(Priority.INFO, "url=" + dbUrl);
+ log.log(Priority.INFO, "username=" + dbUsername);
+ log.log(Priority.INFO, "password=" + dbPassword);
+
return systemParameters;
}
}
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/AbandonedConnectionFuncTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/AbandonedConnectionFuncTest.java 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/AbandonedConnectionFuncTest.java 2006-08-07 22:36:33 UTC (rev 5580)
@@ -24,25 +24,29 @@
import junit.framework.TestCase;
import java.sql.Connection;
+import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import org.jboss.soa.esb.common.tests.BaseTest;
+
/**
* TODO
* User: MohitK
* Date: Aug 3, 2006
*/
-public class AbandonedConnectionFuncTest extends TestCase {
+public class AbandonedConnectionFuncTest extends BaseTest {
Properties properties = new Properties();
protected void setUp() throws Exception {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, "com.mysql.jdbc.Driver");
- properties.put(ConnectionProperties.CONNECTION_URL, "jdbc:mysql://localhost/rosetta");
- properties.put(ConnectionProperties.USERNAME, "rosetta");
- properties.put(ConnectionProperties.PASSWORD, "rosetta");
+
+ properties.put(ConnectionProperties.DRIVER_CLASSNAME, SYSTEM_PARAMETERS.get(DB_DRIVER));
+ properties.put(ConnectionProperties.CONNECTION_URL, SYSTEM_PARAMETERS.get(DB_URL));
+ properties.put(ConnectionProperties.USERNAME, SYSTEM_PARAMETERS.get(DB_USERNAME));
+ properties.put(ConnectionProperties.PASSWORD, SYSTEM_PARAMETERS.get(DB_PASSWORD));
properties.put(ConnectionProperties.ABANDONED_CONNECTION_CHECK_INTERVAL, "30000");
}
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/ConnectionPoolFuncTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/ConnectionPoolFuncTest.java 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/ConnectionPoolFuncTest.java 2006-08-07 22:36:33 UTC (rev 5580)
@@ -21,7 +21,8 @@
*/
package org.jboss.soa.esb.connection;
-import junit.framework.TestCase;
+
+import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.connection.ConnectionProperties;
import org.jboss.soa.esb.connection.PoolDataSource;
@@ -36,15 +37,15 @@
* @author MohitK
* Date: Jul 22, 2006
*/
-public class ConnectionPoolFuncTest extends TestCase {
+public class ConnectionPoolFuncTest extends BaseTest {
Properties properties = new Properties();
protected void setUp() throws Exception {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, "com.mysql.jdbc.Driver");
- properties.put(ConnectionProperties.CONNECTION_URL, "jdbc:mysql://localhost/rosetta");
- properties.put(ConnectionProperties.USERNAME, "rosetta");
- properties.put(ConnectionProperties.PASSWORD, "rosetta");
+ properties.put(ConnectionProperties.DRIVER_CLASSNAME, SYSTEM_PARAMETERS.get(DB_DRIVER));
+ properties.put(ConnectionProperties.CONNECTION_URL, SYSTEM_PARAMETERS.get(DB_URL));
+ properties.put(ConnectionProperties.USERNAME, SYSTEM_PARAMETERS.get(DB_USERNAME));
+ properties.put(ConnectionProperties.PASSWORD, SYSTEM_PARAMETERS.get(DB_PASSWORD));
}
@@ -56,6 +57,7 @@
try {
con = ds.getConnection();
stat = con.createStatement();
+ stat.execute("CREATE TABLE uid_table (uid integer NOT NULL)");
ResultSet rs = stat.executeQuery("SELECT count(*) FROM uid_table");
while (rs.next()) {
int count = rs.getInt(1);
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderFuncTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderFuncTest.java 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderFuncTest.java 2006-08-07 22:36:33 UTC (rev 5580)
@@ -21,29 +21,29 @@
*/
package org.jboss.soa.esb.connection;
-import junit.framework.TestCase;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import org.jboss.soa.esb.common.tests.BaseTest;
+
/**
* TODO
*
* @author MohitK
* Date: Aug 1, 2006
*/
-public class PasswordDecoderFuncTest extends TestCase {
+public class PasswordDecoderFuncTest extends BaseTest {
Properties properties = new Properties();
protected void setUp() throws Exception {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, "com.mysql.jdbc.Driver");
- properties.put(ConnectionProperties.CONNECTION_URL, "jdbc:mysql://localhost/rosetta");
- properties.put(ConnectionProperties.USERNAME, "rosetta");
- properties.setProperty(ConnectionProperties.PASSWORD_DECODER, PasswordDecoderTestImpl.class.getName());
+ properties.put(ConnectionProperties.DRIVER_CLASSNAME, SYSTEM_PARAMETERS.get(DB_DRIVER));
+ properties.put(ConnectionProperties.CONNECTION_URL, SYSTEM_PARAMETERS.get(DB_URL));
+ properties.put(ConnectionProperties.USERNAME, SYSTEM_PARAMETERS.get(DB_USERNAME));
+ properties.put(ConnectionProperties.PASSWORD, SYSTEM_PARAMETERS.get(DB_PASSWORD));
}
public void testPasswordDecoder() {
@@ -55,6 +55,7 @@
try {
con1 = ds.getConnection();
stat = con1.createStatement();
+ stat.execute("CREATE TABLE uid_table (uid integer NOT NULL)");
ResultSet rs = stat.executeQuery("SELECT count(*) FROM uid_table");
while (rs.next()) {
int count = rs.getInt(1);
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/NotificationHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/NotificationHandlerBean.java 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/NotificationHandlerBean.java 2006-08-07 22:36:33 UTC (rev 5580)
@@ -40,7 +40,6 @@
import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
-import javax.naming.InitialContext;
import java.io.Serializable;
/**
* @author Esteban
@@ -65,8 +64,8 @@
public void create() throws Exception
{ try
{ m_oLogger = Util.getDefaultLogger(this.getClass());
-// Context oCtxInit =
- new InitialContext();
+ //Context oCtxInit =
+ // new InitialContext();
m_oLogger.info(this.toString()+" Created");
}
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerUnitTest.java 2006-08-07 22:34:26 UTC (rev 5579)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/EJB/test/PersistHandlerUnitTest.java 2006-08-07 22:36:33 UTC (rev 5580)
@@ -52,8 +52,6 @@
return new EJBContainerSetup(suite);
}
-
-
}
More information about the jboss-svn-commits
mailing list