[hornetq-commits] JBoss hornetq SVN: r9220 - in trunk/tests/src/org/hornetq/tests/integration: jms/server and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-05-10 17:13:40 -0400 (Mon, 10 May 2010)
New Revision: 9220

Modified:
   trunk/tests/src/org/hornetq/tests/integration/core/deployers/impl/QueueDeployerTest.java
   trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
Log:
Twek on tests: Tests should always have the journal on /tmp and not on workspace

Modified: trunk/tests/src/org/hornetq/tests/integration/core/deployers/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/core/deployers/impl/QueueDeployerTest.java	2010-05-10 20:35:28 UTC (rev 9219)
+++ trunk/tests/src/org/hornetq/tests/integration/core/deployers/impl/QueueDeployerTest.java	2010-05-10 21:13:40 UTC (rev 9220)
@@ -23,6 +23,7 @@
 import org.hornetq.core.postoffice.impl.LocalQueueBinding;
 import org.hornetq.core.server.HornetQServer;
 import org.hornetq.core.server.impl.HornetQServerImpl;
+import org.hornetq.tests.util.ServiceTestBase;
 import org.hornetq.tests.util.UnitTestCase;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -33,7 +34,7 @@
  * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
  * 
  */
-public class QueueDeployerTest extends UnitTestCase
+public class QueueDeployerTest extends ServiceTestBase
 {
 
    // Constants -----------------------------------------------------
@@ -87,12 +88,11 @@
    protected void setUp() throws Exception
    {
       super.setUp();
+      
+      server = createServer(true);
       DeploymentManager deploymentManager = new FileDeploymentManager(500);
-      ConfigurationImpl config = new ConfigurationImpl();
-      config.setJournalType(getDefaultJournalType());
-      server = new HornetQServerImpl(config);
+      deployer = new QueueDeployer(deploymentManager, server);
       server.start();
-      deployer = new QueueDeployer(deploymentManager, server);
    }
 
    @Override

Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java	2010-05-10 20:35:28 UTC (rev 9219)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java	2010-05-10 21:13:40 UTC (rev 9220)
@@ -34,6 +34,7 @@
 import org.hornetq.jms.server.impl.JMSServerManagerImpl;
 import org.hornetq.spi.core.security.HornetQSecurityManager;
 import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
+import org.hornetq.tests.util.ServiceTestBase;
 import org.hornetq.tests.util.UnitTestCase;
 
 /**
@@ -178,6 +179,10 @@
       fc.setConfigurationUrl("server-start-stop-config1.xml");
 
       fc.start();
+      
+      fc.setJournalDirectory(getJournalDir());
+      fc.setBindingsDirectory(getBindingsDir());
+      fc.setLargeMessagesDirectory(getLargeMessagesDir());
 
       HornetQSecurityManager sm = new HornetQSecurityManagerImpl();