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/02/26 15:46:32 UTC
svn commit: r916698 - in /qpid/branches/0.5.x-dev/qpid/java: ./
systests/src/main/java/org/apache/qpid/test/unit/ct/
systests/src/main/java/org/apache/qpid/test/utils/ test-profiles/
Author: robbie
Date: Fri Feb 26 14:46:32 2010
New Revision: 916698
URL: http://svn.apache.org/viewvc?rev=916698&view=rev
Log:
QPID-2417: add ability to run DurableSubscriberTest on the java-derby profile once QPID-2422 is fixed
merged from trunk r916358
Modified:
qpid/branches/0.5.x-dev/qpid/java/ (props changed)
qpid/branches/0.5.x-dev/qpid/java/module.xml
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/branches/0.5.x-dev/qpid/java/test-profiles/java-derby.testprofile (contents, props changed)
Propchange: qpid/branches/0.5.x-dev/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 14:46:32 2010
@@ -1,2 +1,2 @@
/qpid/branches/java-broker-0-10/qpid/java:829414,829575
-/qpid/trunk/qpid/java:835115,884634-884635,884838,885765,887948,887950-887952,887994,888246,888248,888250,888345,888348,889645,891323-891332,892228,896674,896692-896693,900919,900943,902231,907851,915866-915867,916356-916357
+/qpid/trunk/qpid/java:835115,884634-884635,884838,885765,887948,887950-887952,887994,888246,888248,888250,888345,888348,889645,891323-891332,892228,896674,896692-896693,900919,900943,902231,907851,915866-915867,916356-916358
Modified: qpid/branches/0.5.x-dev/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/module.xml?rev=916698&r1=916697&r2=916698&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/module.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/module.xml Fri Feb 26 14:46:32 2010
@@ -271,6 +271,7 @@
<sysproperty key="broker" value="${broker}"/>
<sysproperty key="broker.clean" value="${broker.clean}"/>
<sysproperty key="broker.clean.between.tests" value="${broker.clean.between.tests}"/>
+ <sysproperty key="broker.persistent" value="${broker.persistent}"/>
<sysproperty key="broker.version" value="${broker.version}"/>
<sysproperty key="broker.ready" value="${broker.ready}" />
<sysproperty key="broker.stopped" value="${broker.stopped}" />
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java?rev=916698&r1=916697&r2=916698&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java Fri Feb 26 14:46:32 2010
@@ -38,7 +38,7 @@
*/
public void testDurSubRestoredAfterNonPersistentMessageSent() throws Exception
{
- if (!isBroker08())
+ if (isBrokerStorePersistent() || !isBroker08())
{
TopicConnectionFactory factory = getConnectionFactory();
Topic topic = (Topic) getInitialContext().lookup(_topicName);
@@ -102,7 +102,7 @@
*/
public void testDurSubRestoresMessageSelector() throws Exception
{
- if (!isBroker08())
+ if (isBrokerStorePersistent() || !isBroker08())
{
TopicConnectionFactory factory = getConnectionFactory();
Topic topic = (Topic) getInitialContext().lookup(_topicName);
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=916698&r1=916697&r2=916698&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Fri Feb 26 14:46:32 2010
@@ -163,6 +163,7 @@
protected static final String BROKER_READY = "broker.ready";
private static final String BROKER_STOPPED = "broker.stopped";
private static final String TEST_OUTPUT = "test.output";
+ private static final String BROKER_PERSITENT = "broker.persistent";
// values
protected static final String JAVA = "java";
@@ -184,6 +185,7 @@
private Boolean _brokerCleanBetweenTests = Boolean.getBoolean(BROKER_CLEAN_BETWEEN_TESTS);
private String _brokerVersion = System.getProperty(BROKER_VERSION, VERSION_08);
private String _output = System.getProperty(TEST_OUTPUT);
+ protected Boolean _brokerPersistent = Boolean.getBoolean(BROKER_PERSITENT);
protected File _outputFile;
@@ -889,6 +891,11 @@
{
return !_broker.equals("vm");
}
+
+ protected boolean isBrokerStorePersistent()
+ {
+ return _brokerPersistent;
+ }
public void restartBroker() throws Exception
{
Modified: qpid/branches/0.5.x-dev/qpid/java/test-profiles/java-derby.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/test-profiles/java-derby.testprofile?rev=916698&r1=916697&r2=916698&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/test-profiles/java-derby.testprofile (original)
+++ qpid/branches/0.5.x-dev/qpid/java/test-profiles/java-derby.testprofile Fri Feb 26 14:46:32 2010
@@ -7,3 +7,4 @@
profile.excludes=08StandaloneExcludes
broker.clean.between.tests=true
+broker.persistent=true
Propchange: qpid/branches/0.5.x-dev/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb 26 14:46:32 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:916358
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org