[AS7-2123] Enable excluded messaging/jms tests

pbielicki · Oct 17, 2011 · d644ccb · d644ccb
1 parent b5015c1
commit d644ccb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/...on/src/test/java/org/jboss/as/test/smoke/embedded/demos/client/jms/JmsClientTestCase.java b/...on/src/test/java/org/jboss/as/test/smoke/embedded/demos/client/jms/JmsClientTestCase.java
@@ -45,6 +45,7 @@
 import javax.management.ObjectName;
 
 import junit.framework.Assert;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
@@ -56,7 +57,6 @@
 import org.jboss.as.test.smoke.modular.utils.ShrinkWrapUtils;
 import org.jboss.dmr.ModelNode;
 import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -67,7 +67,6 @@
  */
 @RunWith(Arquillian.class)
 @RunAsClient
-@Ignore("Ignore demos that need the preview config")
 public class JmsClientTestCase {
 
     private static final String QUEUE_NAME = "createdTestQueue";
@@ -91,7 +90,7 @@ public void testMessagingClient() throws Exception {
             ModelNode op = new ModelNode();
             op.get("operation").set("add");
             op.get("address").add("subsystem", "messaging");
-            op.get("address").add("server", "default");
+            op.get("address").add("hornetq-server", "default");
             op.get("address").add("jms-queue", QUEUE_NAME);
             op.get("entries").add(QUEUE_NAME);
             applyUpdate(op, client);
@@ -155,7 +154,7 @@ public void onMessage(Message message) {
                 ModelNode op = new ModelNode();
                 op.get("operation").set("remove");
                 op.get("address").add("subsystem", "messaging");
-                op.get("address").add("server", "default");
+                op.get("address").add("hornetq-server", "default");
                 op.get("address").add("jms-queue", QUEUE_NAME);
                 applyUpdate(op, client);
             }

diff --git a/...java/org/jboss/as/test/smoke/embedded/demos/client/messaging/MessagingClientTestCase.java b/...java/org/jboss/as/test/smoke/embedded/demos/client/messaging/MessagingClientTestCase.java
@@ -49,7 +49,6 @@
 import org.jboss.as.test.smoke.modular.utils.ShrinkWrapUtils;
 import org.jboss.dmr.ModelNode;
 import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -61,7 +60,6 @@
  */
 @RunWith(Arquillian.class)
 @RunAsClient
-@Ignore("Ignore demos that need the preview config")
 public class MessagingClientTestCase {
 
     @Deployment(testable = false)
@@ -87,7 +85,7 @@ public void testMessagingClient() throws Exception {
             ModelNode op = new ModelNode();
             op.get("operation").set("add");
             op.get("address").add("subsystem", "messaging");
-            op.get("address").add("server", "default");
+            op.get("address").add("hornetq-server", "default");
             op.get("address").add("queue", queueName);
             op.get("queue-address").set(queueName);
             applyUpdate(op, client);
@@ -120,7 +118,7 @@ public void testMessagingClient() throws Exception {
             op = new ModelNode();
             op.get("operation").set("remove");
             op.get("address").add("subsystem", "messaging");
-            op.get("address").add("server", "default");
+            op.get("address").add("hornetq-server", "default");
             op.get("address").add("queue", queueName);
             applyUpdate(op, client);
 

diff --git a/...ite/integration/src/test/java/org/jboss/as/test/smoke/embedded/demos/jms/JmsTestCase.java b/...ite/integration/src/test/java/org/jboss/as/test/smoke/embedded/demos/jms/JmsTestCase.java
@@ -36,6 +36,7 @@
 import javax.naming.InitialContext;
 
 import junit.framework.Assert;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
@@ -45,7 +46,6 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -55,7 +55,6 @@
  * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
  */
 @RunWith(Arquillian.class)
-@Ignore("Ignore demos that need the preview config")
 public class JmsTestCase {
     static final Logger log = Logger.getLogger(JmsTestCase.class);
 

diff --git a/...ion/src/test/java/org/jboss/as/test/smoke/embedded/demos/messaging/MessagingTestCase.java b/...ion/src/test/java/org/jboss/as/test/smoke/embedded/demos/messaging/MessagingTestCase.java
@@ -45,7 +45,6 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -55,7 +54,6 @@
  * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
  */
 @RunWith(Arquillian.class)
-@Ignore("Ignore demos that need the preview config")
 public class MessagingTestCase {
     private static final String QUEUE_EXAMPLE_QUEUE = "queue.exampleQueue";