[jboss-cvs] JBossAS SVN: r103257 - in projects/ejb3/trunk/testsuite/src/test: resources/test/naming and 1 other directory.

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

Author: wolfc
Date: 2010-03-30 08:46:26 -0400 (Tue, 30 Mar 2010)
New Revision: 103257

Removed:
   projects/ejb3/trunk/testsuite/src/test/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml
Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
Log:
EJBTHREE-2057: fixed naming test

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	2010-03-30 12:38:21 UTC (rev 103256)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	2010-03-30 12:46:26 UTC (rev 103257)
@@ -21,14 +21,12 @@
  */
 package org.jboss.ejb3.test.naming.unit;
 
-import org.jboss.ejb3.test.mdb.unit.MDBUnitTestCase;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import org.jboss.ejb3.test.common.EJB3TestCase;
 import org.jboss.ejb3.test.naming.TestENC;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
 import org.jboss.security.client.SecurityClient;
 import org.jboss.security.client.SecurityClientFactory;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 /**
  * Tests of the secure access to EJBs.
@@ -37,7 +35,7 @@
  * @author   <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
  * @version $Revision$
  */
-public class ENCUnitTestCase extends JBossTestCase
+public class ENCUnitTestCase extends EJB3TestCase
 {   
    /**
     * Constructor for the ENCUnitTestCase object
@@ -84,7 +82,22 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(ENCUnitTestCase.class, "naming.jar");
+      return new TestSetup(getDeploySetup(ENCUnitTestCase.class, "naming.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("A");
+            deployQueue("testQueue");
+            deployTopic("testTopic");
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployDestinations();
+         }
+      };
    }
 
 }

Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml	2010-03-30 12:38:21 UTC (rev 103256)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml	2010-03-30 12:46:26 UTC (rev 103257)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=testTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=testQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=A">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-</server>