[jboss-cvs] JBoss Messaging SVN: r1535 - trunk/tests/smoke

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

Author: timfox
Date: 2006-11-01 03:43:27 -0500 (Wed, 01 Nov 2006)
New Revision: 1535

Modified:
   trunk/tests/smoke/build.xml
   trunk/tests/smoke/smoke.properties.example
Log:
Merged Ron's smoke changes into trunk



Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml	2006-11-01 07:43:39 UTC (rev 1534)
+++ trunk/tests/smoke/build.xml	2006-11-01 08:43:27 UTC (rev 1535)
@@ -17,6 +17,9 @@
    <property name="jboss.configuration" value="messaging-smoke-test"/>
    <property name="messaging.client.jar.path" value="${basedir}/../../output/lib"/>
    <property name="smoke.test.type" value="installation"/>
+	
+	<property name="password" value="admin"/>
+	<property name="user" value="admin"/>
 
    <!--
         By default, each test (installation or compatiblity) runs all examples. If you want to
@@ -82,7 +85,7 @@
          <param name="jboss.home" value="${jboss402.home}"/>
          <param name="run.secure-socket.example" value="false"/>
       </antcall>
-
+<!--
       <antcall target="installation-test">
          <param name="jboss.home" value="${jboss403.home}"/>
          <param name="run.secure-socket.example" value="false"/>
@@ -92,12 +95,12 @@
          <param name="jboss.home" value="${jboss403-installer.home}"/>
          <param name="run.secure-socket.example" value="false"/>
       </antcall>
-
+-->
       <antcall target="installation-test">
          <param name="jboss.home" value="${jboss403SP1.home}"/>
          <param name="run.secure-socket.example" value="false"/>
       </antcall>
-
+      	
       <antcall target="installation-test">
          <param name="jboss.home" value="${jboss403SP1-installer.home}"/>
          <param name="run.secure-socket.example" value="false"/>
@@ -114,11 +117,11 @@
       <antcall target="installation-test">
          <param name="jboss.home" value="${jboss404GA.home}"/>
       </antcall>
-
+ 
       <antcall target="installation-test">
          <param name="jboss.home" value="${jboss404GA-installer.home}"/>
       </antcall>
-
+  
       <antcall target="installation-test">
          <param name="jboss.home" value="${jboss404GA.home}"/>
          <param name="release.admin.target" value="standalone"/>
@@ -126,7 +129,7 @@
          <param name="run.stateless.example" value="false"/>
          <param name="run.secure-socket.example" value="false"/>
       </antcall>
-
+<!--
       <antcall target="installation-test">
          <param name="jboss.home" value="${jboss405CR1.home}"/>
       </antcall>
@@ -144,7 +147,29 @@
          <param name="no.java4" value="true"/>
          <param name="run.ejb3mdb.example" value="true"/>
       </antcall>
+-->
+      <antcall target="installation-test">
+         <param name="jboss.home" value="${jboss405GA.home}"/>
+      </antcall>
 
+      <antcall target="installation-test">
+         <param name="jboss.home" value="${jboss405GA-installer.home}"/>
+      </antcall>
+
+      <antcall target="installation-test">
+         <param name="jboss.home" value="${jboss405GA.home}"/>
+         <param name="release.admin.target" value="standalone"/>
+         <param name="run.mdb.example" value="false"/>
+         <param name="run.stateless.example" value="false"/>
+         <param name="run.secure-socket.example" value="false"/>
+      </antcall>
+ 
+      <antcall target="installation-test">
+         <param name="jboss.home" value="${jboss405GAejb3.home}"/>
+         <param name="no.java4" value="true"/>
+         <param name="run.ejb3mdb.example" value="true"/>
+      </antcall>
+
       <!--
          Stateless Session Bean installation test will fail on this because the client talks to
          Messaging's remoting and to Unified Invoker's remoting and runs into compatibility
@@ -732,6 +757,19 @@
 
    </target>
 
+
+   <target name="twiddle">
+
+      <java classname="org.jboss.console.twiddle.Twiddle" fork="yes" failonerror="yes"
+            dir="${jboss.home}/bin">
+ 			<arg line="-help"/>
+      	<classpath>
+            <path refid="twiddle.classpath"/>
+         </classpath>
+      </java>
+
+   </target>
+	
    <target name="ping-jms-server">
 
       <java classname="org.jboss.console.twiddle.Twiddle" fork="yes" failonerror="yes"
@@ -826,6 +864,8 @@
          <jvmarg value="-Xmx128m"/>
          <arg line="-s jnp://localhost:${jnpPort} -S"/>
          <!-- <arg value="-S"/> -->
+      	<arg value="--user=${user}"/>
+      	<arg value="--password=${password}"/>
          <classpath>
             <pathelement location="${jboss.home}/bin/shutdown.jar"/>
             <pathelement location="${jboss.home}/client/jbossall-client.jar"/>

Modified: trunk/tests/smoke/smoke.properties.example
===================================================================
--- trunk/tests/smoke/smoke.properties.example	2006-11-01 07:43:39 UTC (rev 1534)
+++ trunk/tests/smoke/smoke.properties.example	2006-11-01 08:43:27 UTC (rev 1535)
@@ -12,6 +12,8 @@
 jboss403SP1-installer.home=C:\\work\\jnlp\\jboss-4.0.3SP1
 jboss404GA.home=C:\\work\\src\\jboss-4.0.4.GA-src\\build\\output\\jboss-4.0.4.GA
 jboss404GA-installer.home=C:\\work\\jnlp\\jboss-4.0.4.GA
+jboss405GA.home=C:\\work\\src\\jboss-4.0.5.GA-src\\build\\output\\jboss-4.0.5.GA
+jboss405GA-installer.home=C:\\work\\jnlp\\jboss-4.0.5.GA
 
 jboss500Alpha.home=C:\\work\\src\\cvs\\jboss-head\\build\\output\\jboss-5.0.0.Alpha