From fd6bd8b5dee6807e7890f4eda578a73b4b1bb4dc Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Wed, 10 Dec 2014 17:34:24 +0000 Subject: QPID-6265: Change system tests to have one log per file configured using Log4j, simplify QBTC git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1644492 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/bdbstore/systests/pom.xml | 10 ++++++++++ .../org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java | 7 ++++--- .../qpid/server/store/berkeleydb/replication/GroupCreator.java | 2 +- .../server/store/berkeleydb/replication/JMXManagementTest.java | 3 ++- .../server/store/berkeleydb/replication/MultiNodeTest.java | 3 ++- .../qpid/server/store/berkeleydb/replication/TwoNodeTest.java | 3 ++- 6 files changed, 21 insertions(+), 7 deletions(-) (limited to 'qpid/java/bdbstore') diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index b56488bc03..a5e9e2c609 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -80,6 +80,16 @@ + + + + src/main/resources + + + ${test.resource.directory}/test-profiles/test_resources + + + org.apache.maven.plugins diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java index fab889a49f..874b5eb324 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java @@ -31,6 +31,7 @@ import javax.jms.MessageConsumer; import javax.jms.Session; import org.apache.log4j.Logger; +import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode; import org.apache.qpid.test.utils.Piper; @@ -151,15 +152,15 @@ public class BDBBackupTest extends QpidBrokerTestCase Process backupProcess = null; try { - String qpidHome = System.getProperty(QPID_HOME); + String qpidHome = QPID_HOME; ProcessBuilder pb = new ProcessBuilder(qpidHome + BACKUP_SCRIPT, "-todir", backupToDir.getAbsolutePath(), "-fromdir", backupFromDir.getAbsolutePath()); pb.redirectErrorStream(true); Map env = pb.environment(); - env.put(QPID_HOME, qpidHome); + env.put(BrokerProperties.PROPERTY_QPID_HOME, qpidHome); LOGGER.debug("Backup command is " + pb.command()); backupProcess = pb.start(); - Piper piper = new Piper(backupProcess.getInputStream(), _testcaseOutputStream, null, BACKUP_COMPLETE_MESSAGE); + Piper piper = new Piper(backupProcess.getInputStream(), null, BACKUP_COMPLETE_MESSAGE, "BACKUP", ""); piper.start(); piper.await(2, TimeUnit.SECONDS); backupProcess.waitFor(); diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java index a209b476cf..9455d788e4 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java @@ -209,7 +209,7 @@ public class GroupCreator { try { - _testcase.startBroker(brokerPortNumber, brokerConfig); + _testcase.startBroker(brokerPortNumber, brokerConfig, null); return "OK"; } catch (Exception e) diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java index 4fd3540964..8933297b4a 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java @@ -45,6 +45,7 @@ import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.store.berkeleydb.jmx.ManagedBDBHAMessageStore; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; import org.apache.qpid.systest.rest.RestTestHelper; +import org.apache.qpid.test.utils.BrokerHolder; import org.apache.qpid.test.utils.JMXTestUtils; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.junit.Assert; @@ -72,7 +73,7 @@ public class JMXManagementTest extends QpidBrokerTestCase @Override protected void setUp() throws Exception { - _brokerType = BrokerType.SPAWNED; + _brokerType = BrokerHolder.BrokerType.SPAWNED; setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString()); diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java index 50ca39c83b..7ec28bd1f2 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java @@ -48,6 +48,7 @@ import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.State; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; +import org.apache.qpid.test.utils.BrokerHolder; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.TestUtils; @@ -75,7 +76,7 @@ public class MultiNodeTest extends QpidBrokerTestCase @Override protected void setUp() throws Exception { - _brokerType = BrokerType.SPAWNED; + _brokerType = BrokerHolder.BrokerType.SPAWNED; assertTrue(isJavaBroker()); assertTrue(isBrokerStorePersistent()); diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java index 49ce60d798..b06eaf9f7c 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java @@ -28,6 +28,7 @@ import javax.jms.JMSException; import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; +import org.apache.qpid.test.utils.BrokerHolder; import org.apache.qpid.test.utils.QpidBrokerTestCase; public class TwoNodeTest extends QpidBrokerTestCase @@ -47,7 +48,7 @@ public class TwoNodeTest extends QpidBrokerTestCase @Override protected void setUp() throws Exception { - _brokerType = BrokerType.SPAWNED; + _brokerType = BrokerHolder.BrokerType.SPAWNED; setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString()); -- cgit v1.2.1