diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java index 02fa42f03..e3f88c741 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnitRunner; import pro.taskana.CustomField; @@ -58,7 +57,6 @@ public class CategoryReportBuilderImplTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java index e8025cb7f..0cbe29755 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnitRunner; import pro.taskana.CustomField; @@ -61,7 +60,6 @@ public class ClassificationReportBuilderImplTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java index 4c4507e8f..6f11c91a0 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnitRunner; import pro.taskana.CustomField; @@ -57,7 +56,6 @@ public class CustomFieldValueReportBuilderImplTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); @@ -210,7 +208,8 @@ public class CustomFieldValueReportBuilderImplTest { verify(taskMonitorMapperMock, times(1)) .getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any()); verify(taskanaEngineInternalMock, times(1)).returnConnection(); - verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, taskanaEngineConfiguration); + verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, + taskanaEngineConfiguration); assertNotNull(actualResult); assertEquals(expectedResult, actualResult); diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java index eb49c51ac..8f615df67 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -89,7 +88,6 @@ public class TaskServiceImplTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineMock.getWorkbasketService()).thenReturn(workbasketServiceMock); when(taskanaEngineMock.getClassificationService()).thenReturn(classificationServiceImplMock); diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java index 4db186edc..b3a326a10 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java @@ -18,7 +18,6 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnitRunner; import pro.taskana.TaskState; @@ -50,7 +49,6 @@ public class TaskStatusReportBuilderImplTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); } diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java index 78c3b02de..ea80d16e8 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnitRunner; import pro.taskana.CustomField; @@ -60,7 +59,6 @@ public class WorkbasketReportBuilderImplTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);