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.

Sign up for GitHub

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

[test] allow list injection for tests #761

Merged
merged 4 commits into from
Jan 13, 2025
Merged

[test] allow list injection for tests #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ae1537
[test] allow list injection for tests
SentryMan Jan 13, 2025
8d1335f
also optional
SentryMan Jan 13, 2025
ec5e8db
Update MetaReader.java
SentryMan Jan 13, 2025
5d3993b
remove if
SentryMan Jan 13, 2025
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
50 changes: 36 additions & 14 deletions inject-test/src/main/java/io/avaje/inject/test/MetaReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
package io.avaje.inject.test;

import io.avaje.inject.BeanScope;
import io.avaje.inject.BeanScopeBuilder;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Qualifier;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.internal.configuration.plugins.Plugins;
import org.mockito.internal.util.reflection.GenericMaster;

import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;

import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.internal.configuration.plugins.Plugins;
import org.mockito.internal.util.reflection.GenericMaster;

import io.avaje.inject.BeanScope;
import io.avaje.inject.BeanScopeBuilder;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Qualifier;

final class MetaReader {

Expand Down Expand Up @@ -349,9 +352,28 @@ Object get(Object instance) {
}

void setFromScope(BeanScope beanScope, Object testInstance) throws IllegalAccessException {
if (!valueAlreadyProvided) {
set(field, beanScope.get(type(), name), testInstance);
if (valueAlreadyProvided) {
return;
}
final var type = type();

if (type instanceof ParameterizedType) {
final var parameterizedType = (ParameterizedType) type;
final var rawType = parameterizedType.getRawType();
final var typeArguments = parameterizedType.getActualTypeArguments();

if (rawType.equals(List.class)) {
set(field, beanScope.list(typeArguments[0]), testInstance);
return;
}

if (rawType.equals(Optional.class)) {
set(field, beanScope.getOptional(typeArguments[0], name), testInstance);
return;
}
}

set(field, beanScope.get(type, name), testInstance);
}

void setFromPlugin(Object value, Object testInstance) throws IllegalAccessException {
Expand Down
22 changes: 22 additions & 0 deletions inject-test/src/test/java/org/example/coffee/list/ListInject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.example.coffee.list;

import static org.assertj.core.api.Assertions.assertThat;

import java.util.List;

import org.junit.jupiter.api.Test;

import io.avaje.inject.test.InjectTest;
import jakarta.inject.Inject;

@InjectTest
class ListInject {

@Inject List<Somei> testSomei;

@Test
void test() {

assertThat(testSomei).isNotEmpty();
}
}
Loading