diff --git a/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java b/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java index 4462a1eccf..8d8098cb07 100644 --- a/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java +++ b/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java @@ -42,13 +42,15 @@ import static org.mockito.internal.verification.VerificationModeFactory.times; /** * @author eknizat */ -public class HBDataCollectorServiceImplTest { +public class HBDataCollectorServiceImplTest +{ private HBDataCollectorServiceImpl dataCollectorService; private HBDataSenderService mockDataSenderService; @Before - public void setUp(){ + public void setUp() + { mockDataSenderService = mock(HBDataSenderService.class); dataCollectorService = new HBDataCollectorServiceImpl(true); dataCollectorService.setHbDataSenderService(mockDataSenderService); diff --git a/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java b/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java index 5b5cfa0d16..1f206089f8 100644 --- a/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java +++ b/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java @@ -42,7 +42,6 @@ import java.util.Arrays; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -50,23 +49,6 @@ import static org.mockito.Mockito.when; public class HeartBeatTest { - /** - * 1. Constructor - * - Check that licenseService.registerOnLicenseChange - * - * 2. Job scheduling - * - enabled - * - disabled - * - unschedule job - * - schedule already scheduled job (maybe not actually needed) - * - * 3. On licence chane - * - * 4. On licence fail - * - * 4. Test HB Job inner class - */ - private static final String[] CONFIG_LOCATIONS = new String[] {"alfresco/scheduler-core-context.xml", "org/alfresco/util/test-scheduled-jobs-context.xml"}; private ApplicationContext context; @@ -76,7 +58,8 @@ public class HeartBeatTest HBDataCollectorService mockDataCollectorService; @Before - public void setUp(){ + public void setUp() + { // New context with scheduler context = new ClassPathXmlApplicationContext(CONFIG_LOCATIONS);