You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/04/13 22:04:32 UTC
svn commit: r1467690 - in
/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize:
TestFilterTransform.java TestOptimizer.java
Author: andy
Date: Sat Apr 13 20:04:32 2013
New Revision: 1467690
URL: http://svn.apache.org/r1467690
Log:
Rename tests to just call the rename code, not the full optimization
(otherwise unrelated changes can affect the test).
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java?rev=1467690&r1=1467689&r2=1467690&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java Sat Apr 13 20:04:32 2013
@@ -337,7 +337,7 @@ public class TestFilterTransform
"(filter (exprlist (!= ?x <x>) (!= ?x 2) (!= ?x 3)) (bgp (?s ?p ?x)))") ;
}
- static void test(String input, Transform transform, String... output)
+ public static void test(String input, Transform transform, String... output)
{
Op op1 = SSE.parseOp(input) ;
Op op2 = Transformer.transform(transform, op1) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java?rev=1467690&r1=1467689&r2=1467690&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java Sat Apr 13 20:04:32 2013
@@ -47,7 +47,7 @@ public class TestOptimizer extends BaseT
" (bgp (triple ?/x ?/y ?v))\n" +
" (project (?/w)\n" +
" (bgp (triple ?//a ?//y ?/w))))))))";
- check(queryString, opExpectedString) ;
+ checkRename(queryString, opExpectedString) ;
}
@Test public void query_rename_02()
@@ -60,9 +60,9 @@ public class TestOptimizer extends BaseT
" (bgp (triple ?s ?p ?o))\n" +
" (slice _ 50\n" +
" (project (?v)\n" +
- "(bgp (triple ?/x ?/y ?v) (triple ?/a ?/y ?/w))" +
- "))))" ;
- check(queryString, opExpectedString) ;
+ " (join (bgp (triple ?/x ?/y ?v)) (bgp (triple ?/a ?/y ?/w))))" +
+ ")))" ;
+ checkRename(queryString, opExpectedString) ;
}
@Test public void query_rename_03()
@@ -77,7 +77,7 @@ public class TestOptimizer extends BaseT
" (bgp (triple ?x ?y ?v))\n" +
" (project (?w)\n" +
" (bgp (triple ?/a ?/y ?w)))))))" ;
- check(queryString, opExpectedString) ;
+ checkRename(queryString, opExpectedString) ;
}
@Test public void query_rename_04()
@@ -92,7 +92,7 @@ public class TestOptimizer extends BaseT
" (bgp (triple ?/x ?/y ?v))\n" +
" (project (?/w)\n" +
" (bgp (triple ?//a ?//y ?/w)))))))" ;
- check(queryString, opExpectedString) ;
+ checkRename(queryString, opExpectedString) ;
}
@Test public void query_rename_05()
@@ -108,7 +108,7 @@ public class TestOptimizer extends BaseT
" (bgp (triple ?/x ?/y ?v))\n" +
" (project (?/w)\n" +
" (bgp (triple ?//a ?//y ?/w))))))))" ;
- check(queryString, opExpectedString) ;
+ checkRename(queryString, opExpectedString) ;
}
@Test public void query_rename_06()
@@ -125,7 +125,7 @@ public class TestOptimizer extends BaseT
" (project (?w)\n" +
" (bgp (triple ?//a ?//y ?w))))))))\n" +
"" ;
- check(queryString, opExpectedString) ;
+ checkRename(queryString, opExpectedString) ;
}
@Test public void query_rename_07()
@@ -136,7 +136,7 @@ public class TestOptimizer extends BaseT
" (bgp (triple ?s ?p ?o))\n" +
" (project (?w)\n" +
" (bgp (triple ?/x ?/y ?/v))))" ;
- check(queryString, opExpectedString) ;
+ checkRename(queryString, opExpectedString) ;
}
@Test public void slice_order_to_topn_01()
@@ -322,8 +322,18 @@ public class TestOptimizer extends BaseT
check(queryString, opExpectedString) ;
}
+ public static void checkRename(String queryString, String opExpectedString)
+ {
+ Op opExpected = SSE.parseOp(opExpectedString) ;
+ queryString = "PREFIX : <http://example/>\n"+queryString ;
+ Query query = QueryFactory.create(queryString) ;
+ Op op = Algebra.compile(query) ;
+ Op opRenamed = TransformScopeRename.transform(op) ;
+ assertEquals(opExpected, opRenamed) ;
+ }
+
- private static void check(String queryString, String opExpectedString)
+ public static void check(String queryString, String opExpectedString)
{
queryString = "PREFIX : <http://example/>\n"+queryString ;
Query query = QueryFactory.create(queryString) ;