Merge branch 'chathurace-master'

wso2-attic · May 8, 2015 · 03656fa · 03656fa
2 parents 9de9c28 + 6f6c0e7
commit 03656fa
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/modules/integration/tests-integration/bpmn/pom.xml b/modules/integration/tests-integration/bpmn/pom.xml
@@ -296,9 +296,5 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.activiti.wso2</groupId>
-            <artifactId>activiti-engine</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/.../src/test/java/org/wso2/bps/integration/tests/bpmn/DeployUnDeployBPMNPackageTestCase.java b/.../src/test/java/org/wso2/bps/integration/tests/bpmn/DeployUnDeployBPMNPackageTestCase.java
@@ -87,7 +87,8 @@ public void deployUnDeployBPMNPackage() throws Exception {
         } catch (Exception exception) {
             Assert.assertTrue("Bpmn package " + fileName + "does not exist", BPMNTestConstants.
                     NOT_AVAILABLE.equals(exception.getMessage()));
-            log.error("Bpmn package " + fileName + " does not exist", exception);
+            // If the unDeployment succeed then we should get the exception with deployment could not found and testCase should pass.
+            // In that case we do not need to log the exception.
         }
     }
 }
diff --git a/...st/java/org/wso2/bps/integration/tests/bpmn/DeployUnDeployInvalidBPMNPackageTestCase.java b/...st/java/org/wso2/bps/integration/tests/bpmn/DeployUnDeployInvalidBPMNPackageTestCase.java
@@ -58,7 +58,8 @@ public void deployUnDeployInvalidBPMNPackage() throws Exception {
             Assert.fail("Invalid package was deployed.");
         } catch (Exception exception) {
             Assert.assertTrue("Could not upload the invalid bpmn package", "Error parsing XML".equals(exception.getMessage()));
-            log.error("Unhandled error, uploading Invalid bpmn package " + fileName, exception);
+            // If the deployment failed then we should get the exception with invalid bpmn package and testCase should pass.
+            // In that case we do not need to log the exception.
         }
     }
 }
diff --git a/...va/org/wso2/bps/integration/tests/bpmn/JavaServiceTaskDeploymentUndeploymentTestCase.java b/...va/org/wso2/bps/integration/tests/bpmn/JavaServiceTaskDeploymentUndeploymentTestCase.java
@@ -178,7 +178,8 @@ public void deployUnDeployJavaServiceTaskBPMNPackage() throws Exception {
         } catch (Exception exception) {
             Assert.assertTrue("Process instance was removed successfully", BPMNTestConstants.NOT_AVAILABLE.
                     equals(exception.getMessage()));
-            log.error("Process instance does not exist", exception);
+            // If the process instance does not exist we should get the exception and testCase should pass.
+            // In that case we do not need to log the exception.
         }
         //Undeploying the bpmn package. The request should return response of 204 after removing the
         //bpmn package.
@@ -197,7 +198,8 @@ public void deployUnDeployJavaServiceTaskBPMNPackage() throws Exception {
         } catch (Exception exception) {
             Assert.assertTrue("BPMN package " + fileName + " Does Not Exist", BPMNTestConstants.
                     NOT_AVAILABLE.equals(exception.getMessage()));
-            log.error("BPMN package " + fileName + " does not exist", exception);
+            // If the unDeployment succeed then we should get the exception with deployment could not found and testCase should pass.
+            // In that case we do not need to log the exception.
         }
     }
 }
diff --git a/...ation/bpmn/src/test/java/org/wso2/bps/integration/tests/bpmn/ProcessInstanceTestCase.java b/...ation/bpmn/src/test/java/org/wso2/bps/integration/tests/bpmn/ProcessInstanceTestCase.java
@@ -134,7 +134,8 @@ public void ProcessInstanceTests() throws Exception {
         } catch (Exception exception) {
             Assert.assertTrue("Process instance was removed successfully", BPMNTestConstants.
                     NOT_AVAILABLE.equals(exception.getMessage()));
-            log.error("Process Instance does not exist", exception);
+            // If the process instance does not exist we should get the exception and testCase should pass.
+            // In that case we do not need to log the exception.
         }
         //Undeploying the bpmn package. The request should return response of 204 after removing the
         //bpmn package.
@@ -154,7 +155,8 @@ public void ProcessInstanceTests() throws Exception {
         } catch (Exception exception) {
             Assert.assertTrue("Bpmn package " + fileName + " does not exist", BPMNTestConstants.
                     NOT_AVAILABLE.equals(exception.getMessage()));
-            log.error("Bpmn package " + fileName + " does not exist", exception);
+            // If the unDeployment succeed then we should get the exception with deployment could not found and testCase should pass.
+            // In that case we do not need to log the exception.
         }
     }
 }

diff --git a/...-integration/bpmn/src/test/java/org/wso2/bps/integration/tests/bpmn/UserTaskTestCase.java b/...-integration/bpmn/src/test/java/org/wso2/bps/integration/tests/bpmn/UserTaskTestCase.java
@@ -192,7 +192,8 @@ public void UserTaskTestCase() throws Exception {
         } catch (Exception exception) {
             Assert.assertTrue("Process instance was removed successfully", BPMNTestConstants.
                     NOT_AVAILABLE.equals(exception.getMessage()));
-            log.error("Process instance does not exist", exception);
+            // If the process instance does not exist we should get the exception and testCase should pass.
+            // In that case we do not need to log the exception.
         }
         //Undeploying the bpmn package. The request should return response of 204 after removing the
         //bpmn package.
@@ -212,7 +213,8 @@ public void UserTaskTestCase() throws Exception {
         } catch (Exception exception) {
             Assert.assertTrue("BPMN Package " + fileName + " Does Not Exist", BPMNTestConstants.
                     NOT_AVAILABLE.equals(exception.getMessage()));
-            log.error("BPMN package " + fileName + " does not exist", exception);
+            // If the unDeployment succeed then we should get the exception with deployment could not found and testCase should pass.
+            // In that case we do not need to log the exception.
         }
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -431,11 +431,6 @@
                 <artifactId>org.wso2.bps.multitenancy.login.ui</artifactId>
                 <version>${bps.version}</version>
             </dependency>
-	    <dependency>
-                <groupId>org.activiti.wso2</groupId>
-                <artifactId>activiti-engine</artifactId>
-                <version>${org.activiti.wso2.version}</version>
-            </dependency>
 	    <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
@@ -636,8 +631,6 @@
         <carbon.automation.version>4.3.1</carbon.automation.version>
 
         <orbit.version.ode>1.3.5-wso2v13</orbit.version.ode>
-
-        <org.activiti.wso2.version>5.16-wso2v1</org.activiti.wso2.version>
 
         <!-- H2 Database Engine       -->
         <h2.engine.version>1.2.140.wso2v3</h2.engine.version>