[jbpm-commits] JBoss JBPM SVN: r6745 - jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-10-07 00:33:42 -0400 (Thu, 07 Oct 2010)
New Revision: 6745

Modified:
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java
Log:
avoid reliance on deployment query result order

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java	2010-10-07 02:52:15 UTC (rev 6744)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java	2010-10-07 04:33:42 UTC (rev 6745)
@@ -21,9 +21,7 @@
  */
 package org.jbpm.test.query;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.hibernate.exception.SQLGrammarException;
@@ -48,22 +46,25 @@
 
     // find all deployments
     List<Deployment> deployments = repositoryService.createDeploymentQuery().list();
-    assertEquals(Arrays.asList("Claim", "Hire", "Fire"), getDeploymentNames(deployments));
+    assertDeploymentsPresent(deployments, "Claim", "Fire", "Hire");
 
     // find suspended deployments
     deployments = repositoryService.createDeploymentQuery().suspended().list();
-    assertEquals(Collections.singletonList("Fire"), getDeploymentNames(deployments));
+    assertDeploymentsPresent(deployments, "Fire");
 
     // find active deployments
     deployments = repositoryService.createDeploymentQuery().notSuspended().list();
-    assertEquals(Arrays.asList("Claim", "Hire"), getDeploymentNames(deployments));
+    assertDeploymentsPresent(deployments, "Claim", "Hire");
 
     deleteCascade(deploymentIds);
   }
 
-  private void deleteCascade(String[] deploymentIds) {
-    for (String deploymentId : deploymentIds) {
-      repositoryService.deleteDeploymentCascade(deploymentId);
+  private static void assertDeploymentsPresent(List<Deployment> deployments,
+    String... deploymentNames) {
+    assertEquals(deploymentNames.length, deployments.size());
+
+    for (Deployment deployment : deployments) {
+      assert Arrays.binarySearch(deploymentNames, deployment.getName()) >= 0 : deployment.getName();
     }
   }
 
@@ -141,12 +142,10 @@
    * HELPER METHODS
    * -------------- */
 
-  private static List<String> getDeploymentNames(List<Deployment> deployments) {
-    List<String> deploymentNames = new ArrayList<String>();
-    for (Deployment deployment : deployments) {
-      deploymentNames.add(deployment.getName());
+  private void deleteCascade(String[] deploymentIds) {
+    for (String deploymentId : deploymentIds) {
+      repositoryService.deleteDeploymentCascade(deploymentId);
     }
-    return deploymentNames;
   }
 
   private String[] deployTestProcesses() {
@@ -215,5 +214,4 @@
 
     deleteCascade(deploymentIds);
   }
-
 }