Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Tested fullyInitialized instance with interfaces in constructor #697

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main/src/mockit/internal/injection/TestedObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private Object createAndRegisterNewObject(@Nonnull Object testClassInstance, @No
Object testedInstance = null;

if (testedObjectCreation != null) {
testedInstance = testedObjectCreation.create(false);
testedInstance = testedObjectCreation.create(false, true);

if (testedInstance != null) {
setInstance(testClassInstance, testedInstance);
Expand Down
4 changes: 2 additions & 2 deletions main/src/mockit/internal/injection/TestedObjectCreation.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public TestedObjectCreation(
}

@Nullable
public Object create(boolean required) {
public Object create(boolean required, boolean needToConstruct) {
ConstructorSearch constructorSearch = new ConstructorSearch(injectionState, testedClass, fullInjection != null);
Constructor<?> constructor = constructorSearch.findConstructorToUse();

Expand All @@ -64,6 +64,6 @@ public Object create(boolean required) {
}

ConstructorInjection constructorInjection = new ConstructorInjection(injectionState, fullInjection, constructor);
return constructorInjection.instantiate(constructorSearch.parameterProviders, testedClass, required);
return constructorInjection.instantiate(constructorSearch.parameterProviders, testedClass, required, needToConstruct);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ConstructorInjection(
}

@Nullable
public Object instantiate(@Nonnull List<InjectionProvider> parameterProviders, @Nonnull TestedClass testedClass, boolean required) {
public Object instantiate(@Nonnull List<InjectionProvider> parameterProviders, @Nonnull TestedClass testedClass, boolean required, boolean needToConstruct) {
Type[] parameterTypes = constructor.getGenericParameterTypes();
int n = parameterTypes.length;
List<InjectionProvider> consumedInjectables = n == 0 ? null : injectionState.injectionProviders.saveConsumedInjectionProviders();
Expand All @@ -49,7 +49,7 @@ public Object instantiate(@Nonnull List<InjectionProvider> parameterProviders, @
if (parameterProvider instanceof ConstructorParameter) {
value = createOrReuseArgumentValue((ConstructorParameter) parameterProvider, required);

if (value == null) {
if (value == null && !needToConstruct) {
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion main/src/mockit/internal/injection/full/FullInjection.java
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ private Object createNewInstance(@Nonnull Class<?> classToInstantiate, boolean r
return newInstanceUsingDefaultConstructorIfAvailable(classToInstantiate);
}

return new TestedObjectCreation(injectionState, this, classToInstantiate).create(required);
return new TestedObjectCreation(injectionState, this, classToInstantiate).create(required, false);
}

@Nonnull
Expand Down
9 changes: 9 additions & 0 deletions main/test/mockit/TestedClassWithFullDITest.java
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,13 @@ public void instantiateClassWithFieldToInjectWhoseTypeCannotBeInstantiated(@Test
assertNotNull(cut);
assertNull(cut.dependency);
}

static interface InterfaceDependency { }
static class ClassWithInterfaceInConstructor { ClassWithInterfaceInConstructor(@SuppressWarnings("unused") InterfaceDependency someValue) {} }

@Test
public void instantiateClassWithInterfaceInConstructor(@Tested(fullyInitialized = true) ClassWithInterfaceInConstructor cut) {
assertNotNull(cut);
}

}