[jboss-cvs] JBoss Messaging SVN: r2768 - in trunk/tests/src/org/jboss/test/messaging: tools/jmx and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 8 07:27:31 EDT 2007
Author: sergeypk
Date: 2007-06-08 07:27:31 -0400 (Fri, 08 Jun 2007)
New Revision: 2768
Modified:
trunk/tests/src/org/jboss/test/messaging/core/plugin/base/PostOfficeTestBase.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-793 - removed hardcoded choice of mysql database from tests.
Pick the persistence service configuration based on the current database name, not its type.
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/base/PostOfficeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/base/PostOfficeTestBase.java 2007-06-07 15:15:02 UTC (rev 2767)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/base/PostOfficeTestBase.java 2007-06-08 11:27:31 UTC (rev 2768)
@@ -132,11 +132,7 @@
// we're testing with priority JGroups stack configurations we're shipping with the release
- // TODO (ovidiu) we're currently using the mysql configuration file. We could refine this even
- // further by actually figuring out what database we're currently running on, and use
- // that file. Useful when we'll run database matrix tests.
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-793
- String configFilePath = "server/default/deploy/clustered-mysql-persistence-service.xml";
+ String configFilePath = sc.getPersistenceConfigFile(true);
// TODO (ovidiu) we're temporarily ignoring the multiplex option, it doesn't work well
boolean ignoreMultiplexer = true;
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2007-06-07 15:15:02 UTC (rev 2767)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2007-06-08 11:27:31 UTC (rev 2768)
@@ -615,13 +615,23 @@
return mbeanServer.invoke(on, "getInstance", new Object[0], new String[0]);
}
- public Properties getPersistenceManagerSQLProperties() throws Exception
+ public String getPersistenceConfigFile(boolean clustered)
{
- String databaseType = getDatabaseType();
+ String databaseName = getDatabaseName();
- String persistenceConfigFile =
- "server/default/deploy/" + databaseType + "-persistence-service.xml";
+ if (clustered && !getDatabaseType().equals("hsqldb"))
+ {
+ return "server/default/deploy/clustered-" + databaseName + "-persistence-service.xml";
+ }
+ else
+ {
+ return "server/default/deploy/" + databaseName + "-persistence-service.xml";
+ }
+ }
+ public Properties getPersistenceManagerSQLProperties() throws Exception
+ {
+ String persistenceConfigFile = getPersistenceConfigFile(false);
log.info("Persistence config file: .... " + persistenceConfigFile);
URL persistenceConfigFileURL = getClass().getClassLoader().getResource(persistenceConfigFile);
@@ -655,11 +665,7 @@
public Properties getPostOfficeSQLProperties() throws Exception
{
- String databaseType = getDatabaseType();
-
- String persistenceConfigFile =
- "server/default/deploy/" + databaseType + "-persistence-service.xml";
-
+ String persistenceConfigFile = getPersistenceConfigFile(false);
log.info("Peristence config file: .. " + persistenceConfigFile);
URL persistenceConfigFileURL = getClass().getClassLoader().getResource(persistenceConfigFile);
@@ -693,20 +699,7 @@
public Properties getClusteredPostOfficeSQLProperties() throws Exception
{
- String databaseType = getDatabaseType();
-
- String persistenceConfigFile;
- if (databaseType.equals("hsqldb"))
- {
- persistenceConfigFile =
- "server/default/deploy/" + databaseType + "-persistence-service.xml";
- }
- else
- {
- persistenceConfigFile =
- "server/default/deploy/clustered-" + databaseType + "-persistence-service.xml";
- }
-
+ String persistenceConfigFile = getPersistenceConfigFile(true);
log.info("Persistence config file: .... " + persistenceConfigFile);
URL persistenceConfigFileURL = getClass().getClassLoader().getResource(persistenceConfigFile);
@@ -903,6 +896,11 @@
stopManagedConnectionPool(JMS_MANAGED_CONNECTION_POOL_OBJECT_NAME);
undeployJBossJMSRA(JMS_MANAGED_CONNECTION_FACTORY_OBJECT_NAME);
}
+
+ public String getDatabaseName()
+ {
+ return config.getDatabaseName();
+ }
public String getDatabaseType()
{
@@ -1776,6 +1774,6 @@
}
}
}
-
+
// Inner classes --------------------------------------------------------------------------------
}
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java 2007-06-07 15:15:02 UTC (rev 2767)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java 2007-06-08 11:27:31 UTC (rev 2768)
@@ -89,6 +89,11 @@
// Public --------------------------------------------------------
+ public String getDatabaseName()
+ {
+ return database;
+ }
+
/**
* @return the token that follows after jdbc: in the database URL. So far, we know of
* "hsqldb", "mysql", "oracle", "postgresql".
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2007-06-07 15:15:02 UTC (rev 2767)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2007-06-08 11:27:31 UTC (rev 2768)
@@ -138,7 +138,7 @@
sc = new ServiceContainer(containerConfig, null, serverIndex);
sc.start(clearDatabase, attrOverrides);
- if (this.getDatabaseType().equals("hsqldb") && sc.isClustered())
+ if (sc.getDatabaseType().equals("hsqldb") && sc.isClustered())
{
throw new IllegalStateException("The test server cannot be started in clustered mode with hsqldb as a database - must use a shared database");
}
@@ -245,11 +245,6 @@
return sc.query(pattern);
}
- public String getDatabaseType()
- {
- return sc.getDatabaseType();
- }
-
public String getRemotingTransport()
{
return sc.getRemotingTransport();
@@ -313,22 +308,9 @@
throw new Exception("Cannot find " + mainConfigFile + " in the classpath");
}
- String databaseType = sc.getDatabaseType();
- String persistenceConfigFile;
+ String databaseName = sc.getDatabaseName();
+ String persistenceConfigFile = sc.getPersistenceConfigFile(clustered);
- if (clustered && !databaseType.equals("hsqldb"))
- {
- // HSQL can't be used for clustered server peer - since it's not a shared database
-
- persistenceConfigFile =
- "server/default/deploy/clustered-" + databaseType + "-persistence-service.xml";
- }
- else
- {
- persistenceConfigFile =
- "server/default/deploy/" + databaseType + "-persistence-service.xml";
- }
-
log.info(" Persistence config file .. " + persistenceConfigFile);
URL persistenceConfigFileURL =
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2007-06-07 15:15:02 UTC (rev 2767)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2007-06-08 11:27:31 UTC (rev 2768)
@@ -260,11 +260,6 @@
return server.query(pattern);
}
- public String getDatabaseType()
- {
- return server.getDatabaseType();
- }
-
public String getRemotingTransport()
{
return server.getRemotingTransport();
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java 2007-06-07 15:15:02 UTC (rev 2767)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java 2007-06-08 11:27:31 UTC (rev 2768)
@@ -105,8 +105,6 @@
*/
Set query(ObjectName pattern) throws Exception;
- String getDatabaseType() throws Exception;
-
/**
* @return one of "socket", "http", ...
*/
More information about the jboss-cvs-commits
mailing list