[jboss-cvs] JBossAS SVN: r99853 - in branches/Branch_Hornet_Temporary: testsuite and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Jan 23 00:02:36 EST 2010


Author: clebert.suconic at jboss.com
Date: 2010-01-23 00:02:36 -0500 (Sat, 23 Jan 2010)
New Revision: 99853

Modified:
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java
   branches/Branch_Hornet_Temporary/testsuite/.classpath
   branches/Branch_Hornet_Temporary/testsuite/build.xml
   branches/Branch_Hornet_Temporary/testsuite/pom.xml
   branches/Branch_Hornet_Temporary/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
Log:
Implementing test

Modified: branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java	2010-01-23 05:02:36 UTC (rev 99853)
@@ -1,15 +1,26 @@
 package org.jboss.jms.testintegration;
 
 import javax.management.MBeanServerConnection;
+import javax.naming.InitialContext;
 
 
 public class HornetQAdminFactory extends JMSTestAdminFactory
 {
 
+	MBeanServerConnection server;
+	
 	@Override
-	JMSTestAdmin newAdmin(MBeanServerConnection jmxConnection)
+	public JMSTestAdmin newAdmin() throws Exception
 	{
-		return new HornetQTestAdmin(jmxConnection);
+		if (server == null)
+		{
+			InitialContext ctx = new InitialContext();
+			String adaptorName = System.getProperty("jbosstest.server.name",
+					"jmx/invoker/RMIAdaptor");
+			server = (MBeanServerConnection) ctx.lookup(adaptorName);
+			ctx.close();
+		}
+		return new HornetQTestAdmin(server);
 	}
 
 }

Modified: branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java	2010-01-23 05:02:36 UTC (rev 99853)
@@ -29,15 +29,14 @@
 
 	public Object createQueue(String name, TestRole[] securityConfig) throws Exception
 	{
-		//return jmx.invoke(hornetQJMSServerName, create, params, signature);
-		return null;
+		jmx.invoke(hornetQJMSServerName, "createQueue", new Object[]{name, "/queue/" + name}, new String[] {"java.lang.String", "java.lang.String"});
+		return name;
 	}
 
-	public Object createTopic(String name, TestRole[] securityConfig)
+	public Object createTopic(String name, TestRole[] securityConfig) throws Exception
 	{
-		// TODO Auto-generated method stub
-
-		return null;
+		jmx.invoke(hornetQJMSServerName, "createTopic", new Object[]{name, "/queue/" + name}, new String[] {"java.lang.String", "java.lang.String"});
+		return name;
 	}
 
 	public void deleteQueue(Object name)

Modified: branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java	2010-01-23 05:02:36 UTC (rev 99853)
@@ -12,8 +12,9 @@
 	 * @param name
 	 * @param securityConfig
 	 * @return information about the deployment required to undeploy/remove the topic
+	 * @throws Exception 
 	 */
-	Object createTopic(String name, TestRole[] securityConfig);
+	Object createTopic(String name, TestRole[] securityConfig) throws Exception;
 
 	void deleteTopic(Object topic);
 

Modified: branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java	2010-01-23 05:02:36 UTC (rev 99853)
@@ -1,14 +1,13 @@
 package org.jboss.jms.testintegration;
 
-import javax.management.MBeanServerConnection;
 
 public abstract class JMSTestAdminFactory
 {
-	static JMSTestAdminFactory getFactory()
+	public static JMSTestAdminFactory getFactory()
 	{
 		// TODO: make this configurable
 		return new HornetQAdminFactory();
 	}
 	
-	abstract JMSTestAdmin newAdmin(MBeanServerConnection jmxConnection);
+	public abstract JMSTestAdmin newAdmin() throws Exception;
 }

Modified: branches/Branch_Hornet_Temporary/testsuite/.classpath
===================================================================
--- branches/Branch_Hornet_Temporary/testsuite/.classpath	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/testsuite/.classpath	2010-01-23 05:02:36 UTC (rev 99853)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src/main"/>
+	<classpathentry kind="src" path="src/jdk15"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: branches/Branch_Hornet_Temporary/testsuite/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary/testsuite/build.xml	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/testsuite/build.xml	2010-01-23 05:02:36 UTC (rev 99853)
@@ -267,8 +267,8 @@
       <fileset refid="org.jboss.jaxr:juddi-service:sar"/>
       <fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
       <fileset refid="jboss:jboss-serialization:jar"/>
-      <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
-      <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar:client"/>
+      <!-- <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/> 
+      <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar:client"/> -->
       <fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client"/>
@@ -307,9 +307,71 @@
       <fileset refid="org.jboss.service.binding:jboss-service-binding-core:jar"/>
       <fileset refid="org.jboss.service.binding:jboss-service-binding-mgmt:jar"/>
       <fileset refid="stax:stax-api:jar"/>
+    	
+        <fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
+        <fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
+    	
+<!-- TODO: Fix the dependencies    	
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-bootstrap</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-core-client</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-core</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-jboss-as-integration</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-jms-client</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-jms</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-logging</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-ra</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-resources</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.hornetq</groupId>
+          <artifactId>hornetq-transports</artifactId>
+          <version>${version.hornetq}</version> 
+        </dependency>
+        <dependency>
+          <groupId>org.jboss.aspects</groupId>
+          <artifactId>jboss-current-invocation-aspects</artifactId>
+          <version>${version.org.jboss.aspects.currentinvocation}</version>
+        </dependency>
+-->    	
+    	
       <!-- needed for messaging JMS provider tests -->
-      <fileset refid="jboss.messaging:jboss-messaging:jar"/>
-      <fileset refid="jboss.messaging:jboss-messaging-client:jar"/>
+      <!-- <fileset refid="jboss.messaging:jboss-messaging:jar"/>
+      <fileset refid="jboss.messaging:jboss-messaging-client:jar"/> -->
       <!-- needed for proxy tests -->
       <fileset refid="bcel:bcel:jar"/>
       <!-- needed for security login module tests -->
@@ -947,10 +1009,11 @@
    </patternset>
    <!-- jbossmessaging includes -->
    <patternset id="jbossmessaging.includes">
-     <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
+    <include name="org/jboss/test/jbossmessaging/**/Jms11UnitTest.class"/>
+<!--      <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
      <include name="org/jboss/test/jbossmessaging/perf/*StressTestCase.class"/>
      <include name="org/jboss/test/jbossmessaging/ra/*UnitTestCase.class"/>
-     <include name="org/jboss/test/jms/integration/**/*Test.class"/>
+     <include name="org/jboss/test/jms/integration/**/*Test.class"/> -->
    </patternset>
    <patternset id="jbossmessaging-clustering.includes">
      <include name="org/jboss/test/jbossmessaging/clustertest/*TestCase.class"/>

Modified: branches/Branch_Hornet_Temporary/testsuite/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/testsuite/pom.xml	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/testsuite/pom.xml	2010-01-23 05:02:36 UTC (rev 99853)
@@ -138,6 +138,13 @@
       <artifactId>hibernate-testing</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-hornetq-int</artifactId>
+    </dependency>
+
+
+
   </dependencies>
   
   <profiles>

Modified: branches/Branch_Hornet_Temporary/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-23 03:26:35 UTC (rev 99852)
+++ branches/Branch_Hornet_Temporary/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-23 05:02:36 UTC (rev 99853)
@@ -47,6 +47,9 @@
 import javax.naming.InitialContext;
 
 import EDU.oswego.cs.dl.util.concurrent.CountDown;
+
+import org.jboss.jms.testintegration.JMSTestAdmin;
+import org.jboss.jms.testintegration.JMSTestAdminFactory;
 import org.jboss.logging.Logger;
 import org.jboss.test.jbossmessaging.JMSTestCase;
 import org.jboss.test.jbossmessaging.perf.JMSPerfStressTestCase;
@@ -73,13 +76,20 @@
    static Connection queueConnection;
    static Connection topicConnection;
 
-   public static junit.framework.Test suite() throws Exception
+   public void setUp() throws Exception
    {
-       ClassLoader loader = Thread.currentThread().getContextClassLoader();
-       String resourceName = getJMSResourceRelativePathname("test-destinations-full-service.xml") ;
-
-       return getDeploySetup(Jms11UnitTest.class,
-               loader.getResource(resourceName).toString());
+       JMSTestAdmin admin = JMSTestAdminFactory.getFactory().newAdmin();
+       admin.createTopic("testTopic", null);
+       admin.createTopic("securedTopic", null);
+       admin.createTopic("testDurableTopic", null);
+       admin.createTopic("testDurableTopic", null);
+       
+       admin.createQueue("testQueue", null);
+       admin.createQueue("A", null);
+       admin.createQueue("B", null);
+       admin.createQueue("C", null);
+       admin.createQueue("D", null);
+       admin.createQueue("ex", null);
    }
 
    public Jms11UnitTest(String name) throws Exception




More information about the jboss-cvs-commits mailing list