[jboss-cvs] JBossAS SVN: r101315 - in branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test: jmsra/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 23 01:09:22 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-23 01:09:22 -0500 (Tue, 23 Feb 2010)
New Revision: 101315
Modified:
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java
Log:
Fixing tests
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java 2010-02-23 05:57:46 UTC (rev 101314)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java 2010-02-23 06:09:22 UTC (rev 101315)
@@ -29,6 +29,7 @@
import javax.naming.Context;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestSetup;
import org.jboss.test.util.jms.JMSDestinationsUtil;
@@ -83,18 +84,20 @@
public static Test suite() throws Exception
{
- return new JBossTestSetup(getDeploySetup(RaQueueUnitTestCase.class, "jmsra.jar"))
+ return new JBossTestSetup(new TestSuite(RaQueueUnitTestCase.class))
{
protected void setUp() throws Exception
{
super.setUp();
JMSDestinationsUtil.setupBasicDestinations();
+ deploy("jmsra.jar");
}
protected void tearDown() throws Exception
{
- super.tearDown();
+ undeploy("jmsra.jar");
JMSDestinationsUtil.destroyDestinations();
+ super.tearDown();
}
};
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java 2010-02-23 05:57:46 UTC (rev 101314)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java 2010-02-23 06:09:22 UTC (rev 101315)
@@ -32,6 +32,7 @@
import junit.framework.Assert;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.JBossTestSetup;
@@ -190,11 +191,12 @@
public static Test suite() throws Exception
{
- return new JBossTestSetup(getDeploySetup(RaSyncRecUnitTestCase.class, "jmsra.jar"))
+ return new JBossTestSetup(new TestSuite(RaSyncRecUnitTestCase.class))
{
protected void setUp() throws Exception
{
super.setUp();
+ deploy("jmsra.jar");
JMSDestinationsUtil.setupBasicDestinations();
}
@@ -202,6 +204,7 @@
{
super.tearDown();
JMSDestinationsUtil.destroyDestinations();
+ deploy("jmsra.jar");
}
};
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java 2010-02-23 05:57:46 UTC (rev 101314)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java 2010-02-23 06:09:22 UTC (rev 101315)
@@ -29,6 +29,7 @@
import org.jboss.test.client.test.AppClientUnitTestCase;
import org.jboss.test.jmsra.bean.*;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -65,12 +66,14 @@
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ JMSDestinationsUtil.setupBasicDestinations();
deploy ("jmsra.jar");
}
protected void tearDown() throws Exception
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
undeploy ("jmsra.jar");
+ JMSDestinationsUtil.destroyDestinations();
}
});
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java 2010-02-23 05:57:46 UTC (rev 101314)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java 2010-02-23 06:09:22 UTC (rev 101315)
@@ -33,8 +33,10 @@
import javax.naming.Context;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestSetup;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Test cases for JMS Resource Adapter use a <em>Queue</em> . <p>
@@ -85,15 +87,21 @@
public static Test suite() throws Exception
{
- return new JBossTestSetup(getDeploySetup(RaQueueUnitTestCase.class, "jmsra.jar"))
+ return new JBossTestSetup(new TestSuite(RaQueueUnitTestCase.class))
{
protected void setUp() throws Exception
{
super.setUp();
+
+ JMSDestinationsUtil.setupBasicDestinations();
+ this.deploy("jmsra.jar");
+
}
protected void tearDown() throws Exception
{
+ JMSDestinationsUtil.destroyDestinations();
+ undeploy("jmsra.jar");
super.tearDown();
}
};
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java 2010-02-23 05:57:46 UTC (rev 101314)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java 2010-02-23 06:09:22 UTC (rev 101315)
@@ -36,6 +36,7 @@
import javax.naming.InitialContext;
import junit.framework.Assert;
+import junit.framework.TestSuite;
import junit.framework.Test;
@@ -43,6 +44,7 @@
import org.jboss.test.JBossTestSetup;
import org.jboss.test.jmsra.bean.*;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
*
@@ -168,15 +170,19 @@
public static Test suite() throws Exception
{
- return new JBossTestSetup(getDeploySetup(RaSyncRecUnitTestCase.class, "jmsra.jar"))
+ return new JBossTestSetup(new TestSuite(RaSyncRecUnitTestCase.class))
{
protected void setUp() throws Exception
{
super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("jmsra.jar");
}
protected void tearDown() throws Exception
{
+ undeploy("jmsra.jar");
+ JMSDestinationsUtil.destroyDestinations();
super.tearDown();
}
};
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java 2010-02-23 05:57:46 UTC (rev 101314)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java 2010-02-23 06:09:22 UTC (rev 101315)
@@ -33,8 +33,10 @@
import javax.naming.Context;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestSetup;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Test cases for JMS Resource Adapter using a <em>Topic</em> . <p>
@@ -85,15 +87,19 @@
public static Test suite() throws Exception
{
- return new JBossTestSetup(getDeploySetup(RaQueueUnitTestCase.class, "jmsra.jar"))
+ return new JBossTestSetup(new TestSuite(RaQueueUnitTestCase.class))
{
protected void setUp() throws Exception
{
super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("jmsra.jar");
}
protected void tearDown() throws Exception
{
+ undeploy("jmsra.jar");
+ JMSDestinationsUtil.destroyDestinations();
super.tearDown();
}
};
More information about the jboss-cvs-commits
mailing list