Remove public scope identifier from junit classes and method (#4444)

---------

Signed-off-by: Gino Augustine <[email protected]>

Author: ginoaugustine

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

@@ -30,9 +30,9 @@
 /**
  * Represents a container for tests of {@link AnalyzerGuruHelp}.
  */
-public class AnalyzerGuruHelpTest {
+class AnalyzerGuruHelpTest {
     @Test
-    public void shouldCreateReadableUsage() {
+    void shouldCreateReadableUsage() {
         String usage = AnalyzerGuruHelp.getUsage();
         assertFalse(usage.isEmpty(), "usage is not empty");
         assertTrue(usage.contains("*."), "usage contains \"*.\"");

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

@@ -60,10 +60,10 @@
 /**
  * Tests for the functionality provided by the AnalyzerGuru class.
  */
-public class AnalyzerGuruTest {
+class AnalyzerGuruTest {
 
     @Test
-    public void testGetFileTypeDescriptions() {
+    void testGetFileTypeDescriptions() {
         Map<String, String> map = AnalyzerGuru.getfileTypeDescriptions();
         assertTrue(map.size() > 0);
     }
@@ -73,7 +73,7 @@ public void testGetFileTypeDescriptions() {
      * known extension.
      */
     @Test
-    public void testFileNameSameAsExtension() throws Exception {
+    void testFileNameSameAsExtension() throws Exception {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "#!/bin/sh\nexec /usr/bin/zip \"$@\"\n".getBytes(StandardCharsets.US_ASCII));
         String file = "/dummy/path/to/source/zip";
@@ -82,7 +82,7 @@ public void testFileNameSameAsExtension() throws Exception {
     }
 
     @Test
-    public void testUTF8ByteOrderMark() throws Exception {
+    void testUTF8ByteOrderMark() throws Exception {
         byte[] xml = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF, // UTF-8 BOM
                 '<', '?', 'x', 'm', 'l', ' ',
                 'v', 'e', 'r', 's', 'i', 'o', 'n', '=',
@@ -93,7 +93,7 @@ public void testUTF8ByteOrderMark() throws Exception {
     }
 
     @Test
-    public void testUTF8ByteOrderMarkPlusCopyrightSymbol() throws Exception {
+    void testUTF8ByteOrderMarkPlusCopyrightSymbol() throws Exception {
         byte[] doc = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF, // UTF-8 BOM
                 '/', '/', ' ', (byte) 0xC2, (byte) 0xA9};
         ByteArrayInputStream in = new ByteArrayInputStream(doc);
@@ -102,7 +102,7 @@ public void testUTF8ByteOrderMarkPlusCopyrightSymbol() throws Exception {
     }
 
     @Test
-    public void testUTF8ByteOrderMarkPlainFile() throws Exception {
+    void testUTF8ByteOrderMarkPlainFile() throws Exception {
         byte[] bytes = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF, // UTF-8 BOM
                 'h', 'e', 'l', 'l', 'o', ' ',
                 'w', 'o', 'r', 'l', 'd'};
@@ -113,7 +113,7 @@ public void testUTF8ByteOrderMarkPlainFile() throws Exception {
     }
 
     @Test
-    public void testUTF16BigByteOrderMarkPlusCopyrightSymbol() throws Exception {
+    void testUTF16BigByteOrderMarkPlusCopyrightSymbol() throws Exception {
         byte[] doc = {(byte) 0xFE, (byte) 0xFF, // UTF-16BE BOM
                 0, '#', 0, ' ', (byte) 0xC2, (byte) 0xA9};
         ByteArrayInputStream in = new ByteArrayInputStream(doc);
@@ -122,7 +122,7 @@ public void testUTF16BigByteOrderMarkPlusCopyrightSymbol() throws Exception {
     }
 
     @Test
-    public void testUTF16LittleByteOrderMarkPlusCopyrightSymbol() throws Exception {
+    void testUTF16LittleByteOrderMarkPlusCopyrightSymbol() throws Exception {
         byte[] doc = {(byte) 0xFF, (byte) 0xFE, // UTF-16BE BOM
                 '#', 0, ' ', 0, (byte) 0xA9, (byte) 0xC2};
         ByteArrayInputStream in = new ByteArrayInputStream(doc);
@@ -131,7 +131,7 @@ public void testUTF16LittleByteOrderMarkPlusCopyrightSymbol() throws Exception {
     }
 
     @Test
-    public void addExtension() throws Exception {
+    void addExtension() throws Exception {
         // should not find analyzer for this unlikely extension
         assertNull(AnalyzerGuru.find("file.unlikely_extension"));
 
@@ -150,7 +150,7 @@ public void addExtension() throws Exception {
     }
 
     @Test
-    public void addPrefix() throws Exception {
+    void addPrefix() throws Exception {
         // should not find analyzer for this unlikely extension
         assertNull(AnalyzerGuru.find("unlikely_prefix.foo"));
 
@@ -169,7 +169,7 @@ public void addPrefix() throws Exception {
     }
 
     @Test
-    public void testZip() throws IOException {
+    void testZip() throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ZipOutputStream zos = new ZipOutputStream(baos);
         zos.putNextEntry(new ZipEntry("dummy"));
@@ -181,7 +181,7 @@ public void testZip() throws IOException {
     }
 
     @Test
-    public void testJar() throws IOException {
+    void testJar() throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         JarOutputStream jos = new JarOutputStream(baos);
         jos.putNextEntry(new JarEntry("dummy"));
@@ -193,21 +193,21 @@ public void testJar() throws IOException {
     }
 
     @Test
-    public void testPlainText() throws IOException {
+    void testPlainText() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "This is a plain text file.".getBytes(StandardCharsets.US_ASCII));
         assertSame(PlainAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass());
     }
 
     @Test
-    public void rfe2969() {
+    void rfe2969() {
         AnalyzerFactory faf = AnalyzerGuru.find("foo.hxx");
         assertNotNull(faf);
         assertSame(CxxAnalyzerFactory.class, faf.getClass());
     }
 
     @Test
-    public void rfe3401() {
+    void rfe3401() {
         AnalyzerFactory f1 = AnalyzerGuru.find("main.c");
         assertNotNull(f1);
         AnalyzerFactory f2 = AnalyzerGuru.find("main.cc");
@@ -219,7 +219,7 @@ public void rfe3401() {
      * Test that matching of full names works. Bug #859.
      */
     @Test
-    public void matchesFullName() {
+    void matchesFullName() {
         String s = File.separator;  // so test works on Unix and Windows
         String path = s + "path" + s + "to" + s + "Makefile";
         AnalyzerFactory faf = AnalyzerGuru.find(path);
@@ -238,7 +238,7 @@ public void matchesFullName() {
      * language + "AnalyzerFactory"
      */
     @Test
-    public void getAnalyzerFactoryClass() {
+    void getAnalyzerFactoryClass() {
         Class<?> fcForSh = AnalyzerGuru.getFactoryClass("Sh");
         Class<?> fcForShAnalyzer = AnalyzerGuru.getFactoryClass("ShAnalyzer");
         Class<?> fcSimpleName = AnalyzerGuru.getFactoryClass("ShAnalyzerFactory");
@@ -251,50 +251,50 @@ public void getAnalyzerFactoryClass() {
     }
 
     @Test
-    public void shouldNotThrowGettingCsprojOpening() throws IOException {
+    void shouldNotThrowGettingCsprojOpening() throws IOException {
         InputStream res = getClass().getClassLoader().getResourceAsStream("analysis/a.csproj");
         assertNotNull(res, "despite embedded a.csproj,");
         assertSame(XMLAnalyzer.class, AnalyzerGuru.getAnalyzer(res, "dummy").getClass(), "despite normal a.csproj,");
     }
 
     @Test
-    public void shouldMatchPerlHashbang() throws IOException {
+    void shouldMatchPerlHashbang() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "#!/usr/bin/perl -w".getBytes(StandardCharsets.US_ASCII));
         assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite Perl hashbang,");
     }
 
     @Test
-    public void shouldMatchPerlHashbangSpaced() throws IOException {
+    void shouldMatchPerlHashbangSpaced() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "\n\t #!  /usr/bin/perl -w".getBytes(StandardCharsets.US_ASCII));
         assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite Perl hashbang,");
     }
 
     @Test
-    public void shouldMatchEnvPerlHashbang() throws IOException {
+    void shouldMatchEnvPerlHashbang() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "#!/usr/bin/env perl -w".getBytes(StandardCharsets.US_ASCII));
         assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite env hashbang with perl,");
     }
 
     @Test
-    public void shouldMatchEnvPerlHashbangSpaced() throws IOException {
+    void shouldMatchEnvPerlHashbangSpaced() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "\n\t #!  /usr/bin/env\t perl -w".getBytes(StandardCharsets.US_ASCII));
         assertSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(),
                 "despite env hashbang with perl,");
     }
 
     @Test
-    public void shouldNotMatchEnvLFPerlHashbang() throws IOException {
+    void shouldNotMatchEnvLFPerlHashbang() throws IOException {
         ByteArrayInputStream in = new ByteArrayInputStream(
                 "#!/usr/bin/env\nperl".getBytes(StandardCharsets.US_ASCII));
         assertNotSame(PerlAnalyzer.class, AnalyzerGuru.getAnalyzer(in, "dummy").getClass(), "despite env hashbang LF,");
     }
 
     @Test
-    public void shouldMatchELFMagic() throws Exception {
+    void shouldMatchELFMagic() throws Exception {
         byte[] elfmt = {(byte) 0x7F, 'E', 'L', 'F', (byte) 2, (byte) 2, (byte) 1,
                 (byte) 0x06};
         ByteArrayInputStream in = new ByteArrayInputStream(elfmt);
@@ -303,7 +303,7 @@ public void shouldMatchELFMagic() throws Exception {
     }
 
     @Test
-    public void shouldMatchJavaClassMagic() throws Exception {
+    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);
@@ -318,15 +318,15 @@ public void shouldMatchJavaClassMagic() throws Exception {
     }
 
     @Test
-    public void shouldMatchTroffMagic() throws Exception {
+    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(TroffAnalyzer.class, fa.getClass(), "despite .TH magic,");
     }
 
     @Test
-    public void shouldMatchMandocMagic() throws Exception {
+    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");

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

@@ -31,10 +31,10 @@
  *
  * @author Lubos Kosco
  */
-public class CtagsParserTest {
+class CtagsParserTest {
 
     @Test
-    public void ctagsVsUniversalCtags() throws Exception {
+    void ctagsVsUniversalCtags() throws Exception {
         String universal_ctags_c = "TEST\tsample.c\t/^#define TEST($/;\"\tmacro\tline:6\tsignature:(x)\n"
                 + "foo\tsample.c\t/^int foo(int a, int b) {$/;\"\tfunction\tline:8\ttyperef:typename:int\tsignature:(int a, int b)\n"
                 + "c\tsample.c\t/^    int c;$/;\"\tlocal\tline:13\tfunction:foo\ttyperef:typename:int\n"

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

@@ -43,13 +43,13 @@
  *
  * @author Lubos Kosco
  */
-public class CtagsTest {
+class CtagsTest {
 
     private static Ctags ctags;
     private static TestRepository repository;
 
     @BeforeAll
-    public static void setUpClass() throws Exception {
+    static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
@@ -66,7 +66,7 @@ public static void setUpClass() throws Exception {
     }
 
     @AfterAll
-    public static void tearDownClass() {
+    static void tearDownClass() {
         ctags.close();
         ctags = null;
         repository.destroy();

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

@@ -35,13 +35,13 @@
 /**
  * @author austvik
  */
-public class DefinitionsTest {
+class DefinitionsTest {
 
     /**
      * Test of getSymbols method, of class Definitions.
      */
     @Test
-    public void getSymbols() {
+    void getSymbols() {
         Definitions instance = new Definitions();
         Set<String> result = instance.getSymbols();
         assertNotNull(result);
@@ -56,7 +56,7 @@ public void getSymbols() {
      * Test of hasSymbol method, of class Definitions.
      */
     @Test
-    public void hasSymbol() {
+    void hasSymbol() {
         Definitions instance = new Definitions();
         instance.addTag(1, "found", "", "", 0, 0);
         assertFalse(instance.hasSymbol("notFound"));
@@ -67,7 +67,7 @@ public void hasSymbol() {
      * Test of hasDefinitionAt method, of class Definitions.
      */
     @Test
-    public void hasDefinitionAt() {
+    void hasDefinitionAt() {
         Definitions instance = new Definitions();
         String[] type = {""};
         instance.addTag(1, "found", "", "", 0, 0);
@@ -82,7 +82,7 @@ public void hasDefinitionAt() {
      * Test of occurrences method, of class Definitions.
      */
     @Test
-    public void occurrences() {
+    void occurrences() {
         Definitions instance = new Definitions();
         instance.addTag(1, "one", "", "", 0, 0);
         instance.addTag(1, "two", "", "", 0, 0);
@@ -96,7 +96,7 @@ public void occurrences() {
      * Test of numberOfSymbols method, of class Definitions.
      */
     @Test
-    public void numberOfSymbols() {
+    void numberOfSymbols() {
         Definitions instance = new Definitions();
         assertEquals(0, instance.numberOfSymbols());
         instance.addTag(1, "one", "", "", 0, 0);
@@ -110,7 +110,7 @@ public void numberOfSymbols() {
      * Test of getTags method, of class Definitions.
      */
     @Test
-    public void getTags() {
+    void getTags() {
         Definitions instance = new Definitions();
         assertEquals(0, instance.getTags().size());
         instance.addTag(1, "one", "", "", 0, 0);
@@ -125,7 +125,7 @@ public void getTags() {
      * Test of addTag method, of class Definitions.
      */
     @Test
-    public void addTag() {
+    void addTag() {
         Definitions instance = new Definitions();
         assertEquals(0, instance.getTags().size());
         instance.addTag(1, "one", "", "", 0, 0);
@@ -136,7 +136,7 @@ public void addTag() {
      * Test of serialize method, of class Definitions.
      */
     @Test
-    public void serialize() throws Exception {
+    void serialize() throws Exception {
         Definitions instance = new Definitions();
         instance.addTag(1, "one", "", "", 0, 0);
         byte[] serial = instance.serialize();

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

@@ -37,13 +37,13 @@
 /**
  * Unit tests for the ExpandTabsReader class.
  */
-public class ExpandTabsReaderTest {
+class ExpandTabsReaderTest {
 
     /**
      * Test that tabs are expanded to spaces.
      */
     @Test
-    public void testExpandTabs() throws IOException {
+    void testExpandTabs() throws IOException {
         // Create a couple of lines to see if tabs are expanded as expected.
         String inputLine = "abc\tdef\t\t12345678\t1\t1234567\tabc";
 
@@ -70,7 +70,7 @@ public void testExpandTabs() throws IOException {
      * Test that skip() works over tabs.
      */
     @Test
-    public void testSkip() throws IOException {
+    void testSkip() throws IOException {
         Reader r = new ExpandTabsReader(new StringReader("\txyz"), 8);
 
         // Skip four characters. That is, half of the tab after expansion.
@@ -96,7 +96,7 @@ public void testSkip() throws IOException {
      * Tests that line offsets are translated as expected.
      */
     @Test
-    public void testTranslate() {
+    void testTranslate() {
         final String INPUT = "abc\tdef\t\t12345678\t1\t1234567\tabc";
 
         int tbsz = 8;