nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CLEANUP: removed unnecessary init of mocks

This commit is contained in:
Mustapha Zorgati 2019-07-18 12:25:38 +02:00
parent 271e293969
commit 9a4f4dd9ef
6 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.CustomField; import pro.taskana.CustomField;
@ -58,7 +57,6 @@ public class CategoryReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);

2
lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.CustomField; import pro.taskana.CustomField;
@ -61,7 +60,6 @@ public class ClassificationReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this);
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);

5
lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
View File

@ -20,7 +20,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.CustomField; import pro.taskana.CustomField;
@ -57,7 +56,6 @@ public class CustomFieldValueReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this);
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
@ -210,7 +208,8 @@ public class CustomFieldValueReportBuilderImplTest {
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any()); .getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(taskanaEngineInternalMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, taskanaEngineConfiguration); verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
assertEquals(expectedResult, actualResult); assertEquals(expectedResult, actualResult);

2
lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunner;
@ -89,7 +88,6 @@ public class TaskServiceImplTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this);
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getWorkbasketService()).thenReturn(workbasketServiceMock); when(taskanaEngineMock.getWorkbasketService()).thenReturn(workbasketServiceMock);
when(taskanaEngineMock.getClassificationService()).thenReturn(classificationServiceImplMock); when(taskanaEngineMock.getClassificationService()).thenReturn(classificationServiceImplMock);

2
lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
View File

@ -18,7 +18,6 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder; import org.mockito.InOrder;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.TaskState; import pro.taskana.TaskState;
@ -50,7 +49,6 @@ public class TaskStatusReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this);
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
} }

2
lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
View File

@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.CustomField; import pro.taskana.CustomField;
@ -60,7 +59,6 @@ public class WorkbasketReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this);
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);