diff --git a/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/HTTPRepositoryTest.java b/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/HTTPRepositoryTest.java index a4408bb..8b7a8a0 100644 --- a/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/HTTPRepositoryTest.java +++ b/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/HTTPRepositoryTest.java @@ -137,14 +137,19 @@ public Checker sparqlUpdate() { TupleQuery tupleQuery =repcon.prepareTupleQuery(QueryLanguage.SPARQL,queryString); String strShouldBe = "(urn:x-local:graph1, http://purl.org/dc/elements/1.1/publisher, \"Bob23\") [null]"; - + Reader reader = new StringReader(strShouldBe); + Model modelInserted = null; + try { + modelInserted = Rio.parse(reader, "", RDFFormat.RDFXML); + } catch (IOException e) { + e.printStackTrace(); + } checker = getHTTPRep(); RepositoryResult afterUpdate = checker.resultStatement; - while (afterUpdate.hasNext()){ - if((afterUpdate + "") == strShouldBe){ - checker.testCheck = true; - } - } + Model modelAfterUpdate = QueryResults.asModel(afterUpdate); + + System.out.println("" + modelAfterUpdate); + checker.testCheck = isSubset(modelInserted, modelAfterUpdate); return checker; } @@ -159,14 +164,12 @@ public void HTTPRepositoryShouldWorkOk(){ checker= sparqlSelect(); assertThat("deleteHTTPRepo is Match: ", checker.testCheck, equalTo(true)); - +// // checker = sparqlUpdate(); // assertThat("deleteHTTPRepo is Match: ", checker.testCheck, equalTo(true)); checker = deleteHTTPRep(emptyResult); assertThat("deleteHTTPRepo is Match: ", checker.testCheck, equalTo(true)); -// assertThat("deleteHTTPRepo length is zero: ", checker.size, equalTo(0)); - } } diff --git a/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/RepositoryControllerTest.java b/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/RepositoryControllerTest.java index 8a69e9e..e1d077c 100644 --- a/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/RepositoryControllerTest.java +++ b/org.eclipse.rdf4j.jaxrs/ru.agentlab.rdf4j.jaxrs.tests/src/test/java/ru/agentlab/rdf4j/jaxrs/RepositoryControllerTest.java @@ -41,7 +41,6 @@ public class RepositoryControllerTest extends Rdf4jJaxrsTestSupport { @Inject protected RepositoryManagerComponent manager; - @Before public void init() throws Exception { ENDPOINT_ADDRESS = "http://localhost:" + getHttpPort() + "/rdf4j-server/repositories/";