improve test to consider multiple externalRefs

Signed-off-by: Ravindranath Sandeep (INST-IOT/ESW-Imb) <Sandeep.Ravindranath@bosch-si.com>
eclipse-hawkbit · Jul 17, 2019 · 3e15988 · 3e15988
1 parent bead501
commit 3e15988
Showing 1 changed file with 23 additions and 11 deletions.
diff --git a/...sitory-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java b/...sitory-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java
@@ -22,6 +22,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -1317,20 +1318,31 @@ public void quotaEceededExceptionWhenControllerReportsTooManyUpdateActionStatusM
     }
 
     @Test
-    @Description("Verify that the attached externalRef to an action is propery stored")
+    @Description("Verify that the attaching externalRef to an action is propery stored")
     public void updatedExternalRefOnActionIsReallyUpdated() {
-        final String knownControllerId = "controller12345";
-        final String knownExternalref = "externalRefId123456";
-
+        final List<String> allExternalRef = new ArrayList<>();
+        final List<Long> allActionId = new ArrayList<>();
+        final int numberOfActions = 3;
         final DistributionSet knownDistributionSet = testdataFactory.createDistributionSet();
-        testdataFactory.createTarget(knownControllerId);
-        final DistributionSetAssignmentResult assignmentResult = deploymentManagement.assignDistributionSet(
-                knownDistributionSet.getId(), ActionType.FORCED, 0, Collections.singleton(knownControllerId));
-        final Long actionId = assignmentResult.getActionIds().get(0);
-        controllerManagement.updateActionExternalRef(actionId, knownExternalref);
-        List<Action> foundAction = controllerManagement.getActiveActionsByExternalRef(Arrays.asList(knownExternalref));
+        for (int i = 0; i < numberOfActions; i++) {
+            final String knownControllerId = "controllerId" + i;
+            final String knownExternalref = "externalRefId" + i;
+
+            testdataFactory.createTarget(knownControllerId);
+            final DistributionSetAssignmentResult assignmentResult = deploymentManagement.assignDistributionSet(
+                    knownDistributionSet.getId(), ActionType.FORCED, 0, Collections.singleton(knownControllerId));
+            final Long actionId = assignmentResult.getActionIds().get(0);
+            controllerManagement.updateActionExternalRef(actionId, knownExternalref);
+
+            allExternalRef.add(knownExternalref);
+            allActionId.add(actionId);
+        }
+
+        final List<Action> foundAction = controllerManagement.getActiveActionsByExternalRef(allExternalRef);
         assertThat(foundAction).isNotNull();
-        assertThat(foundAction.get(0).getId()).isEqualTo(actionId);
+        for (int i = 0; i < numberOfActions; i++) {
+            assertThat(foundAction.get(i).getId()).isEqualTo(allActionId.get(i));
+        }
     }
 
     @Test