[jboss-cvs] JBossAS SVN: r103253 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/service and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 30 08:20:04 EDT 2010
Author: wolfc
Date: 2010-03-30 08:20:02 -0400 (Tue, 30 Mar 2010)
New Revision: 103253
Removed:
projects/ejb3/trunk/testsuite/src/test/resources/test/service/test-destination-service.xml
Modified:
projects/ejb3/trunk/testsuite/build-test.xml
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/TestResourceInjectionService.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
Log:
EJBTHREE-2057: fixed service test
Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml 2010-03-30 12:05:21 UTC (rev 103252)
+++ projects/ejb3/trunk/testsuite/build-test.xml 2010-03-30 12:20:02 UTC (rev 103253)
@@ -3838,7 +3838,6 @@
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/jboss.xml"/>
<include name="META-INF/persistence.xml"/>
- <include name="test-destination-service.xml"/>
</fileset>
<fileset dir="${resources}/test">
<include name="users.properties"/>
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/TestResourceInjectionService.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/TestResourceInjectionService.java 2010-03-30 12:05:21 UTC (rev 103252)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/TestResourceInjectionService.java 2010-03-30 12:20:02 UTC (rev 103253)
@@ -1,14 +1,13 @@
package org.jboss.ejb3.test.service;
-import javax.annotation.Resource;
-import javax.jms.Topic;
-import javax.jms.TopicConnectionFactory;
-
-import org.jboss.ejb3.annotation.Depends;
import org.jboss.ejb3.annotation.Management;
import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
+import javax.annotation.Resource;
+import javax.jms.Topic;
+import javax.jms.TopicConnectionFactory;
+
/**
* Test EJBTHREE-587
*
@@ -17,7 +16,7 @@
*/
@Service(objectName = "jboss.ejb3.bugs:service=TestResourceInjectionService")
@Management(TestResourceInjectionServiceIF.class)
- at Depends("jboss.mq.destination:name=testTopic,service=Topic")
+//@Depends("jboss.mq.destination:name=testTopic,service=Topic")
public class TestResourceInjectionService implements TestResourceInjectionServiceIF {
private static Logger log = Logger.getLogger(TestResourceInjectionService.class);
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java 2010-03-30 12:05:21 UTC (rev 103252)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java 2010-03-30 12:20:02 UTC (rev 103253)
@@ -21,16 +21,9 @@
*/
package org.jboss.ejb3.test.service.unit;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
+import junit.extensions.TestSetup;
import junit.framework.Test;
-
+import org.jboss.ejb3.test.common.EJB3TestCase;
import org.jboss.ejb3.test.service.ServiceOneRemote;
import org.jboss.ejb3.test.service.ServiceSevenRemote;
import org.jboss.ejb3.test.service.ServiceSixRemote;
@@ -39,8 +32,14 @@
import org.jboss.logging.Logger;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
-import org.jboss.test.JBossTestCase;
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import java.util.ArrayList;
+import java.util.Iterator;
+
/**
* Sample client for the jboss container.
*
@@ -49,7 +48,7 @@
*/
public class ServiceUnitTestCase
-extends JBossTestCase
+extends EJB3TestCase
{
private static final Logger log = Logger.getLogger(ServiceUnitTestCase.class);
@@ -509,7 +508,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(ServiceUnitTestCase.class, "service-test.sar, service-test.jar");
+ return new TestSetup(getDeploySetup(ServiceUnitTestCase.class, "service-test.sar, service-test.jar"))
+ {
+ @Override
+ protected void setUp() throws Exception
+ {
+ deployQueue("mdbtest");
+ deployQueue("consumerqueuetest");
+ deployTopic("mdbtest");
+ deployTopic("testTopic");
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ undeployDestinations();
+ }
+ };
}
}
Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/service/test-destination-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/service/test-destination-service.xml 2010-03-30 12:05:21 UTC (rev 103252)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/service/test-destination-service.xml 2010-03-30 12:20:02 UTC (rev 103253)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=queuetest">
- <attribute name="JNDIName">queue/mdbtest</attribute>
- <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=consumerqueuetest">
- <attribute name="JNDIName">queue/consumertest</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- <mbean code="org.jboss.mq.server.jmx.Topic"
- name="jboss.mq.destination:service=Topic,name=topictest">
- <attribute name="JNDIName">topic/mdbtest</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- <mbean code="org.jboss.mq.server.jmx.Topic"
- name="jboss.mq.destination:service=Topic,name=testTopic">
- <attribute name="JNDIName">topic/testTopic</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
-
-</server>
More information about the jboss-cvs-commits
mailing list