diff options
Diffstat (limited to 'qpid/java')
2 files changed, 3 insertions, 13 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java index 0d365467d2..5ac50c9ad2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java @@ -71,7 +71,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest * This value will be logged on startup after the MessageStore has been * created. * Input: - * Default configuration + * Default configuration * Output: * * <date> MST-1002 : Store location : <path> @@ -115,14 +115,12 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest // the index that the virtualhost is within the configuration. // we can retrive that from the vhosts list previously extracted. String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class"); - String storePath = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.environment-path"); // Get the Simple class name from the expected class name of o.a.q.s.s.MMS String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1); - assertTrue("MST-1002 does not contain requried store path'" - + storePath + "' found:" + getMessageString(result), - getMessageString(result).endsWith(storePath)); + assertTrue("MST-1002 does not contain a store path" + getMessageString(result), + getMessageString(result).length() > 0); assertEquals("The store name does not match expected value", storeName, AbstractTestLogSubject.getSlice("ms", fromSubject(result))); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java index 280fc7d83b..a1cbeca6de 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java @@ -25,7 +25,6 @@ import org.apache.qpid.server.configuration.ServerConfiguration; import org.apache.qpid.server.logging.subjects.AbstractTestLogSubject; import org.apache.qpid.util.LogMonitor; -import java.io.File; import java.util.List; /** @@ -50,13 +49,6 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging public void setUp() throws Exception { - // set QPID_WORK to be [QPID_WORK|io.tmpdir]/<testName> - setSystemProperty("QPID_WORK", - System.getProperty("QPID_WORK", - System.getProperty("java.io.tmpdir")) - + File.separator + getName()); - - //We explicitly do not call super.setUp as starting up the broker is //part of the test case. // So we have to make the new Log Monitor here |