You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/08/06 16:26:49 UTC
svn commit: r982986 - in /qpid/trunk/qpid/java: ./
broker-plugins/experimental/info/
broker/src/test/java/org/apache/qpid/server/util/
common/src/test/java/org/apache/qpid/test/
common/src/test/java/org/apache/qpid/test/utils/ integrationtests/ perftes...
Author: robbie
Date: Fri Aug 6 14:26:48 2010
New Revision: 982986
URL: http://svn.apache.org/viewvc?rev=982986&view=rev
Log:
QPID-2787: Move QpidTestCase to Common test module so that any test can inherit from it, allowing exclusions to be applied.
Add ability to gather the class name of the message store associated with the test profile in use.
Added:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
- copied, changed from r982921, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Removed:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified:
qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
qpid/trunk/qpid/java/integrationtests/build.xml
qpid/trunk/qpid/java/module.xml
qpid/trunk/qpid/java/perftests/build.xml
qpid/trunk/qpid/java/test-profiles/default.testprofile
qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile
qpid/trunk/qpid/java/test-profiles/java-derby.testprofile
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/info/build.xml Fri Aug 6 14:26:48 2010
@@ -21,7 +21,7 @@ nn - or more contributor license agreeme
<project name="AMQ Broker Info Plugin" default="build">
<property name="module.depends" value="common broker broker-plugins"/>
- <property name="module.test.depends" value="test broker/test management/common client systests"/>
+ <property name="module.test.depends" value="test broker/test management/common client systests common/test"/>
<property name="module.manifest" value="MANIFEST.MF"/>
<property name="module.plugin" value="true"/>
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java Fri Aug 6 14:26:48 2010
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.util;
-import junit.framework.TestCase;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.qpid.AMQException;
import org.apache.qpid.common.AMQPFilterTypes;
@@ -44,10 +43,11 @@ import org.apache.qpid.server.registry.I
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TestableMemoryMessageStore;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.util.MockChannel;
-public class InternalBrokerBaseCase extends TestCase
+public class InternalBrokerBaseCase extends QpidTestCase
{
protected IApplicationRegistry _registry;
protected MessageStore _messageStore;
Copied: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java (from r982921, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java?p2=qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java&p1=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java&r1=982921&r2=982986&rev=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java Fri Aug 6 14:26:48 2010
@@ -35,7 +35,7 @@ import org.apache.log4j.Logger;
public class QpidTestCase extends TestCase
{
protected static final Logger _logger = Logger.getLogger(QpidTestCase.class);
-
+
/**
* Some tests are excluded when the property test.excludes is set to true.
* An exclusion list is either a file (prop test.excludesfile) which contains one test name
@@ -91,8 +91,21 @@ public class QpidTestCase extends TestCa
}
}
+ protected static final String MS_CLASS_NAME_KEY = "messagestore.class.name";
+ protected static final String MEMORY_STORE_CLASS_NAME = "org.apache.qpid.server.store.MemoryMessageStore";
+
private static List<String> _exclusionList;
+ public QpidTestCase()
+ {
+ this("QpidTestCase");
+ }
+
+ public QpidTestCase(String name)
+ {
+ super(name);
+ }
+
public void run(TestResult testResult)
{
if (_exclusionList != null && (_exclusionList.contains(getClass().getPackage().getName() + ".*") ||
@@ -107,14 +120,11 @@ public class QpidTestCase extends TestCa
super.run(testResult);
}
}
-
- public QpidTestCase(String name)
- {
- super(name);
- }
-
- public QpidTestCase()
+
+ public String getTestProfileMessageStoreClassName()
{
- this("QpidTestCase");
+ String storeClass = System.getProperty(MS_CLASS_NAME_KEY);
+
+ return storeClass != null ? storeClass : MEMORY_STORE_CLASS_NAME ;
}
}
Modified: qpid/trunk/qpid/java/integrationtests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/integrationtests/build.xml?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/integrationtests/build.xml (original)
+++ qpid/trunk/qpid/java/integrationtests/build.xml Fri Aug 6 14:26:48 2010
@@ -20,7 +20,7 @@
-->
<project name="Integration Tests" default="build">
- <property name="module.depends" value="systests client common junit-toolkit"/>
+ <property name="module.depends" value="systests client common common/test junit-toolkit"/>
<property name="module.dist" value="false"/>
<import file="../module.xml"/>
Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Fri Aug 6 14:26:48 2010
@@ -324,6 +324,7 @@
<sysproperty key="broker.ready" value="${broker.ready}" />
<sysproperty key="broker.stopped" value="${broker.stopped}" />
<sysproperty key="broker.config" value="${broker.config}" />
+ <sysproperty key="messagestore.class.name" value="${messagestore.class.name}" />
<sysproperty key="test.output" value="${module.results}"/>
<sysproperty key="qpid.amqp.version" value="${qpid.amqp.version}"/>
Modified: qpid/trunk/qpid/java/perftests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/build.xml?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/build.xml (original)
+++ qpid/trunk/qpid/java/perftests/build.xml Fri Aug 6 14:26:48 2010
@@ -20,7 +20,7 @@
-->
<project name="Performance Tests" default="build">
- <property name="module.depends" value="systests client broker common junit-toolkit"/>
+ <property name="module.depends" value="systests client broker common common/test junit-toolkit"/>
<import file="../module.xml"/>
Modified: qpid/trunk/qpid/java/test-profiles/default.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/default.testprofile?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/default.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/default.testprofile Fri Aug 6 14:26:48 2010
@@ -5,9 +5,10 @@ broker.version=0-8
broker=vm
broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
broker.ready=Listening on TCP port
-broker.config=${project.root}/build/etc/config-systests.xml
broker.start=${test.profiles}/start-broker
broker.kill=${test.profiles}/kill-broker
+broker.config=${project.root}/build/etc/config-systests.xml
+messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
max_prefetch=1000
qpid.dest_syntax=BURL
Modified: qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile Fri Aug 6 14:26:48 2010
@@ -5,6 +5,7 @@ broker.clean=${test.profiles}/clean-dir
broker.ready=BRK-1004
broker.stopped=Exception
broker.config=${project.root}/build/etc/config-systests-derby.xml
+messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes
broker.clean.between.tests=true
broker.persistent=true
Modified: qpid/trunk/qpid/java/test-profiles/java-derby.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile?rev=982986&r1=982985&r2=982986&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-derby.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-derby.testprofile Fri Aug 6 14:26:48 2010
@@ -4,6 +4,7 @@ broker.clean=${test.profiles}/clean-dir
broker.ready=BRK-1004
broker.stopped=Exception
broker.config=${project.root}/build/etc/config-systests-derby.xml
+messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes
broker.clean.between.tests=true
broker.persistent=true
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org