Move testdata sources to maven's test resources

Author: ahornace

opengrok-indexer/build.xml

@@ -61,10 +61,6 @@ Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
             <fileset dir="${test.bzr}/bzr"/>
         </copy>
 
-        <zip destfile="${build.test.classes.dir}/org/opengrok/indexer/index/source.zip"
-              basedir="${test.sources}"
-              update="false"
-              defaultexcludes="no"/>
         <zip destfile="${build.test.classes.dir}/org/opengrok/indexer/history/repositories.zip"
                 basedir="${test.repositories}"
                 excludes="mercurial/hg/**, mercurial/hgignore, git/git/**, bitkeeper/bk/**, bazaar/bzr/**"

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

@@ -47,8 +47,7 @@ public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
-        repository.create(CtagsTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(CtagsTest.class.getClassLoader().getResource("sources"));
 
         /*
          * This setting is only needed for bug19195 but it does not seem
@@ -84,7 +83,7 @@ private static Definitions getDefs(String fileName) throws Exception {
      * Test of doCtags method, of class Ctags.
      */
     @Test
-    public void testDoCtags() throws Exception {
+    void testDoCtags() throws Exception {
         Definitions result = getDefs("bug16070/arguments.c");
         assertEquals(13, result.numberOfSymbols());
     }
@@ -94,7 +93,7 @@ public void testDoCtags() throws Exception {
      * definitions for Java files. Bug #14924.
      */
     @Test
-    public void bug14924() throws Exception {
+    void bug14924() throws Exception {
         // Expected method names found in the file
         String[] names = {"ts", "classNameOnly", "format"};
         // Expected line numbers for the methods
@@ -118,7 +117,7 @@ public void bug14924() throws Exception {
      * for assembler source code. Bug #19195.
      */
     @Test
-    public void bug19195() throws Exception {
+    void bug19195() throws Exception {
         // Expected method names found in the file
         String[] names = {"foo", "bar", "_fce", "__fce"};
         // Expected line numbers for the methods

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

@@ -81,8 +81,7 @@ public class JFlexXrefTest {
     public static void setUpClass() throws Exception {
         ctags = new Ctags();
         repository = new TestRepository();
-        repository.create(JFlexXrefTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(JFlexXrefTest.class.getClassLoader().getResource("sources"));
     }
 
     @AfterAll
@@ -98,7 +97,7 @@ public static void tearDownClass() {
      * to cause trouble.
      */
     @Test
-    public void testBug15890LineCount() throws Exception {
+    void testBug15890LineCount() throws Exception {
         String fileContents =
                 "line 1\n" +
                 "line 2\n" +
@@ -159,7 +158,7 @@ private void bug15890LineCount(JFlexNonXref xref) throws Exception {
      * used to cause trouble.
      */
     @Test
-    public void testBug15890Anchor() throws Exception {
+    void testBug15890Anchor() throws Exception {
         bug15890Anchor(CXref.class, "c/bug15890.c");
         bug15890Anchor(CxxXref.class, "c/bug15890.c");
         bug15890Anchor(HaskellXref.class, "haskell/bug15890.hs");
@@ -196,7 +195,7 @@ private void bug15890Anchor(Class<? extends JFlexSymbolMatcher> klass, String pa
      * highlighting in ShXref.
      */
     @Test
-    public void testBug14663() throws Exception {
+    void testBug14663() throws Exception {
         // \" should not start a new string literal
         assertXrefLine(ShXref.class, "echo \\\"", "<b>echo</b> \\&quot;");
         // \" should not terminate a string literal
@@ -242,7 +241,7 @@ private void assertXrefLine(Class<? extends JFlexSymbolMatcher> xrefClass,
      * is properly reset now.
      */
     @Test
-    public void bug16883() throws Exception {
+    void bug16883() throws Exception {
         final String ECHO_QUOT_XYZ = "echo \"xyz";
         // Analyze a script with broken syntax (unterminated string literal)
         JFlexXref xref = new JFlexXref(new ShXref(
@@ -285,12 +284,12 @@ public void bug16883() throws Exception {
      * </ul>
      */
     @Test
-    public void testCXrefInclude() throws Exception {
+    void testCXrefInclude() throws Exception {
         testCXrefInclude(CXref.class);
     }
 
     @Test
-    public void testCxxXrefInclude() throws Exception {
+    void testCxxXrefInclude() throws Exception {
         testCXrefInclude(CxxXref.class);
     }
 
@@ -320,7 +319,7 @@ private void testCXrefInclude(Class<? extends JFlexSymbolMatcher> klass) throws
      * filenames.
      */
     @Test
-    public void testCxxXrefTemplateParameters() throws Exception {
+    void testCxxXrefTemplateParameters() throws Exception {
         StringReader in = new StringReader("#include <vector>\nclass MyClass;\nstd::vector<MyClass> *v;");
         StringWriter out = new StringWriter();
         JFlexXref xref = new JFlexXref(new CxxXref(in));
@@ -333,7 +332,7 @@ public void testCxxXrefTemplateParameters() throws Exception {
      * Verify that ShXref handles here-documents. Bug #18198.
      */
     @Test
-    public void testShXrefHeredoc() throws IOException {
+    void testShXrefHeredoc() throws IOException {
         final String SH_HERE_DOC = "cat<<EOF\n" +
             "This shouldn't cause any problem.\n" +
             "EOF\n" +
@@ -359,7 +358,7 @@ public void testShXrefHeredoc() throws IOException {
      * Test that JavaXref handles empty Java comments. Bug #17885.
      */
     @Test
-    public void testEmptyJavaComment() throws IOException {
+    void testEmptyJavaComment() throws IOException {
         StringReader in = new StringReader("/**/\nclass xyz { }\n");
         JFlexXref xref = new JFlexXref(new JavaXref(in));
         StringWriter out = new StringWriter();
@@ -369,7 +368,7 @@ public void testEmptyJavaComment() throws IOException {
     }
 
     @Test
-    public void bug18586() throws IOException, InterruptedException {
+    void bug18586() throws IOException, InterruptedException {
         String filename = repository.getSourceRoot() + "/sql/bug18586.sql";
         try (Reader in = new InputStreamReader(new FileInputStream(filename), StandardCharsets.UTF_8)) {
             JFlexXref xref = new JFlexXref(new SQLXref(in));
@@ -384,7 +383,7 @@ public void bug18586() throws IOException, InterruptedException {
      * This originally became a problem after upgrade to JFlex 1.5.0.
      */
     @Test
-    public void unterminatedHeredoc() throws IOException {
+    void unterminatedHeredoc() throws IOException {
         JFlexXref xref = new JFlexXref(new ShXref(new StringReader(
                 "cat << EOF\nunterminated heredoc")));
 
@@ -406,7 +405,7 @@ public void unterminatedHeredoc() throws IOException {
      * they work now.
      */
     @Test
-    public void truncatedUuencodedFile() throws IOException {
+    void truncatedUuencodedFile() throws IOException {
         JFlexXref xref = new JFlexXref(new UuencodeXref(
                 new StringReader("begin 644 test.txt\n")));
 
@@ -427,7 +426,7 @@ public void truncatedUuencodedFile() throws IOException {
      * Test that CSharpXref correctly handles verbatim strings that end with backslash.
      */
     @Test
-    public void testCsharpXrefVerbatimString() throws IOException {
+    void testCsharpXrefVerbatimString() throws IOException {
         StringReader in = new StringReader("test(@\"\\some_windows_path_in_a_string\\\");");
         JFlexXref xref = new JFlexXref(new CSharpXref(in));
         StringWriter out = new StringWriter();
@@ -439,7 +438,7 @@ public void testCsharpXrefVerbatimString() throws IOException {
      * Test that special characters in URLs are escaped in the xref.
      */
     @Test
-    public void testEscapeLink() throws IOException {
+    void testEscapeLink() throws IOException {
         StringReader in = new StringReader("http://www.example.com/?a=b&c=d");
         JFlexXref xref = new JFlexXref(new PlainXref(in));
         StringWriter out = new StringWriter();
@@ -454,7 +453,7 @@ public void testEscapeLink() throws IOException {
      * to be produced.
      */
     @Test
-    public void testJFlexRule() throws Exception {
+    void testJFlexRule() throws Exception {
         StringReader in = new StringReader("\\\" { yybegin(STRING); }");
         // JFlex files are usually analyzed with CAnalyzer.
         JFlexXref xref = new JFlexXref(new CXref(in));
@@ -473,7 +472,7 @@ public void testJFlexRule() throws Exception {
      * longer so.
      */
     @Test
-    public void testUnterminatedElements() throws Exception {
+    void testUnterminatedElements() throws Exception {
         for (String str : Arrays.asList("#define STR \"abc\n",
                                         "void f(); /* unterminated comment\n",
                                         "const char c = 'x\n")) {
@@ -491,7 +490,7 @@ public void testUnterminatedElements() throws Exception {
      * Test that JavaClassAnalyzer produces well-formed output.
      */
     @Test
-    public void testJavaClassAnalyzer() throws Exception {
+    void testJavaClassAnalyzer() throws Exception {
         StreamSource src = new StreamSource() {
             @Override public InputStream getStream() throws IOException {
                 final String path = "/" +
@@ -513,7 +512,7 @@ public void testJavaClassAnalyzer() throws Exception {
      * Test that special characters in Fortran files are escaped.
      */
     @Test
-    public void testFortranSpecialCharacters() throws Exception {
+    void testFortranSpecialCharacters() throws Exception {
         JFlexXref xref = new JFlexXref(new FortranXref(
             new StringReader("<?php?>")));
         StringWriter out = new StringWriter();

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CAnalyzerFactoryTest.java

@@ -74,8 +74,7 @@ public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
-        repository.create(CAnalyzerFactoryTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(CAnalyzerFactoryTest.class.getClassLoader().getResource("sources"));
 
         CAnalyzerFactory analFact = new CAnalyzerFactory();
         analyzer = analFact.getAnalyzer();
@@ -97,7 +96,7 @@ public static void tearDownClass() {
      * @throws java.lang.Exception exception
      */
     @Test
-    public void testScopeAnalyzer() throws Exception {
+    void testScopeAnalyzer() throws Exception {
         String path = repository.getSourceRoot() + "/c/sample.c";
         File f = new File(path);
         assertTrue(f.canRead() && f.isFile(), "c testfile " + f + " not found");

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CxxAnalyzerFactoryTest.java

@@ -74,8 +74,7 @@ public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
-        repository.create(CxxAnalyzerFactoryTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(CxxAnalyzerFactoryTest.class.getClassLoader().getResource("sources"));
 
         CxxAnalyzerFactory analFact = new CxxAnalyzerFactory();
         analyzer = analFact.getAnalyzer();
@@ -96,7 +95,7 @@ public static void tearDownClass() {
      * @throws Exception exception
      */
     @Test
-    public void testScopeAnalyzer() throws Exception {
+    void testScopeAnalyzer() throws Exception {
         String path = repository.getSourceRoot() + "/c/sample.cxx";
         File f = new File(path);
         assertTrue(f.canRead() && f.isFile(), "cxx testfile " + f + " not found");

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

@@ -70,8 +70,7 @@ public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
-        repository.create(ClojureAnalyzerFactoryTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(ClojureAnalyzerFactoryTest.class.getClassLoader().getResource("sources"));
 
         ClojureAnalyzerFactory analFact = new ClojureAnalyzerFactory();
         analyzer = analFact.getAnalyzer();
@@ -93,7 +92,7 @@ public static void tearDownClass() {
      * @throws java.lang.Exception throw in case of analyzer or deserialize ctags error
      */
     @Test
-    public void testScopeAnalyzer() throws Exception {
+    void testScopeAnalyzer() throws Exception {
         String path = repository.getSourceRoot() + "/clojure/sample.clj";
         File f = new File(path);
         assertTrue(f.canRead() && f.isFile(), "clojure testfile " + f + " not found");

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/csharp/CSharpAnalyzerFactoryTest.java

@@ -74,8 +74,7 @@ public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
-        repository.create(CSharpAnalyzerFactoryTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(CSharpAnalyzerFactoryTest.class.getClassLoader().getResource("sources"));
 
         CSharpAnalyzerFactory analFact = new CSharpAnalyzerFactory();
         analyzer = analFact.getAnalyzer();
@@ -96,7 +95,7 @@ public static void tearDownClass() {
      * @throws Exception exception
      */
     @Test
-    public void testScopeAnalyzer() throws Exception {
+    void testScopeAnalyzer() throws Exception {
         String path = repository.getSourceRoot() + "/csharp/Sample.cs";
         File f = new File(path);
         assertTrue(f.canRead() && f.isFile(), "csharp testfile " + f + " not found");

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/document/TroffAnalyzerTest.java

@@ -65,8 +65,7 @@ public static void setUpBeforeClass() throws Exception {
         analyzer = new TroffAnalyzer(factory);
         assertNotNull(analyzer);
         repository = new TestRepository();
-        repository.create(TroffAnalyzerTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(TroffAnalyzerTest.class.getClassLoader().getResource("sources"));
 
         String file = System.getProperty("opengrok.test.troff.doc",
                 repository.getSourceRoot() + "/document/foobar.1");
@@ -97,7 +96,7 @@ public static void tearDownAfterClass() throws Exception {
      * @throws IOException I/O exception
      */
     @Test
-    public void testAnalyze() throws IOException {
+    void testAnalyze() throws IOException {
         Document doc = new Document();
         StringWriter xrefOut = new StringWriter();
         analyzer.analyze(doc, new StreamSource() {

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

@@ -74,8 +74,7 @@ public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
-        repository.create(JavaAnalyzerFactoryTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(JavaAnalyzerFactoryTest.class.getClassLoader().getResource("sources"));
 
         JavaAnalyzerFactory analFact = new JavaAnalyzerFactory();
         analyzer = analFact.getAnalyzer();
@@ -95,7 +94,7 @@ public static void tearDownClass() {
      * Test of writeXref method, of class CAnalyzerFactory.
      */
     @Test
-    public void testScopeAnalyzer() throws Exception {
+    void testScopeAnalyzer() throws Exception {
         String path = repository.getSourceRoot() + "/java/Sample.java";
         File f = new File(path);
         assertTrue(f.canRead() && f.isFile(), "java testfile " + f + " not found");

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

@@ -72,8 +72,7 @@ public static void setUpClass() throws Exception {
         ctags = new Ctags();
 
         repository = new TestRepository();
-        repository.create(PascalAnalyzerFactoryTest.class.getResourceAsStream(
-                "/org/opengrok/indexer/index/source.zip"));
+        repository.create(PascalAnalyzerFactoryTest.class.getClassLoader().getResource("sources"));
 
         PascalAnalyzerFactory analyzerFactory = new PascalAnalyzerFactory();
         analyzer = analyzerFactory.getAnalyzer();
@@ -95,7 +94,7 @@ public static void tearDownClass() {
      * @throws java.lang.Exception exception
      */
     @Test
-    public void testAnalyzer() throws Exception {
+    void testAnalyzer() throws Exception {
         String path = repository.getSourceRoot() + "/pascal/Sample.pas";
         File f = new File(path);
         assertTrue(f.canRead() && f.isFile(), "pascal testfile " + f + " not found");