svn commit: r1467502 - /jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java

[rv...@apache.org]

Author: rvesse
Date: Fri Apr 12 22:45:56 2013
New Revision: 1467502

URL: http://svn.apache.org/r1467502
Log:
Make TestAlgebraTranslate use non-static test methods so derived tests can inject a custom AlgebraGenerator

Modified:
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java?rev=1467502&r1=1467501&r2=1467502&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java Fri Apr 12 22:45:56 2013
@@ -30,7 +30,7 @@ import org.junit.Test ;
 
 /** Test translation of syntax to algebra - no otpimization */ 
 public class TestAlgebraTranslate extends BaseTest 
-{
+{    
     @Test public void translate_01() { test("?s ?p ?o", "(bgp (triple ?s ?p ?o))") ; }
     
     @Test public void translate_02() { test("?s ?p ?o2 . BIND(?v+1 AS ?v1)", 
@@ -133,13 +133,17 @@ public class TestAlgebraTranslate extend
                                             "  [table unit]",
                                             "  [extend ((?z 99)) (table unit)] )" ) ; }
     
+    protected AlgebraGenerator getGenerator() {
+        return new AlgebraGenerator();
+    }
+    
     // Helper.  Prints the test result (check it!)
-    private static void test(String qs)
+    @SuppressWarnings("unused")
+    protected void test(String qs)
     {
         qs = "SELECT * {\n"+qs+"\n}" ;
         Query query = QueryFactory.create(qs, Syntax.syntaxARQ) ;
-        AlgebraGenerator gen = new AlgebraGenerator() ;
-        Op opActual = gen.compile(query) ;
+        Op opActual = this.getGenerator().compile(query) ;
         String x = opActual.toString() ;
         x = x.replaceAll("\n$", "") ;
         x = x.replace("\n", "\", \n\"") ;
@@ -150,15 +154,14 @@ public class TestAlgebraTranslate extend
     }
     
     
-    private static void test(String qs, String... y)
+    protected void test(String qs, String... y)
     {
         qs = "SELECT * {\n"+qs+"\n}" ;
         Query query = QueryFactory.create(qs, Syntax.syntaxARQ) ;
 
         String opStr = StrUtils.strjoinNL(y) ;
         Op opExpected = SSE.parseOp(opStr) ;
-        AlgebraGenerator gen = new AlgebraGenerator() ;
-        Op opActual = gen.compile(query) ;
+        Op opActual = this.getGenerator().compile(query) ;
         assertEquals(opExpected, opActual) ;
     }