Use junit5 in indexer

Author: ahornace

opengrok-indexer/pom.xml

@@ -133,8 +133,8 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -149,12 +149,12 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
             <version>3.1.6</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
             <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
             <version>${jersey.version}</version>
             <scope>test</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

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

@@ -22,10 +22,10 @@
  */
 package org.opengrok.indexer.analysis;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-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;
 
 /**
  * Represents a container for tests of {@link AnalyzerGuruHelp}.
@@ -34,8 +34,8 @@ public class AnalyzerGuruHelpTest {
     @Test
     public void shouldCreateReadableUsage() {
         String usage = AnalyzerGuruHelp.getUsage();
-        assertFalse("usage is not empty", usage.isEmpty());
-        assertTrue("usage contains \"*.\"", usage.contains("*."));
-        assertTrue("usage contains \"#!\"", usage.contains("#!"));
+        assertFalse(usage.isEmpty(), "usage is not empty");
+        assertTrue(usage.contains("*."), "usage contains \"*.\"");
+        assertTrue(usage.contains("#!"), "usage contains \"#!\"");
     }
 }

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

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
@@ -35,7 +35,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opengrok.indexer.analysis.archive.ZipAnalyzer;
 import org.opengrok.indexer.analysis.c.CxxAnalyzerFactory;
 import org.opengrok.indexer.analysis.document.MandocAnalyzer;
@@ -49,13 +49,13 @@
 import org.opengrok.indexer.analysis.sh.ShAnalyzer;
 import org.opengrok.indexer.analysis.sh.ShAnalyzerFactory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests for the functionality provided by the AnalyzerGuru class.
@@ -98,7 +98,7 @@ public void testUTF8ByteOrderMarkPlusCopyrightSymbol() throws Exception {
                 '/', '/', ' ', (byte) 0xC2, (byte) 0xA9};
         ByteArrayInputStream in = new ByteArrayInputStream(doc);
         AbstractAnalyzer fa = AnalyzerGuru.getAnalyzer(in, "/dummy/file");
-        assertSame("despite BOM as precise match,", PlainAnalyzer.class, fa.getClass());
+        assertSame(PlainAnalyzer.class, fa.getClass(), "despite BOM as precise match,");
     }
 
     @Test
@@ -118,8 +118,7 @@ public void testUTF16BigByteOrderMarkPlusCopyrightSymbol() throws Exception {
                 0, '#', 0, ' ', (byte) 0xC2, (byte) 0xA9};
         ByteArrayInputStream in = new ByteArrayInputStream(doc);
         AbstractAnalyzer fa = AnalyzerGuru.getAnalyzer(in, "/dummy/file");
-        assertSame("despite BOM as precise match,", PlainAnalyzer.class,
-                fa.getClass());
+        assertSame(PlainAnalyzer.class, fa.getClass(), "despite BOM as precise match,");
     }
 
     @Test
@@ -128,7 +127,7 @@ public void testUTF16LittleByteOrderMarkPlusCopyrightSymbol() throws Exception {
                 '#', 0, ' ', 0, (byte) 0xA9, (byte) 0xC2};
         ByteArrayInputStream in = new ByteArrayInputStream(doc);
         AbstractAnalyzer fa = AnalyzerGuru.getAnalyzer(in, "/dummy/file");
-        assertSame("despite BOM as precise match,", PlainAnalyzer.class, fa.getClass());
+        assertSame(PlainAnalyzer.class, fa.getClass(), "despite BOM as precise match,");
     }
 
     @Test
@@ -254,49 +253,44 @@ public void getAnalyzerFactoryClass() {
     @Test
     public void shouldNotThrowGettingCsprojOpening() throws IOException {
         InputStream res = getClass().getClassLoader().getResourceAsStream("analysis/a.csproj");
-        assertNotNull("despite embedded a.csproj,", res);
-        assertSame("despite normal a.csproj,", XMLAnalyzer.class,
-                AnalyzerGuru.getAnalyzer(res, "dummy").getClass());
+        assertNotNull(res, "despite embedded a.csproj,");
+        assertSame(XMLAnalyzer.class, AnalyzerGuru.getAnalyzer(res, "dummy").getClass(), "despite normal a.csproj,");
     }
 
     @Test
     public void shouldMatchPerlHashbang() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "#!/usr/bin/perl -w".getBytes(StandardCharsets.US_ASCII));
-        assertSame("despite Perl hashbang,", PerlAnalyzer.class,
-                AnalyzerGuru.getAnalyzer(in, "dummy").getClass());
+        assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite Perl hashbang,");
     }
 
     @Test
     public void shouldMatchPerlHashbangSpaced() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "\n\t #!  /usr/bin/perl -w".getBytes(StandardCharsets.US_ASCII));
-        assertSame("despite Perl hashbang,", PerlAnalyzer.class,
-                AnalyzerGuru.getAnalyzer(in, "dummy").getClass());
+        assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite Perl hashbang,");
     }
 
     @Test
     public void shouldMatchEnvPerlHashbang() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "#!/usr/bin/env perl -w".getBytes(StandardCharsets.US_ASCII));
-        assertSame("despite env hashbang with perl,", PerlAnalyzer.class,
-                AnalyzerGuru.getAnalyzer(in, "dummy").getClass());
+        assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite env hashbang with perl,");
     }
 
     @Test
     public void shouldMatchEnvPerlHashbangSpaced() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "\n\t #!  /usr/bin/env\t perl -w".getBytes(StandardCharsets.US_ASCII));
-        assertSame("despite env hashbang with perl,", PerlAnalyzer.class,
-                AnalyzerGuru.getAnalyzer(in, "dummy").getClass());
+        assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(),
+                "despite env hashbang with perl,");
     }
 
     @Test
     public void shouldNotMatchEnvLFPerlHashbang() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "#!/usr/bin/env\nperl".getBytes(StandardCharsets.US_ASCII));
-        assertNotSame("despite env hashbang LF,", PerlAnalyzer.class,
-                AnalyzerGuru.getAnalyzer(in, "dummy").getClass());
+        assertNotSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite env hashbang LF,");
     }
 
     @Test
@@ -305,37 +299,37 @@ public void shouldMatchELFMagic() throws Exception {
                 (byte) 0x06};
         ByteArrayInputStream in = new ByteArrayInputStream(elfmt);
         AbstractAnalyzer fa = AnalyzerGuru.getAnalyzer(in, "/dummy/file");
-        assertSame("despite \\177ELF magic,", ELFAnalyzer.class, fa.getClass());
+        assertSame(ELFAnalyzer.class, fa.getClass(), "despite \\177ELF magic,");
     }
 
     @Test
     public void shouldMatchJavaClassMagic() throws Exception {
         String oldMagic = "\312\376\272\276";      // cafebabe?
         String newMagic = new String(new byte[] {(byte) 0xCA, (byte) 0xFE,
                 (byte) 0xBA, (byte) 0xBE}, StandardCharsets.UTF_8);
-        assertNotEquals("despite octal string, escape it as unicode,", oldMagic, newMagic);
+        assertNotEquals(oldMagic, newMagic, "despite octal string, escape it as unicode,");
 
         // 0xCAFEBABE (4), minor (2), major (2)
         byte[] dotclass = {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE,
                 (byte) 0, (byte) 1, (byte) 0, (byte) 0x34};
         ByteArrayInputStream in = new ByteArrayInputStream(dotclass);
         AbstractAnalyzer fa = AnalyzerGuru.getAnalyzer(in, "/dummy/file");
-        assertSame("despite 0xCAFEBABE magic,", JavaClassAnalyzer.class, fa.getClass());
+        assertSame(JavaClassAnalyzer.class, fa.getClass(), "despite 0xCAFEBABE magic,");
     }
 
     @Test
     public void shouldMatchTroffMagic() throws Exception {
         byte[] mandoc = {' ', '\n', '.', '\"', '\n', '.', 'T', 'H', (byte) 0x20, '\n'};
         ByteArrayInputStream in = new ByteArrayInputStream(mandoc);
         AbstractAnalyzer fa = AnalyzerGuru.getAnalyzer(in, "/dummy/file");
-        assertSame("despite .TH magic,", TroffAnalyzer.class, fa.getClass());
+        assertSame(TroffAnalyzer.class, fa.getClass(), "despite .TH magic,");
     }
 
     @Test
     public void shouldMatchMandocMagic() throws Exception {
         byte[] mandoc = {'\n', ' ', '.', '\"', '\n', '.', 'D', 'd', (byte) 0x20, '\n'};
         ByteArrayInputStream in = new ByteArrayInputStream(mandoc);
         AbstractAnalyzer fa = AnalyzerGuru.getAnalyzer(in, "/dummy/file");
-        assertSame("despite .Dd magic,", MandocAnalyzer.class, fa.getClass());
+        assertSame(MandocAnalyzer.class, fa.getClass(), "despite .Dd magic,");
     }
 }

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

@@ -18,13 +18,14 @@
  */
 
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
 
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *

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

@@ -18,19 +18,21 @@
  */
 
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
 
 import java.io.File;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-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.opengrok.indexer.util.TestRepository;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  *
  * @author Lubos Kosco
@@ -40,7 +42,7 @@ public class CtagsTest {
     private static Ctags ctags;
     private static TestRepository repository;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
@@ -59,7 +61,7 @@ public static void setUpClass() throws Exception {
         ctags.setCTagsExtraOptionsFile(extraOptionsFile);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         ctags.close();
         ctags = null;
@@ -83,8 +85,8 @@ private static Definitions getDefs(String fileName) throws Exception {
      */
     @Test
     public void testDoCtags() throws Exception {
-     Definitions result = getDefs("bug16070/arguments.c");
-     assertEquals(13, result.numberOfSymbols());     
+        Definitions result = getDefs("bug16070/arguments.c");
+        assertEquals(13, result.numberOfSymbols());
     }
 
     /**
@@ -102,13 +104,13 @@ public void bug14924() throws Exception {
         int count = 0;
         for (Definitions.Tag tag : result.getTags()) {
             if (tag.type.startsWith("method")) {
-                assertTrue("too many methods", count < names.length);
-                assertEquals("method name", names[count], tag.symbol);
-                assertEquals("method line", lines[count], tag.line);
+                assertTrue(count < names.length, "too many methods");
+                assertEquals(names[count], tag.symbol, "method name");
+                assertEquals(lines[count], tag.line, "method line");
                 count++;
             }
         }
-        assertEquals("method count", names.length, count);
+        assertEquals(names.length, count, "method count");
     }
 
     /**
@@ -127,12 +129,12 @@ public void bug19195() throws Exception {
         int count = 0;
         for (Definitions.Tag tag : result.getTags()) {
             if (tag.type.startsWith("function")) {
-                assertTrue("too many functions", count < names.length);
-                assertEquals("function name", names[count], tag.symbol);
-                assertEquals("function line", lines[count], tag.line);
+                assertTrue(count < names.length, "too many functions");
+                assertEquals(names[count], tag.symbol, "function name");
+                assertEquals(lines[count], tag.line, "function line");
                 count++;
             }
         }
-        assertEquals("function count", names.length, count);
+        assertEquals(names.length, count, "function count");
     }       
 }

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

@@ -23,14 +23,14 @@
  */
 package org.opengrok.indexer.analysis;
 
-import java.util.Set;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author austvik

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

@@ -23,14 +23,16 @@
  */
 package org.opengrok.indexer.analysis;
 
+import org.junit.jupiter.api.Test;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Unit tests for the ExpandTabsReader class.