Update junit to 5.7.0

Author: ahornace

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/LangMapTest.java

@@ -23,11 +23,10 @@
 package org.opengrok.indexer.analysis;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import java.util.List;
 import java.util.Map;
@@ -38,9 +37,6 @@
  */
 public class LangMapTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
     public void testEmptyMap() {
         LangMap map = new LangTreeMap();
@@ -168,43 +164,38 @@ public void testAddExtensionThenExclude() {
     public void testBadExtensionFileSpec() {
         LangMap map = new LangTreeMap();
 
-        thrown.expect(IllegalArgumentException.class);
-        map.add(".c.in", "foo");
+        assertThrows(IllegalArgumentException.class, () -> map.add(".c.in", "foo"));
     }
 
     @Test
     public void testImmutabilityOfUnmodifiable1() {
         LangMap map = new LangTreeMap();
         LangMap map2 = map.unmodifiable();
 
-        thrown.expect(UnsupportedOperationException.class);
-        map2.add(".FOO", "foo");
+        assertThrows(UnsupportedOperationException.class, () -> map2.add(".FOO", "foo"));
     }
 
     @Test
     public void testImmutabilityOfUnmodifiable2() {
         LangMap map = new LangTreeMap();
         LangMap map2 = map.unmodifiable();
 
-        thrown.expect(UnsupportedOperationException.class);
-        map2.exclude(".FOO");
+        assertThrows(UnsupportedOperationException.class, () -> map2.exclude(".FOO"));
     }
 
     @Test
     public void testImmutabilityOfAdditionsView() {
         LangMap map = new LangTreeMap();
         Map<String, String> additions = map.getAdditions();
 
-        thrown.expect(UnsupportedOperationException.class);
-        additions.clear();
+        assertThrows(UnsupportedOperationException.class, additions::clear);
     }
 
     @Test
     public void testImmutabilityOfExclusionsView() {
         LangMap map = new LangTreeMap();
         Set<String> exclusions = map.getExclusions();
 
-        thrown.expect(UnsupportedOperationException.class);
-        exclusions.clear();
+        assertThrows(UnsupportedOperationException.class, exclusions::clear);
     }
 }

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/clojure/ClojureAnalyzerFactoryTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.clojure;
@@ -42,7 +42,7 @@
 import java.io.InputStream;
 import java.io.StringWriter;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/pascal/PascalAnalyzerFactoryTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.pascal;
@@ -32,8 +32,9 @@
 import org.apache.lucene.document.Field;
 import static org.hamcrest.CoreMatchers.is;
 import org.junit.AfterClass;
+
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import org.junit.BeforeClass;
@@ -129,7 +130,6 @@ public void testAnalyzer() throws Exception {
         assertThat(type[0], is("function"));
         assertTrue(definitions.hasDefinitionAt("TSample.GetUser", 63, type));
         assertThat(type[0], is("function"));
-        
     }
 
 }

opengrok-indexer/src/test/java/org/opengrok/indexer/history/BitKeeperRepositoryTest.java

@@ -24,10 +24,10 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;

opengrok-indexer/src/test/java/org/opengrok/indexer/util/BooleanUtilTest.java

@@ -20,14 +20,10 @@
 package org.opengrok.indexer.util;
 
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class BooleanUtilTest {
 
-  @Rule public final ExpectedException thrown = ExpectedException.none();
-
   // Test written by Diffblue Cover.
   @Test
   public void isBooleanInputNotNullOutputFalse() {

opengrok-indexer/src/test/java/org/opengrok/indexer/web/UtilTest.java

@@ -43,11 +43,11 @@
 import org.junit.Test;
 import org.opengrok.indexer.util.PlatformUtils;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**

pom.xml

@@ -72,7 +72,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
         https://eclipse-ee4j.github.io/jersey.github.io/release-notes/2.30.1.html
         reads that Jersey 2.30.1 did "adopt Jackson 2.10.1." -->
         <jackson.version>2.10.1</jackson.version>
-        <junit.version>5.4.2</junit.version>
+        <junit.version>5.7.0</junit.version>
         <maven-surefire.version>2.22.2</maven-surefire.version>
         <apache-commons-lang3.version>3.9</apache-commons-lang3.version>
         <micrometer.version>1.5.4</micrometer.version>

suggester/src/test/java/org/opengrok/suggest/SuggesterUtilsTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.suggest;
 
@@ -34,11 +34,11 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 
 public class SuggesterUtilsTest {
 

suggester/src/test/java/org/opengrok/suggest/popular/impl/ChronicleMapAdapterTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.suggest.popular.impl;
 
@@ -35,9 +35,9 @@
 import java.util.List;
 import java.util.Map.Entry;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 public class ChronicleMapAdapterTest {
 

suggester/src/test/java/org/opengrok/suggest/query/customized/CustomSloppyPhraseScorerTest.java

@@ -47,8 +47,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.assertThat;
 
 public class CustomSloppyPhraseScorerTest {