From bd0d7414cecf4d4fa87d2fdabe8998d3d3e86cbb Mon Sep 17 00:00:00 2001 From: Lakshya A Agrawal Date: Sun, 6 Jun 2021 19:06:29 +0530 Subject: [PATCH] Automate test skipping for unsupported queries --- src/main/java/com/KRacR/s2c/CreateCypher.java | 5 +- .../KRacR/s2c/QueryNotSupportedException.java | 9 +++ .../s2c/SparqlAlgebraToCypherVisitor.java | 74 ++++++++++++++++++- .../java/com/KRacR/s2c/SparqlToCypher.java | 15 +++- .../com/KRacR/s2c/SparqlToCypherTest.java | 60 ++++++++++++++- .../test1/queries/{not_working => }/README | 0 .../test1/queries/{not_working => }/q1.sparql | 0 .../queries/{not_working => }/q11.sparql | 0 .../queries/{not_working => }/q12a.sparql | 0 .../queries/{not_working => }/q12b.sparql | 0 .../queries/{not_working => }/q12c.sparql | 0 .../test1/queries/{not_working => }/q2.sparql | 0 .../queries/{not_working => }/q3a.sparql | 0 .../queries/{not_working => }/q3b.sparql | 0 .../queries/{not_working => }/q3c.sparql | 0 .../test1/queries/{not_working => }/q4.sparql | 0 .../queries/{not_working => }/q5a.sparql | 0 .../queries/{not_working => }/q5b.sparql | 0 .../test1/queries/{not_working => }/q6.sparql | 0 .../test1/queries/{not_working => }/q7.sparql | 0 .../test1/queries/{not_working => }/q8.sparql | 0 .../test1/queries/{not_working => }/q9.sparql | 0 .../{not_working => }/sp2b_queries.txt | 0 23 files changed, 151 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/KRacR/s2c/QueryNotSupportedException.java rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/README (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q1.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q11.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q12a.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q12b.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q12c.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q2.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q3a.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q3b.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q3c.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q4.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q5a.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q5b.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q6.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q7.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q8.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/q9.sparql (100%) rename src/test/resources/ttl_automated_tests/test1/queries/{not_working => }/sp2b_queries.txt (100%) diff --git a/src/main/java/com/KRacR/s2c/CreateCypher.java b/src/main/java/com/KRacR/s2c/CreateCypher.java index f830c25..91c44b0 100644 --- a/src/main/java/com/KRacR/s2c/CreateCypher.java +++ b/src/main/java/com/KRacR/s2c/CreateCypher.java @@ -64,7 +64,10 @@ public String visitLiteral(Literal l) { this.label, l.getDatatypeURI(), l.getLexicalForm(), - l.getLexicalForm() + (l.getLexicalForm() + + (l.getDatatypeURI().equals("http://www.w3.org/2001/XMLSchema#string")? + "": + "^^"+l.getDatatypeURI())) ) ); } diff --git a/src/main/java/com/KRacR/s2c/QueryNotSupportedException.java b/src/main/java/com/KRacR/s2c/QueryNotSupportedException.java new file mode 100644 index 0000000..f5e8ac6 --- /dev/null +++ b/src/main/java/com/KRacR/s2c/QueryNotSupportedException.java @@ -0,0 +1,9 @@ +package com.KRacR.s2c; + +public class QueryNotSupportedException extends Exception { + + public QueryNotSupportedException(String string) { + super(string); + } + +} diff --git a/src/main/java/com/KRacR/s2c/SparqlAlgebraToCypherVisitor.java b/src/main/java/com/KRacR/s2c/SparqlAlgebraToCypherVisitor.java index 020c434..35fc8f4 100644 --- a/src/main/java/com/KRacR/s2c/SparqlAlgebraToCypherVisitor.java +++ b/src/main/java/com/KRacR/s2c/SparqlAlgebraToCypherVisitor.java @@ -59,6 +59,8 @@ public class SparqlAlgebraToCypherVisitor implements OpVisitor { private Map Cypher_to_sparql_variable_map; private int blank_node_num = 0; private Map Sparql_blank_node_to_var_map; + private boolean isQueryConversionSuccesful = true; + private String conversionErrors = ""; public SparqlAlgebraToCypherVisitor() { cypher = new String(); @@ -70,6 +72,7 @@ public SparqlAlgebraToCypherVisitor() { @Override public void visit(OpBGP opBGP) { // TODO Auto-generated method stub + // TODO Instead of handling opTriple in this function, handle it in its visitor System.out.println("In opBGP\n" + opBGP.toString()); java.util.Iterator it = opBGP.getPattern().iterator(); while(it.hasNext()) { @@ -160,162 +163,216 @@ protected String create_or_get_variable(Var allocated_var) { public void visit(OpQuadPattern quadPattern){ // TODO Auto-generated method stub System.out.println("In quadPattern\n" + quadPattern.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpQuadPattern\n"; } @Override public void visit(OpQuadBlock quadBlock) { // TODO Auto-generated method stub System.out.println("In quadBlock\n" + quadBlock.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpQuadBlock\n"; } @Override public void visit(OpTriple opTriple) { // TODO Auto-generated method stub System.out.println("In opTriple\n" + opTriple.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpTriple\n"; } @Override public void visit(OpQuad opQuad) { // TODO Auto-generated method stub System.out.println("In opQuad\n" + opQuad.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpQuad\n"; } @Override public void visit(OpPath opPath) { // TODO Auto-generated method stub System.out.println("In opPath\n" + opPath.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpPath\n"; } @Override public void visit(OpFind opFind) { // TODO Auto-generated method stub System.out.println("In opFind\n" + opFind.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpFind\n"; } @Override public void visit(OpTable opTable) { // TODO Auto-generated method stub System.out.println("In opTable\n" + opTable.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpTable\n"; } @Override public void visit(OpNull opNull) { // TODO Auto-generated method stub System.out.println("In opNull\n" + opNull.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpNull\n"; } @Override public void visit(OpProcedure opProc) { // TODO Auto-generated method stub System.out.println("In opProc\n" + opProc.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpProcedure\n"; } @Override public void visit(OpPropFunc opPropFunc) { // TODO Auto-generated method stub System.out.println("In opPropFunc\n" + opPropFunc.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpPropFunc\n"; } @Override public void visit(OpFilter opFilter) { // TODO Auto-generated method stub System.out.println("In opFilter\n" + opFilter.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpFilter\n"; } @Override public void visit(OpGraph opGraph) { // TODO Auto-generated method stub System.out.println("In opGraph\n" + opGraph.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpGraph\n"; } @Override public void visit(OpService opService) { // TODO Auto-generated method stub System.out.println("In opService\n" + opService.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpService\n"; } @Override public void visit(OpDatasetNames dsNames) { // TODO Auto-generated method stub System.out.println("In dsNames\n" + dsNames.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpDatasetNames\n"; } @Override public void visit(OpLabel opLabel) { // TODO Auto-generated method stub System.out.println("In opLabel\n" + opLabel.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpLabel\n"; } @Override public void visit(OpAssign opAssign) { // TODO Auto-generated method stub System.out.println("In opAssign\n" + opAssign.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpAssign\n"; } @Override public void visit(OpExtend opExtend) { // TODO Auto-generated method stub System.out.println("In opExtend\n" + opExtend.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpExtend\n"; } @Override public void visit(OpJoin opJoin) { // TODO Auto-generated method stub System.out.println("In opJoin\n" + opJoin.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpJoin\n"; } @Override public void visit(OpLeftJoin opLeftJoin) { // TODO Auto-generated method stub System.out.println("In opLeftJoin\n" + opLeftJoin.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpLeftJoin\n"; } @Override public void visit(OpUnion opUnion) { // TODO Auto-generated method stub System.out.println("In opUnion\n" + opUnion.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpUnion\n"; } @Override public void visit(OpDiff opDiff) { // TODO Auto-generated method stub System.out.println("In opDiff\n" + opDiff.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpDiff\n"; } @Override public void visit(OpMinus opMinus) { // TODO Auto-generated method stub System.out.println("In opMinus\n" + opMinus.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpMinus\n"; } @Override public void visit(OpConditional opCondition) { // TODO Auto-generated method stub System.out.println("In opCondition\n" + opCondition.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpCondition\n"; } @Override public void visit(OpSequence opSequence) { // TODO Auto-generated method stub System.out.println("In opSequence\n" + opSequence.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpSequence\n"; } @Override public void visit(OpDisjunction opDisjunction) { // TODO Auto-generated method stub System.out.println("In opDisjunction\n" + opDisjunction.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpDisjunction\n"; } @Override public void visit(OpList opList) { // TODO Auto-generated method stub System.out.println("In opList\n" + opList.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpList\n"; } @Override public void visit(OpOrder opOrder) { // TODO Auto-generated method stub System.out.println("In opOrder\n" + opOrder.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpOrder\n"; } @Override @@ -335,35 +392,44 @@ public void visit(OpProject opProject) { public void visit(OpReduced opReduced) { // TODO Auto-generated method stub System.out.println("In opReduced\n" + opReduced.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpReduced\n"; } @Override public void visit(OpDistinct opDistinct) { // TODO Auto-generated method stub System.out.println("In opDistinct\n" + opDistinct.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpDistinct\n"; } @Override public void visit(OpSlice opSlice) { // TODO Auto-generated method stub System.out.println("In opSlice\n" + opSlice.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpSlice\n"; } @Override public void visit(OpGroup opGroup) { // TODO Auto-generated method stub System.out.println("In opGroup\n" + opGroup.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpGroup\n"; } @Override public void visit(OpTopN opTop) { // TODO Auto-generated method stub System.out.println("In opTop\n" + opTop.toString()); + this.isQueryConversionSuccesful = false; + this.conversionErrors += "Unsupported Algebra type OpTop\n"; } - public String getCypher() { - // TODO Auto-generated method stub - return cypher; //"match (n)-[e:Edge]->(r {uri:\"http://localhost/persons/Paul_Erdoes\"}) return n.uri as subject, e.uri as predicate"; + public String getCypher() throws QueryNotSupportedException { + if(this.isQueryConversionSuccesful) return cypher; + else throw new QueryNotSupportedException(this.conversionErrors); } - } diff --git a/src/main/java/com/KRacR/s2c/SparqlToCypher.java b/src/main/java/com/KRacR/s2c/SparqlToCypher.java index 15832bf..d849474 100644 --- a/src/main/java/com/KRacR/s2c/SparqlToCypher.java +++ b/src/main/java/com/KRacR/s2c/SparqlToCypher.java @@ -2,6 +2,8 @@ import java.lang.String; +import javax.ws.rs.NotSupportedException; + import org.apache.jena.query.Query; import org.apache.jena.query.QueryFactory; import org.apache.jena.query.QueryVisitor; @@ -45,15 +47,22 @@ import org.apache.jena.sparql.core.Prologue; public class SparqlToCypher { - public static String convert(String sparql_query) { + public static String convert(String sparql_query) throws QueryNotSupportedException { System.out.println("------------------------------------------\nInside Sparql to Cypher Converter"); Query sq = QueryFactory.create(sparql_query); + if(!(sq.isSelectType())) throw new QueryNotSupportedException("Conversion of the following query failed:\n" + sparql_query + "\nDue to the following reason:\n" + "Describe, Construct and Ask type queries not supported"); Op op = Algebra.compile(sq); System.out.println(sparql_query); - System.out.println(op); + //System.out.println(op); SparqlAlgebraToCypherVisitor visitor = new SparqlAlgebraToCypherVisitor(); op.visit(visitor); - System.out.println(visitor.getCypher()); + String cypher_query = null; + try { + cypher_query = visitor.getCypher(); + }catch(QueryNotSupportedException qe) { + throw new QueryNotSupportedException("Conversion of the following query failed:\n" + sparql_query + "\nDue to the following reason:\n" + qe.getMessage()); + } + System.out.println(cypher_query); System.out.println("Exit Sparql to Cypher Converter\n------------------------------------------"); return visitor.getCypher(); } diff --git a/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java b/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java index 597684a..9becbc1 100644 --- a/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java +++ b/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java @@ -27,6 +27,7 @@ import org.apache.jena.query.ResultSet; import org.apache.jena.rdf.model.Model; import org.apache.jena.riot.RDFDataMgr; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; @@ -39,12 +40,45 @@ import org.neo4j.harness.Neo4j; import org.neo4j.harness.Neo4jBuilders; +// https://stackoverflow.com/questions/8255738/is-there-a-stopwatch-in-java +class Stopwatch{ + private long startTime; + private long stopTime; + + /** + starting the stop watch. + */ + public void resetstart(){ + this.startTime = 0; + this.stopTime = 0; + startTime = System.nanoTime(); + } + + /** + stopping the stop watch. + */ + public void stop() + { stopTime = System.nanoTime(); } + + /** + elapsed time in nanoseconds. + */ + public long time(){ + return (stopTime - startTime); + } + + public String toString(){ + return "elapsed time: " + time() + " nanoseconds."; + } +} + /** * Unit test for Sparql to Cypher */ @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class SparqlToCypherTest{ private Neo4j embeddedDatabaseServer; + private Stopwatch sw = new Stopwatch(); private static List SparqlToCypherQueriesProvider() throws IOException { File f = new File("src/test/resources/ttl_automated_tests"); // current directory @@ -102,6 +136,7 @@ public void test_run_TTL_Automated_Test(Model rdf_model, List RDF_conver }catch(Exception e) { e.printStackTrace(); fail("Error executing RDF converted cypher queries in neo4j"); + return; } String sparql_query = null; @@ -112,8 +147,17 @@ public void test_run_TTL_Automated_Test(Model rdf_model, List RDF_conver } // Run the Sparql to Cypher converter - String cypher_query = SparqlToCypher.convert(sparql_query); - + sw.resetstart(); + String cypher_query; + try { + cypher_query = SparqlToCypher.convert(sparql_query); + } catch (QueryNotSupportedException e1) { + Assumptions.assumeTrue(false, e1.getMessage()); + System.out.println(e1.getMessage()); + return; + } + sw.stop(); + System.out.println("Query Conversion time: " + ((double)sw.time())/1000 + " ms."); // Execute the cypher query on the database // TODO: Consider iterating column wise instead of row wise Set> sparql_result = new HashSet>(); @@ -133,7 +177,7 @@ public void test_run_TTL_Automated_Test(Model rdf_model, List RDF_conver "Running the returned Cypher query FAILED with exception:\n" + e.getMessage() + "\nSparql query:\n" + sparql_query - + "\n\nConverter Cypher:\n" + cypher_query + + "\n\nConverted Cypher:\n" + cypher_query ); } @@ -151,9 +195,17 @@ public void test_run_TTL_Automated_Test(Model rdf_model, List RDF_conver sparql_result.add(res); } + System.out.println(String.format("Sparql Result\n%s\n", sparql_result.toString())); + System.out.println(String.format("Cypher Result\n%s\n", cypher_result.toString())); + // TODO: Account for ORDER BY queries // TODO: Match all column names in both the result sets - assertEquals(sparql_result, cypher_result, String.format("Equality test failed for %s", query_file.getCanonicalPath())); + assertEquals(sparql_result, cypher_result, String.format( + "Equality test failed for %s\nSparql result:\n%s\n\nCypher Result\n%s", + query_file.getCanonicalPath(), + sparql_result.toString(), + cypher_result.toString() + )); } private void RDF_to_PG_PG_Bench(Path rdf_path, String folder) { diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/README b/src/test/resources/ttl_automated_tests/test1/queries/README similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/README rename to src/test/resources/ttl_automated_tests/test1/queries/README diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q1.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q1.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q1.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q1.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q11.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q11.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q11.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q11.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q12a.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q12a.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q12a.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q12a.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q12b.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q12b.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q12b.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q12b.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q12c.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q12c.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q12c.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q12c.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q2.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q2.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q2.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q2.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q3a.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q3a.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q3a.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q3a.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q3b.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q3b.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q3b.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q3b.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q3c.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q3c.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q3c.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q3c.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q4.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q4.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q4.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q4.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q5a.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q5a.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q5a.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q5a.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q5b.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q5b.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q5b.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q5b.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q6.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q6.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q6.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q6.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q7.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q7.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q7.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q7.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q8.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q8.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q8.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q8.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/q9.sparql b/src/test/resources/ttl_automated_tests/test1/queries/q9.sparql similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/q9.sparql rename to src/test/resources/ttl_automated_tests/test1/queries/q9.sparql diff --git a/src/test/resources/ttl_automated_tests/test1/queries/not_working/sp2b_queries.txt b/src/test/resources/ttl_automated_tests/test1/queries/sp2b_queries.txt similarity index 100% rename from src/test/resources/ttl_automated_tests/test1/queries/not_working/sp2b_queries.txt rename to src/test/resources/ttl_automated_tests/test1/queries/sp2b_queries.txt