modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
| 15 ++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit c9fd433d4def90e9d66eba530d8b1f656935d3e0
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Oct 29 15:41:37 2009 -0400
our unit tests need to ensure the default database type is set
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 5ad7e83..b1dafaa 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.server.test;
+import java.sql.Connection;
import java.util.Hashtable;
import java.util.Properties;
@@ -51,6 +52,7 @@ import org.rhq.enterprise.server.auth.SessionManager;
import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
import org.rhq.enterprise.server.scheduler.SchedulerService;
import org.rhq.enterprise.server.scheduler.SchedulerServiceMBean;
+import org.rhq.enterprise.server.util.LookupUtil;
/**
* This is the abstract test base for server jar tests.
@@ -94,14 +96,13 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
System.err.println("...... deploying MM ejb3.....");
System.err.println("...... ejb3 deployed....");
-
// Deploy everything we got
//deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
deployer.create();
System.err.println("...... deployer created....");
// Set the hibernate dialect
-//
System.setProperty("hibernate.dialect","org.hibernate.dialect.Oracle10gDialect");
// TODO
+ //
System.setProperty("hibernate.dialect","org.hibernate.dialect.Oracle10gDialect");
// TODO
deployer.start();
System.err.println("...... deployer started....");
@@ -129,6 +130,16 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
@BeforeMethod
public static void startTest() {
+ if (DatabaseTypeFactory.getDefaultDatabaseType() == null) {
+ try {
+ Connection conn = LookupUtil.getDataSource().getConnection();
+
DatabaseTypeFactory.setDefaultDatabaseType(DatabaseTypeFactory.getDatabaseType(conn));
+ } catch (Exception e) {
+ System.err.println("!!! WARNING !!! cannot set default database
type, some tests may fail");
+ e.printStackTrace();
+ }
+ }
+
start = stats.getQueryExecutionCount();
}
Show replies by date