[jbpm-commits] JBoss JBPM SVN: r3353 - in jbpm3/trunk/modules: enterprise/src/test/java/org/jbpm/enterprise and 7 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Dec 12 03:26:18 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-12-12 03:26:18 -0500 (Fri, 12 Dec 2008)
New Revision: 3353

Added:
   jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/deployment/
   jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/deployment/DeploymentPARTest.java
   jbpm3/trunk/modules/enterprise/src/test/resources/deployment/
   jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/
   jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF/
Removed:
   jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF/
   jbpm3/trunk/modules/integration/src/test/resources/jndi.properties
Modified:
   jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
   jbpm3/trunk/modules/integration/pom.xml
   jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
Log:
Mode deployment tests to enterprise

Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml	2008-12-12 05:58:44 UTC (rev 3352)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml	2008-12-12 08:26:18 UTC (rev 3353)
@@ -21,18 +21,23 @@
     <mkdir dir="${tests.output.dir}/test-libs"/>
     
     <!-- enterprise-test -->
-    <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/WEB-INF/web.xml">
+    <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/enterprise/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/test-classes" />
       <lib dir="${tests.output.dir}/test-dependencies">
         <include name="aspectjrt*.jar"/>
         <include name="cactus*.jar"/>
         <include name="junit*.jar"/>
       </lib>
-      <webinf dir="${tests.resources.dir}/WEB-INF">
+      <webinf dir="${tests.resources.dir}/enterprise/WEB-INF">
         <exclude name="web.xml"/>
       </webinf>
     </war>
 
+    <!-- fork-join-example -->
+    <jar jarfile="${tests.output.dir}/test-libs/fork-join-example.par">
+      <fileset dir="${tests.resources.dir}/deployment/fork-join-example"/>
+    </jar>
+  	
     <!-- Please add alphabetically -->
     
   </target>

Copied: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/deployment/DeploymentPARTest.java (from rev 3352, jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java)
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/deployment/DeploymentPARTest.java	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/deployment/DeploymentPARTest.java	2008-12-12 08:26:18 UTC (rev 3353)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.enterprise.deployment;
+
+// $Id$
+
+import org.jboss.bpm.api.test.IntegrationTestCase;
+
+/**
+ * Test simple PAR deployment
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 24-Nov-2008
+ */
+public class DeploymentPARTest extends IntegrationTestCase
+{
+  public void testRemoteDeploy() throws Exception
+  {
+    deploy("fork-join-example.par");
+  }
+
+  public void testRemoteUndeploy() throws Exception
+  {
+    undeploy("fork-join-example.par");
+  }
+}


Property changes on: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/deployment/DeploymentPARTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + LF

Copied: jbpm3/trunk/modules/enterprise/src/test/resources/deployment (from rev 3352, jbpm3/trunk/modules/integration/src/test/resources/deployment)


Property changes on: jbpm3/trunk/modules/enterprise/src/test/resources/deployment
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: jbpm3/trunk/modules/enterprise/src/test/resources/enterprise/WEB-INF (from rev 3352, jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF)

Modified: jbpm3/trunk/modules/integration/pom.xml
===================================================================
--- jbpm3/trunk/modules/integration/pom.xml	2008-12-12 05:58:44 UTC (rev 3352)
+++ jbpm3/trunk/modules/integration/pom.xml	2008-12-12 08:26:18 UTC (rev 3353)
@@ -212,29 +212,6 @@
 
   <!--  Profiles -->
   <profiles>
-  
-    <!--
-    Name:  no-jboss-bind-address
-    Descr: Skip tests if no jboss.bind address is given
-    -->
-    <profile>
-      <id>no-jboss-bind-address</id>
-      <activation>
-        <property>
-          <name>!jboss.bind.address</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
+  </profiles>
     
-  </profiles>  
 </project>

Modified: jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
===================================================================
--- jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java	2008-12-12 05:58:44 UTC (rev 3352)
+++ jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java	2008-12-12 08:26:18 UTC (rev 3353)
@@ -33,7 +33,7 @@
 import org.jboss.bpm.api.model.ProcessInstance;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.test.IntegrationTestCase;
+import org.jboss.bpm.api.test.APITestCase;
 import org.jboss.bpm.incubator.service.TaskInstanceService;
 
 /**
@@ -42,7 +42,7 @@
  * @author thomas.diesler at jboss.com
  * @since 24-Nov-2008
  */
-public class DeploymentPARTest extends IntegrationTestCase
+public class DeploymentPARTest extends APITestCase
 {
   
   public void testSimplePARDeploy() throws Exception
@@ -76,16 +76,6 @@
     assertTrue("Undeploy successful", depService.undeploy(dep));
   }
 
-  public void testRemoteDeploy() throws Exception
-  {
-    deploy("fork-join-example.par");
-  }
-
-  public void testRemoteUndeploy() throws Exception
-  {
-    undeploy("fork-join-example.par");
-  }
-
   private Token getChildToken(Token token, String nodeName)
   {
     Map<String, Token> childToks = new HashMap<String, Token>();

Deleted: jbpm3/trunk/modules/integration/src/test/resources/jndi.properties
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/jndi.properties	2008-12-12 05:58:44 UTC (rev 3352)
+++ jbpm3/trunk/modules/integration/src/test/resources/jndi.properties	2008-12-12 08:26:18 UTC (rev 3353)
@@ -1,3 +0,0 @@
-java.naming.provider.url=jnp://@jboss.bind.address@:1099
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming.client




More information about the jbpm-commits mailing list