build: junit 5

- migrate tests to use junit 5 platform

handlebars-caffeine/pom.xml

@@ -50,8 +50,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
 

handlebars-caffeine/src/test/java/com/github/jknack/handlebars/cache/CaffeineTemplateCacheTest.java

@@ -5,8 +5,8 @@
  */
 package com.github.jknack.handlebars.cache;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -15,7 +15,7 @@
 import java.io.IOException;
 import java.util.function.Function;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 import com.github.benmanes.caffeine.cache.Cache;

handlebars-guava-cache/pom.xml

@@ -51,8 +51,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
 

handlebars-guava-cache/src/test/java/com/github/jknack/handlebars/cache/GuavaTemplateCacheTest.java

@@ -5,7 +5,7 @@
  */
 package com.github.jknack.handlebars.cache;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.same;
@@ -17,7 +17,8 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import com.github.jknack.handlebars.HandlebarsException;
 import com.github.jknack.handlebars.Parser;
@@ -108,50 +109,63 @@ public void clear() throws IOException {
   }
 
   @SuppressWarnings("unchecked")
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void executionExceptionWithRuntimeException() throws IOException, ExecutionException {
-    TemplateSource source = mock(TemplateSource.class);
+    Assertions.assertThrows(
+        IllegalStateException.class,
+        () -> {
+          TemplateSource source = mock(TemplateSource.class);
 
-    Parser parser = mock(Parser.class);
+          Parser parser = mock(Parser.class);
 
-    Cache<TemplateSource, Template> cache = mock(Cache.class);
-    when(cache.get(eq(source), any(Callable.class)))
-        .thenThrow(new ExecutionException(new IllegalStateException()));
+          Cache<TemplateSource, Template> cache = mock(Cache.class);
+          when(cache.get(eq(source), any(Callable.class)))
+              .thenThrow(new ExecutionException(new IllegalStateException()));
 
-    new GuavaTemplateCache(cache).get(source, parser);
+          new GuavaTemplateCache(cache).get(source, parser);
 
-    verify(cache).get(eq(source), any(Callable.class));
+          verify(cache).get(eq(source), any(Callable.class));
+        });
   }
 
   @SuppressWarnings("unchecked")
-  @Test(expected = Error.class)
+  @Test
   public void executionExceptionWithError() throws IOException, ExecutionException {
-    TemplateSource source = mock(TemplateSource.class);
+    Assertions.assertThrows(
+        Error.class,
+        () -> {
+          TemplateSource source = mock(TemplateSource.class);
 
-    Parser parser = mock(Parser.class);
+          Parser parser = mock(Parser.class);
 
-    Cache<TemplateSource, Template> cache = mock(Cache.class);
-    when(cache.get(eq(source), any(Callable.class))).thenThrow(new ExecutionException(new Error()));
+          Cache<TemplateSource, Template> cache = mock(Cache.class);
+          when(cache.get(eq(source), any(Callable.class)))
+              .thenThrow(new ExecutionException(new Error()));
 
-    new GuavaTemplateCache(cache).get(source, parser);
+          new GuavaTemplateCache(cache).get(source, parser);
 
-    verify(cache).get(eq(source), any(Callable.class));
+          verify(cache).get(eq(source), any(Callable.class));
+        });
   }
 
   @SuppressWarnings("unchecked")
-  @Test(expected = HandlebarsException.class)
+  @Test
   public void executionExceptionWithCheckedException() throws IOException, ExecutionException {
-    TemplateSource source = mock(TemplateSource.class);
+    Assertions.assertThrows(
+        HandlebarsException.class,
+        () -> {
+          TemplateSource source = mock(TemplateSource.class);
 
-    Parser parser = mock(Parser.class);
+          Parser parser = mock(Parser.class);
 
-    Cache<TemplateSource, Template> cache = mock(Cache.class);
-    when(cache.get(eq(source), any(Callable.class)))
-        .thenThrow(new ExecutionException(new IOException()));
+          Cache<TemplateSource, Template> cache = mock(Cache.class);
+          when(cache.get(eq(source), any(Callable.class)))
+              .thenThrow(new ExecutionException(new IOException()));
 
-    new GuavaTemplateCache(cache).get(source, parser);
+          new GuavaTemplateCache(cache).get(source, parser);
 
-    verify(cache).get(eq(source), any(Callable.class));
+          verify(cache).get(eq(source), any(Callable.class));
+        });
   }
 
   private TemplateSource source(final String filename) throws IOException {

handlebars-guava-cache/src/test/java/com/github/jknack/handlebars/i371/Issue371.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.jknack.handlebars.AbstractTest;
 import com.google.common.collect.ImmutableList;

handlebars-guava-cache/src/test/java/com/github/jknack/handlebars/io/GuavaCachedTemplateLoaderTest.java

@@ -6,12 +6,12 @@
 package com.github.jknack.handlebars.io;
 
 import static java.lang.System.out;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Stopwatch;
 

handlebars-helpers/pom.xml

@@ -57,8 +57,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
 

handlebars-helpers/src/test/java/com/github/jknack/handlebars/helper/AssignHelperTest.java

@@ -5,11 +5,11 @@
  */
 package com.github.jknack.handlebars.helper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.jknack.handlebars.AbstractTest;
 import com.github.jknack.handlebars.Context;

handlebars-helpers/src/test/java/com/github/jknack/handlebars/helper/IncludeTest.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.jknack.handlebars.AbstractTest;
 import com.github.jknack.handlebars.Handlebars;

handlebars-helpers/src/test/java/com/github/jknack/handlebars/helper/JodaHelperTest.java

@@ -5,12 +5,14 @@
  */
 package com.github.jknack.handlebars.helper;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.IOException;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.jknack.handlebars.AbstractTest;
 import com.github.jknack.handlebars.Handlebars;
@@ -44,10 +46,10 @@ public void testBadPattern() throws IOException {
     DateTime dateTime = new DateTime().withDate(1995, 7, 4).withTime(14, 32, 12, 0);
     try {
       shouldCompileTo("{{jodaPatternHelper this \"qwerty\"}}", dateTime, "1995-Jul-4 14:32:12");
-      Assert.fail("Exception should have thrown!");
+      fail("Exception should have thrown!");
     } catch (HandlebarsException e) {
       Throwable t = e.getCause();
-      Assert.assertEquals("Illegal pattern component: q", t.getMessage());
+      assertEquals("Illegal pattern component: q", t.getMessage());
     }
   }
 
@@ -69,7 +71,7 @@ public void testBadStyle() throws IOException {
       shouldCompileTo("{{jodaStyleHelper this \"QS\"}}", dateTime, "");
     } catch (HandlebarsException e) {
       Throwable t = e.getCause();
-      Assert.assertEquals("Invalid style character: Q", t.getMessage());
+      assertEquals("Invalid style character: Q", t.getMessage());
     }
   }
 

handlebars-helpers/src/test/java/com/github/jknack/handlebars/helper/NumberHelperTest.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.jknack.handlebars.AbstractTest;
 import com.github.jknack.handlebars.Handlebars;

handlebars-jackson2/pom.xml

@@ -49,8 +49,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -59,6 +59,13 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

handlebars-jackson2/src/test/java/com/github/jknack/handlebars/Issue260.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

handlebars-jackson2/src/test/java/com/github/jknack/handlebars/Issue412.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

handlebars-jackson2/src/test/java/com/github/jknack/handlebars/Issue598.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

handlebars-jackson2/src/test/java/com/github/jknack/handlebars/Jackson2HelperTest.java

@@ -12,7 +12,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -107,20 +108,24 @@ public void toJSONAliasViewExclusive() throws IOException {
         equalsToStringIgnoringWindowsNewLine("{\"title\":\"First Post\"}"));
   }
 
-  @Test(expected = HandlebarsException.class)
+  @Test
   public void jsonViewNotFound() throws IOException {
-    Handlebars handlebars = new Handlebars();
+    Assertions.assertThrows(
+        HandlebarsException.class,
+        () -> {
+          Handlebars handlebars = new Handlebars();
 
-    ObjectMapper mapper = new ObjectMapper();
-    mapper.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false);
+          ObjectMapper mapper = new ObjectMapper();
+          mapper.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false);
 
-    handlebars.registerHelper("@json", new Jackson2Helper(mapper));
+          handlebars.registerHelper("@json", new Jackson2Helper(mapper));
 
-    Template template = handlebars.compileInline("{{@json this view=\"missing.ViewClass\"}}");
+          Template template = handlebars.compileInline("{{@json this view=\"missing.ViewClass\"}}");
 
-    assertThat(
-        template.apply(new Blog("First Post", "...")),
-        equalsToStringIgnoringWindowsNewLine("{\"title\":\"First Post\"}"));
+          assertThat(
+              template.apply(new Blog("First Post", "...")),
+              equalsToStringIgnoringWindowsNewLine("{\"title\":\"First Post\"}"));
+        });
   }
 
   @Test

handlebars-jackson2/src/test/java/com/github/jknack/handlebars/JsonNodeValueResolverTest.java

@@ -5,8 +5,8 @@
  */
 package com.github.jknack.handlebars;
 
-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.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -20,7 +20,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

handlebars-jackson2/src/test/java/com/github/jknack/handlebars/i280/Issue280.java

@@ -5,7 +5,7 @@
  */
 package com.github.jknack.handlebars.i280;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

handlebars-jackson2/src/test/java/com/github/jknack/handlebars/i368/Issue368.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;