pass properly updated context to a ContextAwareRandomizer

j-easy · Oct 31, 2020 · 729420b · 729420b
1 parent 8ee6f78
commit 729420b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/easy-random-core/src/main/java/org/jeasy/random/FieldPopulator.java b/easy-random-core/src/main/java/org/jeasy/random/FieldPopulator.java
@@ -77,10 +77,10 @@ void populateField(final Object target, final Field field, final RandomizationCo
         if (randomizer instanceof SkipRandomizer) {
             return;
         }
+        context.pushStackItem(new RandomizationContextStackItem(target, field));
         if (randomizer instanceof ContextAwareRandomizer) {
             ((ContextAwareRandomizer<?>) randomizer).setRandomizerContext(context);
         }
-        context.pushStackItem(new RandomizationContextStackItem(target, field));
         if(!context.hasExceededRandomizationDepth()) {
             Object value;
             if (randomizer != null) {

diff --git a/easy-random-core/src/test/java/org/jeasy/random/FieldPopulatorTest.java b/easy-random-core/src/test/java/org/jeasy/random/FieldPopulatorTest.java
@@ -25,6 +25,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.BDDAssertions.thenThrownBy;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;
@@ -35,6 +36,7 @@
 
 import javax.xml.bind.JAXBElement;
 
+import org.jeasy.random.api.ContextAwareRandomizer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -64,6 +66,8 @@ class FieldPopulatorTest {
     @Mock
     private Randomizer randomizer;
     @Mock
+    private ContextAwareRandomizer contextAwareRandomizer;
+    @Mock
     private ArrayPopulator arrayPopulator;
     @Mock
     private CollectionPopulator collectionPopulator;
@@ -111,6 +115,27 @@ void whenCustomRandomizerIsRegisteredForTheField_thenTheFieldShouldBePopulatedWi
         assertThat(human.getName()).isEqualTo(NAME);
     }
 
+    @Test
+    void whenContextAwareRandomizerIsRegisteredForTheField_thenTheFieldShouldBeOnTopOfTheSuppliedContextStack() throws Exception {
+        // Given
+        Field name = Human.class.getDeclaredField("name");
+        Human human = new Human();
+        RandomizationContext context = new RandomizationContext(Human.class, new EasyRandomParameters());
+        final Human[] currentObjectFromContext = new Human[1];
+        when(randomizerProvider.getRandomizerByField(name, context)).thenReturn(contextAwareRandomizer);
+        when(contextAwareRandomizer.getRandomValue()).thenReturn(NAME);
+        doAnswer(invocationOnMock -> {
+            currentObjectFromContext[0] = (Human)invocationOnMock.getArgument(0, RandomizationContext.class).getCurrentObject();
+            return null;
+        }).when(contextAwareRandomizer).setRandomizerContext(context);
+
+        // When
+        fieldPopulator.populateField(human, name, context);
+
+        // Then
+        assertThat(currentObjectFromContext[0]).isEqualTo(human);
+    }
+
     @Test
     void whenTheFieldIsOfTypeArray_thenShouldDelegatePopulationToArrayPopulator() throws Exception {
         // Given