MARMOTTA-438: fixed regular tests for the current implementation
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/96ba6e0a Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/96ba6e0a Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/96ba6e0a Branch: refs/heads/develop Commit: 96ba6e0a9000a1a79a8df2778b535ae25d8cc23d Parents: 6490c9a Author: Sergio Fernández <[email protected]> Authored: Tue Mar 18 16:29:28 2014 +0100 Committer: Sergio Fernández <[email protected]> Committed: Tue Mar 18 16:29:28 2014 +0100 ---------------------------------------------------------------------- .../ldp/webservices/LdpWebServiceTest.java | 27 +++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/96ba6e0a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/webservices/LdpWebServiceTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/webservices/LdpWebServiceTest.java b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/webservices/LdpWebServiceTest.java index d1d7d08..f110946 100644 --- a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/webservices/LdpWebServiceTest.java +++ b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/webservices/LdpWebServiceTest.java @@ -110,7 +110,7 @@ public class LdpWebServiceTest { .expect() .statusCode(200) .header("Link", CoreMatchers.anyOf( //TODO: RestAssured only checks the FIRST header... - HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby"), + HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby"), HeaderMatchers.isLink(LDP.BasicContainer.stringValue(), "type")) ) .header("ETag", HeaderMatchers.hasEntityTag(true)) // FIXME: be more specific here @@ -128,7 +128,7 @@ public class LdpWebServiceTest { .expect() .statusCode(200) .header("Link", CoreMatchers.anyOf( //TODO: RestAssured only checks the FIRST header... - HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby"), + HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby"), HeaderMatchers.isLink(LDP.Resource.stringValue(), "type")) ) .header("ETag", HeaderMatchers.hasEntityTag(true)) // FIXME: be more specific here @@ -143,7 +143,7 @@ public class LdpWebServiceTest { RestAssured .expect() .statusCode(204) - .header("Link", HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby")) + .header("Link", HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby")) .header("ETag", HeaderMatchers.headerNotPresent()) .header("Last-Modified", HeaderMatchers.headerNotPresent()) .delete(newResource); @@ -182,7 +182,7 @@ public class LdpWebServiceTest { .header("Location", baseUrl + newResource + ".png") .header("Link", CoreMatchers.anyOf( //TODO: RestAssured only checks the FIRST header... HeaderMatchers.isLink(baseUrl + newResource, "describedby"), - HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby"), + HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby"), HeaderMatchers.isLink(LDP.BasicContainer.stringValue(), "type")) ) .post(container); @@ -194,16 +194,19 @@ public class LdpWebServiceTest { .expect() .statusCode(200) .header("Link", CoreMatchers.anyOf( //TODO: RestAssured only checks the FIRST header... - HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby"), + HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby"), HeaderMatchers.isLink(LDP.BasicContainer.stringValue(), "type")) ) .header("ETag", HeaderMatchers.hasEntityTag(true)) // FIXME: be more specific here .contentType(RDFFormat.TURTLE.getDefaultMIMEType()) .body(SesameMatchers.rdfStringMatches(RDFFormat.TURTLE.getDefaultMIMEType(), baseUrl + container, + SesameMatchers.hasStatement(new URIImpl(baseUrl + container), RDF.TYPE, LDP.Resource), + SesameMatchers.hasStatement(new URIImpl(baseUrl + container), RDF.TYPE, LDP.RDFSource), + SesameMatchers.hasStatement(new URIImpl(baseUrl + container), RDF.TYPE, LDP.Container), SesameMatchers.hasStatement(new URIImpl(baseUrl + container), RDF.TYPE, LDP.BasicContainer), SesameMatchers.hasStatement(new URIImpl(baseUrl + container), DCTERMS.MODIFIED, null), - SesameMatchers.hasStatement(new URIImpl(baseUrl + container), LDP.contains, new URIImpl(baseUrl + newResource)) - )) + SesameMatchers.hasStatement(new URIImpl(baseUrl + container), LDP.contains, new URIImpl(baseUrl + newResource + ".png"))) + ) .get(container); @@ -214,7 +217,7 @@ public class LdpWebServiceTest { .expect() .statusCode(200) .header("Link", CoreMatchers.anyOf( //TODO: RestAssured only checks the FIRST header... - HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby"), + HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby"), HeaderMatchers.isLink(LDP.Resource.stringValue(), "type"), HeaderMatchers.isLink(LDP.RDFSource.stringValue(), "type")) ) @@ -235,11 +238,11 @@ public class LdpWebServiceTest { .expect() .statusCode(200) .header("Link", CoreMatchers.anyOf( //TODO: RestAssured only checks the FIRST header... - HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby"), + HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby"), HeaderMatchers.isLink(LDP.Resource.stringValue(), "type"), HeaderMatchers.isLink(LDP.NonRdfResource.stringValue(), "type")) ) - .header("ETag", HeaderMatchers.hasEntityTag(true)) // FIXME: be more specific here + .header("ETag", HeaderMatchers.hasEntityTag(false)) // FIXME: be more specific here .contentType(RDFFormat.TURTLE.getDefaultMIMEType()) .body(SesameMatchers.rdfStringMatches(RDFFormat.TURTLE.getDefaultMIMEType(), baseUrl + newResource+".png", SesameMatchers.hasStatement(new URIImpl(baseUrl + newResource+".png"), RDF.TYPE, LDP.Resource), @@ -258,11 +261,11 @@ public class LdpWebServiceTest { .expect() .statusCode(200) .header("Link", CoreMatchers.anyOf( //TODO: RestAssured only checks the FIRST header... - HeaderMatchers.isLink("http://wiki.apache.org/marmotta/LDPImplementationReport";, "describedby"), + HeaderMatchers.isLink(LdpWebService.LDP_SERVER_CONSTRAINTS, "describedby"), HeaderMatchers.isLink(LDP.Resource.stringValue(), "type"), HeaderMatchers.isLink(LDP.RDFSource.stringValue(), "type")) ) - .header("ETag", HeaderMatchers.hasEntityTag(true)) // FIXME: be more specific here + .header("ETag", HeaderMatchers.hasEntityTag(false)) // FIXME: be more specific here .contentType(mimeType) .get(newResource + ".png") .body().asByteArray();
