[jbpm-commits] JBoss JBPM SVN: r6439 - in jbpm4/trunk/modules/test-db/src/test: resources/org/jbpm/test/ant and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-06-28 23:07:20 -0400 (Mon, 28 Jun 2010)
New Revision: 6439

Modified:
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java
   jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml
Log:
JBPM-2893: fix broken deploy task test :-P

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java	2010-06-28 23:26:55 UTC (rev 6438)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java	2010-06-29 03:07:20 UTC (rev 6439)
@@ -37,17 +37,17 @@
 
   public void testDeployXml() {
     runTarget("deploy-xml");
-    checkDeployment();
+    checkDeployment("valid.jpdl.xml");
   }
 
   public void testDeployZip() {
     runTarget("deploy-zip");
-    checkDeployment();
+    checkDeployment("valid.zip");
   }
 
   public void testDeployBar() {
     runTarget("deploy-bar");
-    checkDeployment();
+    checkDeployment("valid.bar");
   }
 
   private void runTarget(String target) {
@@ -73,14 +73,17 @@
     finally {
       System.setOut(stdout);
       System.setErr(stderr);
+    }
 
-      log.info(new String(memout.toByteArray()));
-    }
+    log.info(memout.toString());
   }
 
-  private void checkDeployment() {
+  private void checkDeployment(String deploymentName) {
     List<Deployment> deployments = repositoryService.createDeploymentQuery().list();
     assertEquals(1, deployments.size());
-    repositoryService.deleteDeploymentCascade(deployments.get(0).getId());
+
+    Deployment deployment = deployments.get(0);
+    assertEquals(deploymentName, deployment.getName());
+    repositoryService.deleteDeploymentCascade(deployment.getId());
   }
 }

Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml	2010-06-28 23:26:55 UTC (rev 6438)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml	2010-06-29 03:07:20 UTC (rev 6439)
@@ -1,18 +1,20 @@
 <?xml version="1.0"?>
 <project name="test-ant">
   <target name="init">
+    <dirname file="${ant.file}" property="base.dir" />
+    <echo>base directory: ${base.dir}</echo>
     <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" />
   </target>
 
   <target name="deploy-xml" depends="init">
-    <jbpm-deploy file="valid.jpdl.xml" />
+    <jbpm-deploy file="${base.dir}/valid.jpdl.xml" />
   </target>
 
   <target name="deploy-zip" depends="init">
-    <jbpm-deploy file="valid.zip" />
+    <jbpm-deploy file="${base.dir}/valid.zip" />
   </target>
 
   <target name="deploy-bar" depends="init">
-    <jbpm-deploy file="valid.bar" />
+    <jbpm-deploy file="${base.dir}/valid.bar" />
   </target>
 </project>
\ No newline at end of file