Fix unit tests

sidohaakma · Aug 24, 2018 · 454d111 · 454d111
1 parent 84e491a
commit 454d111
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...data-icd10/src/test/java/org/molgenis/data/icd10/CollectionsQueryTransformerImplTest.java b/...data-icd10/src/test/java/org/molgenis/data/icd10/CollectionsQueryTransformerImplTest.java
@@ -44,8 +44,6 @@ public class CollectionsQueryTransformerImplTest extends AbstractMockitoTest
 	public void setUpBeforeMethod()
 	{
 		collectionsQueryTransformerImpl = new CollectionsQueryTransformerImpl(icd10ClassExpander, dataService);
-
-		when(icd10ClassExpander.expandClasses(singletonList(diseaseEntity))).thenReturn(expandedDiseaseEntities);
 	}
 
 	/**
@@ -154,9 +152,10 @@ public Iterator<Object[]> transformableQueryProvider()
 	public void testTransformableQueries(Query<Entity> query, Query<Entity> expectedTransformedQuery)
 	{
 		when(dataService.findAll(eq(ICD10_ENTITY_TYPE_ID), any(Stream.class))).thenReturn(Stream.of(diseaseEntity));
-
+		when(icd10ClassExpander.expandClasses(singletonList(diseaseEntity))).thenReturn(expandedDiseaseEntities);
+
 		Query<Entity> transformedQuery = collectionsQueryTransformerImpl.transformQuery(query, ICD10_ENTITY_TYPE_ID,
 				EXPAND_ATTRIBUTE);
 		assertEquals(transformedQuery, expectedTransformedQuery);
 	}
-}
+}