Spring/spring-guice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to JUnit 5

Browse Source
This commit is contained in:
Simon DeMartini
2022-03-19 15:14:15 -07:00
committed by GitHub
parent b6c44a1436
commit 99d7a7a268
32 changed files with 196 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/java/org/springframework/guice/module/DevelepmentStageInjectorTest.java
View File

@@ -25,9 +25,9 @@ import com.google.inject.Module;
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.Stage;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -35,17 +35,17 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.guice.annotation.EnableGuiceModules;
import org.springframework.guice.annotation.InjectorFactory;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class DevelepmentStageInjectorTest {
@BeforeClass
@BeforeAll
public static void init() {
System.setProperty("spring.guice.stage", "DEVELOPMENT");
}
@AfterClass
@AfterAll
public static void cleanup() {
System.clearProperty("spring.guice.stage");
}

17
src/test/java/org/springframework/guice/module/SpringModuleGuiceBindingAwareTests.java
View File

@@ -23,7 +23,7 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Scopes;
import com.google.inject.util.Providers;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
@@ -31,9 +31,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.util.AopTestUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
public class SpringModuleGuiceBindingAwareTests {
@@ -57,9 +57,12 @@ public class SpringModuleGuiceBindingAwareTests {
assertEquals("done", springBean.getDep1().doWork());
// check binding equality
assertSame(injector.getInstance(IGuiceDependency1.class), AopTestUtils.getTargetObject(springBean.getDep1()));
assertSame(injector.getInstance(IGuiceDependency2.class), AopTestUtils.getTargetObject(springBean.getDep2()));
assertSame(injector.getInstance(IGuiceDependency3.class), AopTestUtils.getTargetObject(springBean.getDep3()));
assertSame(injector.getInstance(IGuiceDependency1.class),
AopTestUtils.getTargetObject(springBean.getDep1()));
assertSame(injector.getInstance(IGuiceDependency2.class),
AopTestUtils.getTargetObject(springBean.getDep2()));
assertSame(injector.getInstance(IGuiceDependency3.class),
AopTestUtils.getTargetObject(springBean.getDep3()));
}
static class SimpleGuiceModule extends AbstractModule {

21
src/test/java/org/springframework/guice/module/SpringModuleMetadataTests.java
View File

@@ -24,9 +24,8 @@ import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.ProvisionException;
import com.google.inject.name.Names;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -36,8 +35,8 @@ import org.springframework.context.annotation.Primary;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.core.type.filter.AssignableTypeFilter;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* @author Dave Syer
@@ -45,9 +44,6 @@ import static org.junit.Assert.assertNull;
*/
public class SpringModuleMetadataTests {
@Rule
public ExpectedException expected = ExpectedException.none();
@Test
public void twoConfigClasses() throws Exception {
Injector injector = createInjector(TestConfig.class, OtherConfig.class);
@@ -57,8 +53,7 @@ public class SpringModuleMetadataTests {
@Test
public void twoServices() throws Exception {
Injector injector = createInjector(TestConfig.class, MoreConfig.class);
this.expected.expect(ProvisionException.class);
assertNotNull(injector.getInstance(Service.class));
assertThrows(ProvisionException.class, () -> assertNotNull(injector.getInstance(Service.class)));
}
@Test
@@ -76,15 +71,13 @@ public class SpringModuleMetadataTests {
@Test
public void includes() throws Exception {
Injector injector = createInjector(TestConfig.class, MetadataIncludesConfig.class);
this.expected.expect(ConfigurationException.class);
assertNull(injector.getBinding(Service.class));
assertThrows(ConfigurationException.class, () -> Assertions.assertNull(injector.getBinding(Service.class)));
}
@Test
public void excludes() throws Exception {
Injector injector = createInjector(TestConfig.class, MetadataExcludesConfig.class);
this.expected.expect(ConfigurationException.class);
assertNull(injector.getInstance(Service.class));
assertThrows(ConfigurationException.class, () -> Assertions.assertNull(injector.getBinding(Service.class)));
}
private Injector createInjector(Class<?>... config) {

5
src/test/java/org/springframework/guice/module/SpringModuleWiringTests.java
View File

@@ -18,8 +18,6 @@ package org.springframework.guice.module;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.junit.Rule;
import org.junit.rules.ExpectedException;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -32,9 +30,6 @@ import org.springframework.guice.AbstractCompleteWiringTests;
*/
public class SpringModuleWiringTests extends AbstractCompleteWiringTests {
@Rule
public ExpectedException expected = ExpectedException.none();
@Override
protected Injector createInjector() {
return Guice.createInjector(new SpringModule(new AnnotationConfigApplicationContext(TestConfig.class)));

4
src/test/java/org/springframework/guice/module/SpringModuleWrappedTests.java
View File

@@ -22,13 +22,13 @@ import javax.inject.Named;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.guice.annotation.EnableGuiceModules;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SpringModuleWrappedTests {