[jboss-cvs] JBossAS SVN: r105883 - in branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice: override/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 9 13:44:28 EDT 2010
Author: clebert.suconic at jboss.com
Date: 2010-06-09 13:44:28 -0400 (Wed, 09 Jun 2010)
New Revision: 105883
Modified:
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
Ignoring JMS Profile tests when hornetQ
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java 2010-06-09 17:33:35 UTC (rev 105882)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.java 2010-06-09 17:44:28 UTC (rev 105883)
@@ -24,6 +24,8 @@
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestSuite;
+
import org.jboss.deployers.spi.management.KnownComponentTypes;
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.managed.api.ComponentType;
@@ -39,6 +41,8 @@
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.plugins.types.MutableCompositeMetaType;
import org.jboss.test.profileservice.override.test.AbstractProfileServiceTest;
+import org.jboss.test.profileservice.override.test.JmsDestinationOverrideTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Test if the changes to the Queue and Topic are applied after restart.
@@ -169,5 +173,19 @@
return new CompositeValueSupport(composite, map);
}
+ public TestSuite suite()
+ {
+ if (JMSDestinationsUtil.isJBM())
+ {
+ return new TestSuite(JmsDestinationRestartUnitTestCase.class);
+ }
+ else
+ {
+ // empty if HQ, it doesn't make sense
+ return new TestSuite();
+ }
+ }
+
+
}
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java 2010-06-09 17:33:35 UTC (rev 105882)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java 2010-06-09 17:44:28 UTC (rev 105883)
@@ -24,6 +24,8 @@
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestSuite;
+
import org.jboss.deployers.spi.management.KnownComponentTypes;
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
@@ -40,6 +42,7 @@
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.plugins.types.MutableCompositeMetaType;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Test updating a Queue and Topic.
@@ -257,5 +260,19 @@
}
}
+
+ public TestSuite suite()
+ {
+ if (JMSDestinationsUtil.isJBM())
+ {
+ return new TestSuite(JmsDestinationOverrideTestCase.class);
+ }
+ else
+ {
+ // empty if HQ, it doesn't make sense
+ return new TestSuite();
+ }
+ }
+
}
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java 2010-06-09 17:33:35 UTC (rev 105882)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java 2010-06-09 17:44:28 UTC (rev 105883)
@@ -42,6 +42,7 @@
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.plugins.types.MutableCompositeMetaType;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Test of using ProfileService
@@ -60,19 +61,23 @@
{
TestSuite suite = new TestSuite();
- // DataSource
- suite.addTest(new ConnectionFactoryUnitTestCase("testAddDataSource"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveDataSource"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testAddXADataSource"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveXADataSource"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testAddTxConnectionFactory"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveTxConnectionFactory"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testAddTxXAConnectionFactory"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveTxXAConnectionFactory"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testAddNoTxConnectionFactory"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveNoTxConnectionFactory"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testAddNoTxDataSource"));
- suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveNoTxDataSource"));
+ // These tests only make sense if JBM
+ if (JMSDestinationsUtil.isJBM())
+ {
+ // DataSource
+ suite.addTest(new ConnectionFactoryUnitTestCase("testAddDataSource"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveDataSource"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testAddXADataSource"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveXADataSource"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testAddTxConnectionFactory"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveTxConnectionFactory"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testAddTxXAConnectionFactory"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveTxXAConnectionFactory"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testAddNoTxConnectionFactory"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveNoTxConnectionFactory"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testAddNoTxDataSource"));
+ suite.addTest(new ConnectionFactoryUnitTestCase("testRemoveNoTxDataSource"));
+ }
return suite;
}
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java 2010-06-09 17:33:35 UTC (rev 105882)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java 2010-06-09 17:44:28 UTC (rev 105883)
@@ -37,6 +37,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
@@ -53,6 +54,7 @@
import org.jboss.test.profileservice.test.ejb3.TestRemoteBusiness;
import org.jboss.test.profileservice.test.ejb3.TestStatefulBean;
import org.jboss.test.profileservice.test.ejb3.TestStatelessBean;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Ejb3MetricsUnitTestCase
@@ -194,6 +196,19 @@
// Lifecycle -----------------------------------------------------------------------------||
// ---------------------------------------------------------------------------------------||
+
+ public TestSuite suite()
+ {
+ if (JMSDestinationsUtil.isJBM())
+ {
+ return new TestSuite(Ejb3MetricsUnitTestCase.class);
+ }
+ else
+ {
+ return new TestSuite(); // empty, this test is written for JBM only
+ }
+ }
+
/**
* Deploys the test JAR via the ProfileService-aware DeploymentManager
*/
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2010-06-09 17:33:35 UTC (rev 105882)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2010-06-09 17:44:28 UTC (rev 105883)
@@ -54,6 +54,7 @@
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Test of using ProfileService
@@ -73,24 +74,29 @@
public static Test suite() throws Exception
{
TestSuite suite = new TestSuite();
-
- suite.addTest(new ProfileServiceUnitTestCase("testProfileKeys"));
- suite.addTest(new ProfileServiceUnitTestCase("testDeploymentNames"));
- suite.addTest(new ProfileServiceUnitTestCase("testIgnoredDeploymentNames"));
-
- suite.addTest(new ProfileServiceUnitTestCase("testTemplateNames"));
- suite.addTest(new ProfileServiceUnitTestCase("testNoSuchProfileException"));
- // JMS
- suite.addTest(new ProfileServiceUnitTestCase("testJmsDestinationComponents"));
- // DataSource
- suite.addTest(new ProfileServiceUnitTestCase("testLocalTxDataSourceTemplatePropertiesAreMetaValues"));
- suite.addTest(new ProfileServiceUnitTestCase("testXADataSourceTemplateTemplatePropertiesAreMetaValues"));
- suite.addTest(new ProfileServiceUnitTestCase("testDataSourceDeploymentType"));
- suite.addTest(new ProfileServiceUnitTestCase("testListDataSourceComponents"));
- suite.addTest(new ProfileServiceUnitTestCase("testUpdateDefaultDS"));
- suite.addTest(new ProfileServiceUnitTestCase("testDefaultDSOps"));
- suite.addTest(new ProfileServiceUnitTestCase("testDefaultDSStats"));
-
+
+ // these tests are written for JBM
+ if (JMSDestinationsUtil.isJBM())
+ {
+
+ suite.addTest(new ProfileServiceUnitTestCase("testProfileKeys"));
+ suite.addTest(new ProfileServiceUnitTestCase("testDeploymentNames"));
+ suite.addTest(new ProfileServiceUnitTestCase("testIgnoredDeploymentNames"));
+
+ suite.addTest(new ProfileServiceUnitTestCase("testTemplateNames"));
+ suite.addTest(new ProfileServiceUnitTestCase("testNoSuchProfileException"));
+ // JMS
+ suite.addTest(new ProfileServiceUnitTestCase("testJmsDestinationComponents"));
+ // DataSource
+ suite.addTest(new ProfileServiceUnitTestCase("testLocalTxDataSourceTemplatePropertiesAreMetaValues"));
+ suite.addTest(new ProfileServiceUnitTestCase("testXADataSourceTemplateTemplatePropertiesAreMetaValues"));
+ suite.addTest(new ProfileServiceUnitTestCase("testDataSourceDeploymentType"));
+ suite.addTest(new ProfileServiceUnitTestCase("testListDataSourceComponents"));
+ suite.addTest(new ProfileServiceUnitTestCase("testUpdateDefaultDS"));
+ suite.addTest(new ProfileServiceUnitTestCase("testDefaultDSOps"));
+ suite.addTest(new ProfileServiceUnitTestCase("testDefaultDSStats"));
+ }
+
return suite;
}
More information about the jboss-cvs-commits
mailing list