svn commit: r1696596 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java

[da...@apache.org]

Author: davide
Date: Wed Aug 19 14:22:33 2015
New Revision: 1696596

URL: http://svn.apache.org/r1696596
Log:
OAK-3252 - make AbstractQueryTest#test() reflects real file paths

- reverting as it was making oak-lucene breaking.


Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java?rev=1696596&r1=1696595&r2=1696596&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java Wed Aug 19 14:22:33 2015
@@ -16,8 +16,6 @@
  */
 package org.apache.jackrabbit.oak.query;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,11 +29,9 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-
 import javax.jcr.PropertyType;
 
 import com.google.common.collect.Lists;
-
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.oak.api.ContentRepository;
 import org.apache.jackrabbit.oak.api.ContentSession;
@@ -120,16 +116,13 @@ public abstract class AbstractQueryTest
     }
 
     protected void test(String file) throws Exception {
+        InputStream in = AbstractQueryTest.class.getResourceAsStream(file);
+        ContinueLineReader r = new ContinueLineReader(new LineNumberReader(new InputStreamReader(in)));
         String className = getClass().getName();
         String shortClassName = className.replaceAll("org.apache.jackrabbit.oak.plugins.index.", "oajopi.");
-
-        File input = new File(AbstractQueryTest.class.getResource(file).getPath());
-        File output = new File("target/" + shortClassName + "_" + file);
-        
-        InputStream in = new FileInputStream(input);
-        ContinueLineReader r = new ContinueLineReader(new LineNumberReader(new InputStreamReader(in)));
         PrintWriter w = new PrintWriter(new OutputStreamWriter(
-                new FileOutputStream(output)));
+                new FileOutputStream("target/" + shortClassName + "_"
+                        + file)));
         HashSet<String> knownQueries = new HashSet<String>();
         boolean errors = false;
         try {
@@ -224,9 +217,9 @@ public abstract class AbstractQueryTest
             r.close();
         }
         if (errors) {
-            throw new Exception("Results in " + output.getPath()
+            throw new Exception("Results in target/" + file
                     + " don't match expected "
-                    + "results in " + input.getPath()
+                    + "results in src/test/resources/" + file
                     + "; compare the files for details");
         }
     }