fix: use values from "with" in constructor

Refs: #87

Author: akutschera

pom.xml

@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.11.1</version>
+            <version>3.23.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/com/github/nylle/javafixture/InstanceFactory.java

@@ -11,6 +11,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
 import java.lang.reflect.Proxy;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -49,10 +50,6 @@ public InstanceFactory(SpecimenFactory specimenFactory) {
         this.random = new Random();
     }
 
-    public <T> T construct(final SpecimenType<T> type) {
-        return construct(type, new CustomizationContext(true));
-    }
-
     public <T> T construct(final SpecimenType<T> type, CustomizationContext customizationContext) {
         var constructors = type.getDeclaredConstructors()
                 .stream()
@@ -115,15 +112,22 @@ public <G, T extends Collection<G>> T createCollection(final SpecimenType<T> typ
     private <T> T construct(final SpecimenType<T> type, final Constructor<?> constructor, CustomizationContext customizationContext) {
         try {
             constructor.setAccessible(true);
-            return (T) constructor.newInstance(stream(constructor.getGenericParameterTypes())
-                    .map(t -> specimenFactory.build(SpecimenType.fromClass(t)))
-                    .map(s -> s.create(customizationContext, new Annotation[0]))
+            return (T) constructor.newInstance(stream(constructor.getParameters())
+                    .map(p -> createParameter(p, customizationContext))
                     .toArray());
         } catch (Exception e) {
             return manufacture(type, customizationContext);
         }
     }
 
+    private Object createParameter(Parameter parameter, CustomizationContext customizationContext) {
+        if (customizationContext.getCustomFields().containsKey(parameter.getName())) {
+            return customizationContext.getCustomFields().get(parameter.getName());
+        }
+        var specimen = specimenFactory.build(SpecimenType.fromClass(parameter.getParameterizedType()));
+        return specimen.create(customizationContext, new Annotation[0]);
+    }
+
     private <T> T createProxyForAbstract(final SpecimenType<T> type, final Map<String, ISpecimen<?>> specimens) {
         try {
             var factory = new ProxyFactory();

src/main/java/com/github/nylle/javafixture/specimen/GenericSpecimen.java

@@ -61,7 +61,7 @@ public GenericSpecimen(SpecimenType<T> type, Context context, SpecimenFactory sp
     @Override
     public T create(CustomizationContext customizationContext, Annotation[] annotations) {
         if (type.asClass().equals(Class.class)) {
-            return (T) specimens.entrySet().stream().findFirst().get().getValue().create(customizationContext,  new Annotation[0]).getClass();
+            return (T) specimens.entrySet().stream().findFirst().get().getValue().create(customizationContext, new Annotation[0]).getClass();
         }
 
         if (context.isCached(type)) {
@@ -73,7 +73,7 @@ public T create(CustomizationContext customizationContext, Annotation[] annotati
         }
 
         if (customizationContext.useRandomConstructor()) {
-            return context.cached(type, instanceFactory.construct(type));
+            return context.cached(type, instanceFactory.construct(type, customizationContext));
         }
 
         return populate(customizationContext);
@@ -92,8 +92,8 @@ private T populate(CustomizationContext customizationContext) {
                                     specimens.getOrDefault(
                                             field.getGenericType().getTypeName(),
                                             specimenFactory.build(SpecimenType.fromClass(field.getType()))).create(new CustomizationContext(List.of(), Map.of()), new Annotation[0]))));
-        } catch (SpecimenException ex ) {
-            return context.overwrite(type, instanceFactory.construct(type));
+        } catch (SpecimenException ex) {
+            return context.overwrite(type, instanceFactory.construct(type, customizationContext));
         }
         return result;
     }

src/main/java/com/github/nylle/javafixture/specimen/ObjectSpecimen.java

@@ -51,7 +51,7 @@ public T create(CustomizationContext customizationContext, Annotation[] annotati
         }
 
         if (customizationContext.useRandomConstructor()) {
-            return context.cached(type, instanceFactory.construct(type));
+            return context.cached(type, instanceFactory.construct(type, customizationContext));
         }
 
         return populate(customizationContext);
@@ -71,7 +71,7 @@ private T populate(CustomizationContext customizationContext) {
                                             field.getGenericType().getTypeName(),
                                             specimenFactory.build(SpecimenType.fromClass(field.getGenericType()))).create(new CustomizationContext(List.of(), Map.of()), field.getAnnotations()))));
         } catch (SpecimenException ex ) {
-            return context.overwrite(type, instanceFactory.construct(type));
+            return context.overwrite(type, instanceFactory.construct(type, customizationContext));
         }
         return result;
     }

src/test/java/com/github/nylle/javafixture/InstanceFactoryTest.java

@@ -1,5 +1,6 @@
 package com.github.nylle.javafixture;
 
+import com.github.nylle.javafixture.testobjects.TestObject;
 import com.github.nylle.javafixture.testobjects.factorymethod.ConstructorExceptionAndFactoryMethod;
 import com.github.nylle.javafixture.testobjects.factorymethod.FactoryMethodWithArgument;
 import com.github.nylle.javafixture.testobjects.factorymethod.FactoryMethodWithGenericArgument;
@@ -113,6 +114,33 @@ void fallbackToFactoryMethodWhenConstructorThrowsException() {
 
             assertThat(result.getValue()).isNotNull();
         }
+
+        @Test
+        @DisplayName("arguments can be customized")
+        void argumentsCanBeCustomized() {
+            var sut = new InstanceFactory(new SpecimenFactory(new Context(Configuration.configure())));
+
+            var customizationContext = new CustomizationContext(true);
+            // use arg0, because .class files do not store formal parameter names by default
+            customizationContext.getCustomFields().put("arg0", "customized");
+            TestObject result = sut.construct(fromClass(TestObject.class), customizationContext);
+
+            assertThat(result.getValue()).isEqualTo("customized");
+        }
+
+        @Test
+        @DisplayName("constructor arguments are cached")
+        void constructorArgumentsAreCached() {
+            var sut = new InstanceFactory(new SpecimenFactory(new Context(Configuration.configure())));
+
+            var customizationContext = new CustomizationContext(true);
+            TestObject first = sut.construct(fromClass(TestObject.class), customizationContext);
+            TestObject second = sut.construct(fromClass(TestObject.class), customizationContext);
+
+            assertThat(first.getIntegers()).usingRecursiveComparison().isEqualTo(second.getIntegers());
+            assertThat(first.getStrings()).usingRecursiveComparison().isEqualTo(second.getStrings());
+            assertThat(first.getValue()).as("primitives are never cached").isNotEqualTo(second.getValue());
+        }
     }
 
     @Nested