From 74f46d422fcfa12c7b220eaecb9ae4e2f61d2361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Avard=20Ottestad?= Date: Mon, 15 Jan 2024 12:31:53 +0100 Subject: [PATCH] code cleanup --- .../triples/impl/BitmapTriplesIterator.java | 5 ----- ...tMultIndexSPARQL11QueryComplianceTest.java | 22 ++++++++++--------- ...MultIndexSPARQL11UpdateComplianceTest.java | 11 ++-------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/qendpoint-core/src/main/java/com/the_qa_company/qendpoint/core/triples/impl/BitmapTriplesIterator.java b/qendpoint-core/src/main/java/com/the_qa_company/qendpoint/core/triples/impl/BitmapTriplesIterator.java index 6555cf6d..248a0923 100644 --- a/qendpoint-core/src/main/java/com/the_qa_company/qendpoint/core/triples/impl/BitmapTriplesIterator.java +++ b/qendpoint-core/src/main/java/com/the_qa_company/qendpoint/core/triples/impl/BitmapTriplesIterator.java @@ -294,11 +294,6 @@ public long getLastTriplePosition() { return lastPosition; } - @Override - public String getIndexName() { - return idx.getOrder().toString(); - } - @Override public boolean isLastTriplePositionBoundToOrder() { return true; diff --git a/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11QueryComplianceTest.java b/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11QueryComplianceTest.java index 59caedf4..18153d0a 100644 --- a/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11QueryComplianceTest.java +++ b/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11QueryComplianceTest.java @@ -34,11 +34,8 @@ public class EndpointMultIndexSPARQL11QueryComplianceTest extends SPARQL11QueryComplianceTest { private static final Logger logger = LoggerFactory.getLogger(EndpointSPARQL11QueryComplianceTest.class); - public EndpointMultIndexSPARQL11QueryComplianceTest(String displayName, String testURI, String name, - String queryFileURL, String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) - throws ParserException, NotFoundException, IOException { - super(displayName, testURI, name, queryFileURL, resultFileURL, null, ordered, laxCardinality); - setUpHDT(dataset); + public EndpointMultIndexSPARQL11QueryComplianceTest() { + super(); List testToIgnore = new ArrayList<>(); // @todo these tests are failing and should not, they are skipped so // that we can be sure that we see when @@ -72,6 +69,16 @@ public EndpointMultIndexSPARQL11QueryComplianceTest(String displayName, String t File nativeStore; File hdtStore; + @Override + protected void testParameterListener(String displayName, String testURI, String name, String queryFileURL, + String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) { + try { + setUpHDT(dataset); + } catch (IOException | ParserException | NotFoundException e) { + throw new RuntimeException(e); + } + } + @Override protected Repository newRepository() throws Exception { nativeStore = tempDir.newFolder(); @@ -116,11 +123,6 @@ public HDT loadIndex() throws IOException { return new SailRepository(endpoint); } - @Override - public void setUp() throws Exception { - super.setUp(); - } - HDT hdt; private void setUpHDT(Dataset dataset) throws IOException, ParserException, NotFoundException { diff --git a/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11UpdateComplianceTest.java b/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11UpdateComplianceTest.java index 698afb1c..105cda30 100644 --- a/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11UpdateComplianceTest.java +++ b/qendpoint-store/src/test/java/com/the_qa_company/qendpoint/store/EndpointMultIndexSPARQL11UpdateComplianceTest.java @@ -27,11 +27,8 @@ public class EndpointMultIndexSPARQL11UpdateComplianceTest extends SPARQL11UpdateComplianceTest { - public EndpointMultIndexSPARQL11UpdateComplianceTest(String displayName, String testURI, String name, - String requestFile, IRI defaultGraphURI, Map inputNamedGraphs, IRI resultDefaultGraphURI, - Map resultNamedGraphs) { - super(displayName, testURI, name, requestFile, defaultGraphURI, inputNamedGraphs, resultDefaultGraphURI, - resultNamedGraphs); + public EndpointMultIndexSPARQL11UpdateComplianceTest() { + super(); List testToIgnore = new ArrayList<>(); // @todo these tests are failing and should not, they are skipped so // that we can be sure that we see when @@ -95,8 +92,4 @@ public HDT loadIndex() throws IOException { // NativeStore(tempDir.newFolder(), "spoc"))); } - @Override - public void setUp() throws Exception { - super.setUp(); - } }