From 5de4c51927845b8a33e1fb85e3f5340067898ad7 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Thu, 17 Mar 2016 10:07:34 +0100 Subject: [PATCH 1/2] made progress counter volatile --- .../eclipse/hawkbit/controller/ArtifactDownloadTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java b/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java index b49f34b5f..6149472a7 100644 --- a/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java +++ b/hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java @@ -64,13 +64,11 @@ import ru.yandex.qatools.allure.annotations.Stories; @Stories("Artifact Download Resource") public class ArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB { - private static final String AUTH_ANOYM = "ROLE_CONTROLLER_ANONYMOUS"; - public ArtifactDownloadTest() { LOG = LoggerFactory.getLogger(ArtifactDownloadTest.class); } - private int downLoadProgress = 0; + private volatile int downLoadProgress = 0; @Autowired private EventBus eventBus; @@ -364,7 +362,7 @@ public class ArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB { // create target Target target = new Target("4712"); target = targetManagement.createTarget(target); - final List targets = new ArrayList(); + final List targets = new ArrayList<>(); targets.add(target); // create ds From 5279276146185a16516b1678c9c0d3f3ac9e8353 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Thu, 17 Mar 2016 10:09:42 +0100 Subject: [PATCH 2/2] Removed unnecessary type reference --- .../hawkbit/repository/DeploymentManagementTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java index ecf079c29..dd674d3a3 100644 --- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java +++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java @@ -1021,8 +1021,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest { } private static class EventHandlerMock { - private final List events = Collections - .synchronizedList(new LinkedList()); + private final List events = Collections.synchronizedList(new LinkedList<>()); private final CountDownLatch latch; private final int expectedNumberOfEvents; @@ -1050,8 +1049,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest { } private static class CancelEventHandlerMock { - private final List events = Collections - .synchronizedList(new LinkedList()); + private final List events = Collections.synchronizedList(new LinkedList<>()); private final CountDownLatch latch; private final int expectedNumberOfEvents;