From 9bec200a7a8cbc0c854dc9663976a989f41d1196 Mon Sep 17 00:00:00 2001 From: Subhadip Pramanik Date: Fri, 24 Aug 2018 19:13:08 +0530 Subject: [PATCH] Set offline DS action inactive on creation (#728) * fix: set offline DS action inactive on creation * test: assert that all offline actions are inactive Signed-off-by: Subhadip Pramanik --- .../hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java | 1 + .../hawkbit/repository/jpa/DeploymentManagementTest.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java index c5eee924e..368841a90 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java @@ -89,6 +89,7 @@ public class OfflineDsAssignmentStrategy extends AbstractDsAssignmentStrategy { final JpaTarget target, final JpaDistributionSet set) { final JpaAction result = super.createTargetAction(targetsWithActionMap, target, set); result.setStatus(Status.FINISHED); + result.setActive(Boolean.FALSE); return result; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java index f2a3c6de6..79fbcf9d4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java @@ -484,7 +484,8 @@ public class DeploymentManagementTest extends AbstractJpaIntegrationTest { final List targets = deploymentManagement.offlineAssignedDistributionSet(ds.getId(), controllerIds) .getAssignedEntity(); assertThat(actionRepository.count()).isEqualTo(20); - + assertThat(actionRepository.findByDistributionSetId(PAGE, ds.getId())) + .as("Offline actions are not active").allMatch(action -> !action.isActive()); assertThat(targetManagement.findByInstalledDistributionSet(PAGE, ds.getId()).getContent()).containsAll(targets) .hasSize(10).containsAll(targetManagement.findByAssignedDistributionSet(PAGE, ds.getId())) .as("InstallationDate set").allMatch(target -> target.getInstallationDate() >= current)