[jboss-cvs] JBoss Messaging SVN: r5209 - in branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests: stress/chunk and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-10-29 13:07:08 -0400 (Wed, 29 Oct 2008)
New Revision: 5209

Modified:
   branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
   branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
   branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java
   branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
Log:
few tweaks

Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java	2008-10-29 16:55:18 UTC (rev 5208)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java	2008-10-29 17:07:08 UTC (rev 5209)
@@ -74,6 +74,13 @@
 
    // Protected -----------------------------------------------------
 
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      deleteData();
+   }
+   
    protected void testChunks(final boolean realFiles,
                                 final boolean useFile,
                                 final int numberOfMessages,

Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java	2008-10-29 16:55:18 UTC (rev 5208)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java	2008-10-29 17:07:08 UTC (rev 5209)
@@ -507,11 +507,13 @@
    @Override
    protected void setUp() throws Exception
    {
+      super.setUp();
    }
 
    @Override
    protected void tearDown() throws Exception
    {
+      super.tearDown();
    }
 
    // Private -------------------------------------------------------

Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java	2008-10-29 16:55:18 UTC (rev 5208)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java	2008-10-29 17:07:08 UTC (rev 5209)
@@ -60,6 +60,13 @@
 
    // Protected -----------------------------------------------------
 
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+   }
+   
+
    // Private -------------------------------------------------------
 
    // Inner classes -------------------------------------------------

Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java	2008-10-29 16:55:18 UTC (rev 5208)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java	2008-10-29 17:07:08 UTC (rev 5209)
@@ -33,6 +33,7 @@
 import org.jboss.messaging.core.config.Configuration;
 import org.jboss.messaging.core.config.TransportConfiguration;
 import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
 import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
 import org.jboss.messaging.core.remoting.impl.netty.NettyAcceptorFactory;
@@ -42,6 +43,7 @@
 import org.jboss.messaging.core.settings.impl.QueueSettings;
 import org.jboss.messaging.jms.client.JBossBytesMessage;
 import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.integration.chunkmessage.ChunkTestBase;
 
 /**
  * 
@@ -65,21 +67,24 @@
 
    protected static final String NETTY_CONNECTOR_FACTORY = NettyConnectorFactory.class.getCanonicalName();
 
-   protected String journalDir = System.getProperty("java.io.tmpdir", "/tmp") + "/unit-test/journal";
+   protected String baseDir = System.getProperty("java.io.tmpdir", "/tmp") + "/unit-test";
+   
+   protected String journalDir = baseDir + "/journal";
 
-   protected String bindingsDir = System.getProperty("java.io.tmpdir", "/tmp") + "/unit-test/bindings";
+   protected String bindingsDir = baseDir + "/bindings";
 
-   protected String pageDir = System.getProperty("java.io.tmpdir", "/tmp") + "/unit-test/page";
+   protected String pageDir = baseDir + "/page";
 
-   protected String largeMessagesDir = System.getProperty("java.io.tmpdir", "/tmp") + "/unit-test/large-msg";
+   protected String largeMessagesDir = baseDir + "/large-msg";
 
-   protected String clientLargeMessagesDir = System.getProperty("java.io.tmpdir", "/tmp") + "/unit-test/client-large-msg";
+   protected String clientLargeMessagesDir = baseDir + "/client-large-msg";
 
-   protected String temporaryDir = System.getProperty("java.io.tmpdir", "/tmp") + "/unit-test/temporary";
+   protected String temporaryDir = baseDir + "/temporary";
 
    protected MessagingService messagingService;
 
    // Static --------------------------------------------------------
+   private static final Logger log = Logger.getLogger(ServiceTestBase.class);
 
    // Constructors --------------------------------------------------
 
@@ -99,6 +104,12 @@
       deleteAndCreateDir(temporaryDir);
    }
 
+   protected void deleteData()
+   {
+      log.info("deleting directory " + baseDir);
+      deleteDirectory(new File(baseDir));
+   }
+
    protected void deleteAndCreateDir(String directory)
    {
       File file = new File(directory);