Upgrade to JUnit 5

pom.xml

@@ -40,9 +40,21 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.8.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.8.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-suite-engine</artifactId>
+			<version>1.8.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -83,7 +95,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.9</version>
+				<version>2.22.2</version>
 				<configuration>
 					<!--forkMode>pertest</forkMode -->
 					<includes>

src/test/java/org/springframework/guice/AbstractCompleteWiringTests.java

@@ -23,17 +23,17 @@ import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public abstract class AbstractCompleteWiringTests {
 
 	private Injector injector;
 
-	@Before
+	@BeforeEach
 	public void init() {
 		this.injector = createInjector();
 	}

src/test/java/org/springframework/guice/AdhocTestSuite.java

@@ -16,10 +16,9 @@
 
 package org.springframework.guice;
 
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.jupiter.api.Disabled;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 import org.springframework.guice.annotation.EnableGuiceModulesTests;
 
@@ -28,9 +27,9 @@ import org.springframework.guice.annotation.EnableGuiceModulesTests;
  *
  * @author Dave Syer
  */
-@RunWith(Suite.class)
-@SuiteClasses({ BindingDeduplicationTests.class, EnableGuiceModulesTests.class })
-@Ignore
+@Suite
+@SelectClasses({ BindingDeduplicationTests.class, EnableGuiceModulesTests.class })
+@Disabled
 public class AdhocTestSuite {
 
 }

src/test/java/org/springframework/guice/BeanPostProcessorTests.java

@@ -20,7 +20,7 @@ import javax.inject.Inject;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BeanPostProcessorTests {
 

src/test/java/org/springframework/guice/BindingAnnotationTests.java

@@ -29,7 +29,7 @@ import com.google.inject.BindingAnnotation;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -37,8 +37,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BindingAnnotationTests {
 
@@ -87,8 +87,10 @@ public class BindingAnnotationTests {
 		assertNotNull(injector.getInstance(SomeNamedDepWithType1.class));
 		assertNotNull(injector.getInstance(SomeNamedDepWithType2.class));
 
-		assertNotNull(injector.getInstance(Key.get(SomeNamedDepWithType1.class, Names.named("sameNameDifferentType"))));
-		assertNotNull(injector.getInstance(Key.get(SomeNamedDepWithType2.class, Names.named("sameNameDifferentType"))));
+		assertNotNull(
+				injector.getInstance(Key.get(SomeNamedDepWithType1.class, Names.named("sameNameDifferentType"))));
+		assertNotNull(
+				injector.getInstance(Key.get(SomeNamedDepWithType2.class, Names.named("sameNameDifferentType"))));
 		context.close();
 	}
 

src/test/java/org/springframework/guice/BindingDeduplicationTests.java

@@ -20,19 +20,20 @@ import com.google.inject.AbstractModule;
 import com.google.inject.CreationException;
 import com.google.inject.Module;
 import com.google.inject.multibindings.OptionalBinder;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 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;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class BindingDeduplicationTests {
 
-	@AfterClass
+	@AfterAll
 	public static void cleanUp() {
 		System.clearProperty("spring.guice.dedup");
 	}
@@ -49,12 +50,14 @@ public class BindingDeduplicationTests {
 		context.close();
 	}
 
-	@Test(expected = CreationException.class)
+	@Test
 	public void verifyDuplicateBindingErrorWhenDedupeNotEnabled() {
 		System.setProperty("spring.guice.dedup", "false");
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				BindingDeduplicationTestsConfig.class);
-		context.close();
+		assertThrows(CreationException.class, () -> {
+			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+					BindingDeduplicationTestsConfig.class);
+			context.close();
+		});
 	}
 
 	public static class SomeDependency {

src/test/java/org/springframework/guice/DuplicateNamesDifferentTypesTests.java

@@ -21,7 +21,7 @@ import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.name.Named;
 import com.google.inject.name.Names;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
@@ -31,7 +31,7 @@ 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 DuplicateNamesDifferentTypesTests {
 

src/test/java/org/springframework/guice/ElementVisitorTests.java

@@ -27,9 +27,9 @@ import com.google.inject.Module;
 import com.google.inject.Stage;
 import com.google.inject.spi.Element;
 import com.google.inject.spi.Elements;
-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;
@@ -37,19 +37,19 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 import org.springframework.guice.annotation.InjectorFactory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ElementVisitorTests {
 
 	private static AnnotationConfigApplicationContext context;
 
-	@BeforeClass
+	@BeforeAll
 	public static void init() {
 		System.setProperty("spring.guice.dedup", "true");
 		context = new AnnotationConfigApplicationContext(ElementVisitorTestConfig.class);
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void cleanup() {
 		System.clearProperty("spring.guice.dedup");
 		if (context != null) {

src/test/java/org/springframework/guice/InjectorFactoryTests.java

@@ -17,8 +17,8 @@
 package org.springframework.guice;
 
 import com.google.inject.Guice;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import org.springframework.context.ApplicationContextException;
@@ -28,11 +28,13 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 import org.springframework.guice.annotation.InjectorFactory;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class InjectorFactoryTests {
 
 	private static final InjectorFactory injectorFactory = Mockito.mock(InjectorFactory.class);
 
-	@Before
+	@BeforeEach
 	public void init() {
 		Mockito.when(injectorFactory.createInjector(Mockito.anyList())).thenReturn(Guice.createInjector());
 	}
@@ -45,11 +47,13 @@ public class InjectorFactoryTests {
 		context.close();
 	}
 
-	@Test(expected = ApplicationContextException.class)
+	@Test
 	public void testMultipleInjectorFactoriesThrowsApplicationContextException() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(InjectorFactoryConfig.class,
-				SecondInjectorFactoryConfig.class, ModulesConfig.class);
-		context.close();
+		assertThrows(ApplicationContextException.class, () -> {
+			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+					InjectorFactoryConfig.class, SecondInjectorFactoryConfig.class, ModulesConfig.class);
+			context.close();
+		});
 	}
 
 	@Configuration

src/test/java/org/springframework/guice/JustInTimeBindingTests.java

@@ -18,8 +18,8 @@ package org.springframework.guice;
 
 import javax.inject.Inject;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -27,11 +27,12 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 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;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class JustInTimeBindingTests {
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		System.clearProperty("spring.guice.autowireJIT");
 	}
@@ -42,10 +43,10 @@ public class JustInTimeBindingTests {
 		assertNotNull(springGetFoo());
 	}
 
-	@Test(expected = UnsatisfiedDependencyException.class)
+	@Test
 	public void springWithoutJustInTimeBinding() {
 		System.setProperty("spring.guice.autowireJIT", "false");
-		springGetFoo();
+		assertThrows(UnsatisfiedDependencyException.class, this::springGetFoo);
 	}
 
 	@SuppressWarnings("resource")

src/test/java/org/springframework/guice/LazyInitializationTests.java

@@ -17,7 +17,7 @@
 package org.springframework.guice;
 
 import com.google.inject.AbstractModule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -26,8 +26,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.guice.annotation.EnableGuiceModules;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class LazyInitializationTests {
 

src/test/java/org/springframework/guice/MapWiringTests.java

@@ -19,14 +19,14 @@ package org.springframework.guice;
 import java.util.Map;
 
 import com.google.inject.AbstractModule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Test injecting Map
@@ -60,7 +60,7 @@ public class MapWiringTests {
 
 		@Bean
 		Bar foo(Map<String, Foo> foos) {
-			assertTrue(!foos.isEmpty());
+			assertFalse(foos.isEmpty());
 			return new Bar();
 		}
 

src/test/java/org/springframework/guice/ModuleFilteringTests.java

@@ -20,8 +20,8 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Module;
 import com.google.inject.Stage;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -30,35 +30,34 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 import org.springframework.guice.annotation.InjectorFactory;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ModuleFilteringTests {
 
-	@AfterClass
+	@AfterAll
 	public static void cleanUp() {
 		System.clearProperty("spring.guice.modules.exclude");
 	}
 
-	@Test(expected = RuntimeException.class)
+	@Test
 	public void verifyAllIsWellWhenNoModulesFiltered() {
 		System.setProperty("spring.guice.modules.exclude", "FilterSomeNonExistentModule");
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				ModuleFilteringTestsConfig.class);
-		SomeInterface someDependency = context.getBean(SomeInterface.class);
-		assertNotNull(someDependency);
-		context.close();
+		assertThrows(RuntimeException.class, () -> {
+			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+					ModuleFilteringTestsConfig.class);
+			SomeInterface someDependency = context.getBean(SomeInterface.class);
+			assertNotNull(someDependency);
+			context.close();
+		});
 	}
 
-	@Test(expected = NoSuchBeanDefinitionException.class)
+	@Test
 	public void verifyFilteredModuleIsFiltered() {
 		System.setProperty("spring.guice.modules.exclude", "FilterThisModule");
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				ModuleFilteringTestsConfig.class);
-		try {
-			context.getBean(SomeInterface.class);
-		}
-		finally {
-			context.close();
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				ModuleFilteringTestsConfig.class)) {
+			assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(SomeInterface.class));
 		}
 	}
 

src/test/java/org/springframework/guice/NativeGuiceTests.java

@@ -22,9 +22,9 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.name.Names;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Dave Syer

src/test/java/org/springframework/guice/PrivateModuleTests.java

@@ -23,9 +23,9 @@ import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.PrivateModule;
 import com.google.inject.name.Names;
-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.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
@@ -34,19 +34,20 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class PrivateModuleTests {
 
 	private static AnnotationConfigApplicationContext context;
 
-	@BeforeClass
+	@BeforeAll
 	public static void init() {
 		context = new AnnotationConfigApplicationContext(PrivateModuleTestConfig.class);
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void cleanup() {
 		if (context != null) {
 			context.close();
@@ -71,20 +72,22 @@ public class PrivateModuleTests {
 		assertEquals("foo", beanDependingOnPrivateBinding);
 	}
 
-	@Test(expected = ConfigurationException.class)
+	@Test
 	public void verifyPrivateModulesPrivateBindingsAreNotExposedViaInjector() {
 		Injector injector = context.getBean(Injector.class);
-		injector.getInstance(Key.get(SomeInterface.class, Names.named("notexposed")));
+		assertThrows(ConfigurationException.class,
+				() -> injector.getInstance(Key.get(SomeInterface.class, Names.named("notexposed"))));
 	}
 
-	@Test(expected = NoSuchBeanDefinitionException.class)
+	@Test
 	public void verifyPrivateModulesPrivateBindingsAreNotExposedViaSpring() {
-		context.getBean("notexposed", SomeInterface.class);
+		assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean("notexposed", SomeInterface.class));
 	}
 
-	@Test(expected = NoSuchBeanDefinitionException.class)
+	@Test
 	public void verifyPrivateModulesPrivateBindingsAreNotExposedViaSpringWithQualifier() {
-		BeanFactoryAnnotationUtils.qualifiedBeanOfType(context.getBeanFactory(), SomeInterface.class, "notexposed");
+		assertThrows(NoSuchBeanDefinitionException.class, () -> BeanFactoryAnnotationUtils
+				.qualifiedBeanOfType(context.getBeanFactory(), SomeInterface.class, "notexposed"));
 	}
 
 	public interface SomeInterface {

src/test/java/org/springframework/guice/PrototypeScopedBeanTests.java

@@ -21,7 +21,7 @@ import javax.inject.Inject;
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -29,8 +29,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.guice.annotation.EnableGuiceModules;
 
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class PrototypeScopedBeanTests {
 

src/test/java/org/springframework/guice/ProvidesSupplierWiringTests.java

@@ -24,8 +24,8 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Key;
 import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -55,7 +55,7 @@ public class ProvidesSupplierWiringTests {
 	// ToDo -- Today this direction doesn't work without further work. Ignore the test for
 	// now.
 	@SuppressWarnings("unused")
-	@Ignore
+	@Disabled
 	@Test
 	public void testProvidesSupplierSpring() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(FooBarSpring.class);

src/test/java/org/springframework/guice/ScopingTests.java

@@ -21,16 +21,16 @@ import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.Scope;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ScopingTests {
 
@@ -49,14 +49,14 @@ public class ScopingTests {
 
 		assertNotNull(someNoScopeDependency1);
 		assertNotNull(someNoScopeDependency2);
-		assertNotEquals(someNoScopeDependency1, someNoScopeDependency2);
+		Assertions.assertNotEquals(someNoScopeDependency1, someNoScopeDependency2);
 
 		SomeCustomScopeDependency someCustomScopeDependency1 = context.getBean(SomeCustomScopeDependency.class);
 		SomeCustomScopeDependency someCustomScopeDependency2 = context.getBean(SomeCustomScopeDependency.class);
 
 		assertNotNull(someCustomScopeDependency1);
 		assertNotNull(someCustomScopeDependency2);
-		assertNotEquals(someCustomScopeDependency1, someCustomScopeDependency2);
+		Assertions.assertNotEquals(someCustomScopeDependency1, someCustomScopeDependency2);
 		assertEquals(someCustomScopeDependency1.value, "custom");
 		assertEquals(someCustomScopeDependency2.value, "custom");
 

src/test/java/org/springframework/guice/SimpleWiringTests.java

@@ -21,7 +21,7 @@ import javax.inject.Inject;
 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.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 import org.springframework.guice.injector.SpringInjector;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class SimpleWiringTests {
 

src/test/java/org/springframework/guice/SpringAutowiredCollectionTests.java

@@ -20,7 +20,7 @@ import java.util.Map;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.annotation.EnableGuiceModules;
 import org.springframework.guice.injector.SpringInjector;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SpringAutowiredCollectionTests {
 

src/test/java/org/springframework/guice/SuperClassTests.java

@@ -20,7 +20,8 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -32,8 +33,7 @@ import org.springframework.core.ResolvableType;
 import org.springframework.guice.annotation.EnableGuiceModules;
 import org.springframework.stereotype.Component;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SuperClassTests {
 
@@ -104,47 +104,47 @@ public class SuperClassTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configClass);
 
 		String[] allParentBeanNames = context.getBeanNamesForType(IParentWithType.class);
-		assertEquals(2, allParentBeanNames.length);
+		Assertions.assertEquals(2, allParentBeanNames.length);
 
 		String[] stringParentBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IParentWithType.class, String.class));
-		assertEquals(1, stringParentBeanNames.length);
+		Assertions.assertEquals(1, stringParentBeanNames.length);
 		assertTrue(new TypeLiteral<IGrandChildWithType<String>>() {
 		}.getRawType().isInstance(context.getBean(stringParentBeanNames[0])));
 
 		String[] integerParentBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IParentWithType.class, Integer.class));
-		assertEquals(1, integerParentBeanNames.length);
+		Assertions.assertEquals(1, integerParentBeanNames.length);
 		assertTrue(new TypeLiteral<IGrandChildWithType<Integer>>() {
 		}.getRawType().isInstance(context.getBean(integerParentBeanNames[0])));
 
 		String[] allChildBeanNames = context.getBeanNamesForType(IChildWithType.class);
-		assertEquals(2, allChildBeanNames.length);
+		Assertions.assertEquals(2, allChildBeanNames.length);
 
 		String[] stringChildBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IChildWithType.class, String.class));
-		assertEquals(1, stringChildBeanNames.length);
+		Assertions.assertEquals(1, stringChildBeanNames.length);
 		assertTrue(new TypeLiteral<IChildWithType<String>>() {
 		}.getRawType().isInstance(context.getBean(stringChildBeanNames[0])));
 
 		String[] integerChildBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IChildWithType.class, Integer.class));
-		assertEquals(1, integerChildBeanNames.length);
+		Assertions.assertEquals(1, integerChildBeanNames.length);
 		assertTrue(new TypeLiteral<IChildWithType<Integer>>() {
 		}.getRawType().isInstance(context.getBean(integerChildBeanNames[0])));
 
 		String[] allGrandChildBeanNames = context.getBeanNamesForType(IGrandChildWithType.class);
-		assertEquals(2, allGrandChildBeanNames.length);
+		Assertions.assertEquals(2, allGrandChildBeanNames.length);
 
 		String[] stringGrandChildBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IGrandChildWithType.class, String.class));
-		assertEquals(1, stringGrandChildBeanNames.length);
+		Assertions.assertEquals(1, stringGrandChildBeanNames.length);
 		assertTrue(new TypeLiteral<IGrandChildWithType<String>>() {
 		}.getRawType().isInstance(context.getBean(stringGrandChildBeanNames[0])));
 
 		String[] integerGrandChildBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IGrandChildWithType.class, Integer.class));
-		assertEquals(1, integerGrandChildBeanNames.length);
+		Assertions.assertEquals(1, integerGrandChildBeanNames.length);
 		assertTrue(new TypeLiteral<IGrandChildWithType<Integer>>() {
 		}.getRawType().isInstance(context.getBean(integerGrandChildBeanNames[0])));
 
@@ -255,23 +255,23 @@ public class SuperClassTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configClass);
 		String[] stringBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IFooWithType.class, String.class));
-		assertEquals(1, stringBeanNames.length);
+		Assertions.assertEquals(1, stringBeanNames.length);
 		assertTrue(context.getBean(stringBeanNames[0]) instanceof StringFoo);
 		assertTrue(context.getBean(stringBeanNames[0]) instanceof SubStringFoo);
 
 		stringBeanNames = context.getBeanNamesForType(StringFoo.class);
-		assertEquals(1, stringBeanNames.length);
+		Assertions.assertEquals(1, stringBeanNames.length);
 		assertTrue(context.getBean(stringBeanNames[0]) instanceof StringFoo);
 		assertTrue(context.getBean(stringBeanNames[0]) instanceof SubStringFoo);
 
 		String[] integerBeanNames = context
 				.getBeanNamesForType(ResolvableType.forClassWithGenerics(IFooWithType.class, Integer.class));
-		assertEquals(1, integerBeanNames.length);
+		Assertions.assertEquals(1, integerBeanNames.length);
 		assertTrue(context.getBean(integerBeanNames[0]) instanceof IntegerFoo);
 		assertTrue(context.getBean(integerBeanNames[0]) instanceof SubIntegerFoo);
 
 		integerBeanNames = context.getBeanNamesForType(IntegerFoo.class);
-		assertEquals(1, integerBeanNames.length);
+		Assertions.assertEquals(1, integerBeanNames.length);
 		assertTrue(context.getBean(integerBeanNames[0]) instanceof IntegerFoo);
 		assertTrue(context.getBean(integerBeanNames[0]) instanceof SubIntegerFoo);
 	}

src/test/java/org/springframework/guice/annotation/EnableGuiceModulesTests.java

@@ -23,8 +23,8 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Dave Syer
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertNotNull;
  */
 public class EnableGuiceModulesTests {
 
-	@After
+	@AfterEach
 	public void cleanUp() {
 		System.clearProperty("spring.guice.dedup");
 	}

src/test/java/org/springframework/guice/annotation/GuiceModuleAnnotationGenericTypeTests.java

@@ -16,13 +16,13 @@
 
 package org.springframework.guice.annotation;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class GuiceModuleAnnotationGenericTypeTests {
 

src/test/java/org/springframework/guice/annotation/GuiceModuleAnnotationTests.java

@@ -22,9 +22,7 @@ import java.util.Map;
 import com.google.inject.ConfigurationException;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -34,8 +32,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.guice.module.SpringModule;
 
-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
@@ -43,9 +41,6 @@ import static org.junit.Assert.assertNull;
  */
 public class GuiceModuleAnnotationTests {
 
-	@Rule
-	public ExpectedException expected = ExpectedException.none();
-
 	@Test
 	public void includes() throws Exception {
 		Injector injector = createInjector(TestConfig.class, MetadataIncludesConfig.class);
@@ -67,20 +62,19 @@ public class GuiceModuleAnnotationTests {
 	@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, () -> injector.getInstance(Service.class));
 	}
 
-	@Test(expected = ConfigurationException.class)
+	@Test
 	public void excludesNames() throws Exception {
 		Injector injector = createInjector(TestConfig.class, MetadataExcludeNamesConfig.class);
-		injector.getBinding(Service.class);
+		assertThrows(ConfigurationException.class, () -> injector.getBinding(Service.class));
 	}
 
-	@Test(expected = ConfigurationException.class)
+	@Test
 	public void excludesPatterns() throws Exception {
 		Injector injector = createInjector(TestConfig.class, MetadataExcludePatternsConfig.class);
-		injector.getBinding(Service.class);
+		assertThrows(ConfigurationException.class, () -> injector.getBinding(Service.class));
 	}
 
 	@Test

src/test/java/org/springframework/guice/annotation/ModuleBeanWiringTests.java

@@ -23,7 +23,7 @@ import javax.inject.Singleton;
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.AbstractCompleteWiringTests;
 import org.springframework.guice.injector.SpringInjector;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Dave Syer

src/test/java/org/springframework/guice/annotation/ModuleNamedBeanWiringTests.java

@@ -23,7 +23,7 @@ import javax.inject.Singleton;
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.guice.AbstractCompleteWiringTests;
 import org.springframework.guice.injector.SpringInjector;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Dave Syer

src/test/java/org/springframework/guice/injector/SpringInjectorTests.java

@@ -18,10 +18,8 @@ package org.springframework.guice.injector;
 
 import com.google.inject.Key;
 import com.google.inject.name.Names;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
@@ -32,18 +30,16 @@ import org.springframework.guice.AbstractCompleteWiringTests.Baz;
 import org.springframework.guice.AbstractCompleteWiringTests.MyService;
 import org.springframework.guice.AbstractCompleteWiringTests.Service;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SpringInjectorTests {
 
-	@Rule
-	public ExpectedException expected = ExpectedException.none();
-
 	private SpringInjector injector = new SpringInjector(create());
 
 	private AnnotationConfigApplicationContext context;
 
-	@After
+	@AfterEach
 	public void close() {
 		if (this.context != null) {
 			this.context.close();
@@ -58,8 +54,7 @@ public class SpringInjectorTests {
 	@Test
 	public void multiple() {
 		this.injector = new SpringInjector(create(Additional.class));
-		this.expected.expect(NoUniqueBeanDefinitionException.class);
-		assertNotNull(this.injector.getInstance(Service.class));
+		assertThrows(NoUniqueBeanDefinitionException.class, () -> this.injector.getInstance(Service.class));
 	}
 
 	@Test

src/test/java/org/springframework/guice/module/DevelepmentStageInjectorTest.java

@@ -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");
 	}

src/test/java/org/springframework/guice/module/SpringModuleGuiceBindingAwareTests.java

@@ -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 {

src/test/java/org/springframework/guice/module/SpringModuleMetadataTests.java

@@ -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) {

src/test/java/org/springframework/guice/module/SpringModuleWiringTests.java

@@ -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)));

src/test/java/org/springframework/guice/module/SpringModuleWrappedTests.java

@@ -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 {