Bump tests to use junit5

Author: rbygrave

inject-generator/pom.xml

@@ -4,21 +4,21 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-generator</artifactId>
-  <version>0.10-SNAPSHOT</version>
+  <version>1.0-SNAPSHOT</version>
 
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
   </parent>
 
   <scm>
-    <developerConnection>scm:git:[email protected]:dinject/dinject.git</developerConnection>
+    <developerConnection>scm:git:[email protected]:avaje/avaje-inject.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
 
   <properties>
-    <inject.version>0.10-SNAPSHOT</inject.version>
+    <inject.version>1.0-SNAPSHOT</inject.version>
   </properties>
 
   <dependencies>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1</version>
+      <version>5.0</version>
       <scope>test</scope>
     </dependency>
 

inject-generator/src/test/java/io/avaje/inject/generator/GenericTypeTest.java

@@ -1,12 +1,12 @@
 package io.avaje.inject.generator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 
 import static org.assertj.core.api.Assertions.assertThat;
-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 GenericTypeTest {
 

inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java

@@ -3,14 +3,14 @@
 import io.avaje.inject.Factory;
 import io.avaje.inject.Primary;
 import io.avaje.inject.Secondary;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
 
 import static io.avaje.inject.generator.IncludeAnnotations.include;
-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 IncludeAnnotationsTest {
 

inject-generator/src/test/java/io/avaje/inject/generator/UtilTest.java

@@ -1,9 +1,9 @@
 package io.avaje.inject.generator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class UtilTest {
 
@@ -18,7 +18,6 @@ public void commonParent() {
 
     assertEquals(Util.commonParent("org.foo.web", "org.foo.service"), "org.foo");
     assertEquals(Util.commonParent("org.foo.web.foo", "org.foo.service.blah"), "org.foo");
-
   }
 
   @Test

inject-test/pom.xml

@@ -4,16 +4,16 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-test</artifactId>
-  <version>0.1</version>
+  <version>1.0</version>
 
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
   </parent>
 
   <properties>
-    <inject.version>0.10-SNAPSHOT</inject.version>
+    <inject.version>1.0-SNAPSHOT</inject.version>
   </properties>
 
   <dependencies>
@@ -52,14 +52,6 @@
       <version>2.0.1</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.23.4</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
@@ -77,7 +69,7 @@
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1</version>
+      <version>5.0</version>
       <scope>test</scope>
     </dependency>
 

inject-test/src/test/java/io/avaje/inject/BeanContextBuilderTest.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.core.BeanContextFactory;
 import io.avaje.inject.core.Builder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;

inject-test/src/test/java/io/avaje/inject/SystemContextTest.java

@@ -3,7 +3,7 @@
 import org.example.coffee.list.ASomei;
 import org.example.coffee.list.BSomei;
 import org.example.coffee.list.Somei;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.annotation.Priority;
 import java.util.List;

inject-test/src/test/java/io/avaje/inject/core/DContextEntryTest.java

@@ -1,9 +1,10 @@
 package io.avaje.inject.core;
 
 import io.avaje.inject.BeanEntry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class DContextEntryTest {
 
@@ -19,15 +20,16 @@ public void get_when_onePrimary() {
     assertEquals(bean, "P");
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void get_when_twoPrimary() {
-
-    DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("P", null, BeanEntry.PRIMARY));
-    entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
-    entry.add(DContextEntryBean.of("S", null, BeanEntry.PRIMARY));
-
-    entry.get(null);
+    assertThrows(IllegalStateException.class, ()-> {
+      DContextEntry entry = new DContextEntry();
+      entry.add(DContextEntryBean.of("P", null, BeanEntry.PRIMARY));
+      entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
+      entry.add(DContextEntryBean.of("S", null, BeanEntry.PRIMARY));
+
+      entry.get(null);
+    });
   }
 
   @Test
@@ -54,14 +56,15 @@ public void get_when_oneNormal2() {
     assertEquals(bean, "N");
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void get_when_multiSecondaryOnly() {
+    assertThrows(IllegalStateException.class, ()-> {
+      DContextEntry entry = new DContextEntry();
+      entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
+      entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
 
-    DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
-    entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
-
-    entry.get(null);
+      entry.get(null);
+    });
   }
 
 

inject-test/src/test/java/org/example/coffee/BeanContextBuilderAddTest.java

@@ -2,29 +2,31 @@
 
 import io.avaje.inject.BeanContext;
 import io.avaje.inject.BeanContextBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.verify;
 
 public class BeanContextBuilderAddTest {
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void withModules_exludingThisOne() {
-
-    TDPump testDoublePump = new TDPump();
-
-    try (BeanContext context = new BeanContextBuilder()
-      .withBeans(testDoublePump)
-      // our module is "org.example.coffee"
-      // so this effectively includes no modules
-      .withModules("other")
-      .build()) {
-
-      CoffeeMaker coffeeMaker = context.getBean(CoffeeMaker.class);
-      assertThat(coffeeMaker).isNull();
-    }
+    assertThrows(IllegalStateException.class, ()-> {
+      TDPump testDoublePump = new TDPump();
+
+      try (BeanContext context = new BeanContextBuilder()
+        .withBeans(testDoublePump)
+        // our module is "org.example.coffee"
+        // so this effectively includes no modules
+        .withModules("other")
+        .build()) {
+
+        CoffeeMaker coffeeMaker = context.getBean(CoffeeMaker.class);
+        assertThat(coffeeMaker).isNull();
+      }
+    });
   }
 
 

inject-test/src/test/java/org/example/coffee/BeanContext_Builder_mockitoSpyTest.java

@@ -12,7 +12,7 @@
 import org.example.coffee.secondary.Widget;
 import org.example.coffee.secondary.WidgetSecondary;
 import org.example.coffee.secondary.WidgetUser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicReference;