[ANDROSDK-831] Fix TEA handler test

dhis2 · May 25, 2020 · f4b5bcf · f4b5bcf
1 parent b05be56
commit f4b5bcf
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/...rg/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandlerShould.java b/...rg/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandlerShould.java
@@ -52,15 +52,14 @@ public class TrackedEntityAttributeHandlerShould {
     @Mock
     private IdentifiableObjectStore<TrackedEntityAttribute> trackedEntityAttributeStore;
 
-    @Mock
-    private TrackedEntityAttribute trackedEntityAttribute;
-
     @Mock
     private ObjectStyle objectStyle;
 
     @Mock
     private Access access;
 
+    private TrackedEntityAttribute trackedEntityAttribute;
+
     // object to test
     private List<TrackedEntityAttribute> trackedEntityAttributes;
     private TrackedEntityAttributeHandler trackedEntityAttributeHandler;
@@ -70,13 +69,18 @@ public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         trackedEntityAttributeHandler = new TrackedEntityAttributeHandler(trackedEntityAttributeStore);
 
+        trackedEntityAttribute = TrackedEntityAttribute.builder()
+                .uid("test_tracked_entity_attribute_uid")
+                .style(objectStyle)
+                .name("name")
+                .displayName("display_name")
+                .formName("form_name")
+                .access(access)
+                .build();
+
         trackedEntityAttributes = new ArrayList<>();
         trackedEntityAttributes.add(trackedEntityAttribute);
 
-        when(trackedEntityAttribute.uid()).thenReturn("test_tracked_entity_attribute_uid");
-        when(trackedEntityAttribute.style()).thenReturn(objectStyle);
-        when(trackedEntityAttribute.formName()).thenReturn("form_name");
-        when(trackedEntityAttribute.access()).thenReturn(access);
         when(access.read()).thenReturn(true);
     }