Merge pull request #5 from fcrepo4-exts/fcrepo-1765

don't query on JCR types
fcrepo4-labs · Nov 5, 2015 · 7d433ab · 7d433ab
2 parents 0519e66 + 43af096
commit 7d433ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
   <properties>
     <ldpath.version>3.2.1</ldpath.version>
-    <fcrepo.version>${project.version}</fcrepo.version>
+    <fcrepo.version>4.4.1-SNAPSHOT</fcrepo.version>
     <osgi.import.packages>
       org.fcrepo.kernel.api,
       org.fcrepo.http.api,

diff --git a/src/test/java/org/fcrepo/integration/SparqlQueryTransformIT.java b/src/test/java/org/fcrepo/integration/SparqlQueryTransformIT.java
@@ -23,6 +23,7 @@
 import org.fcrepo.kernel.api.utils.iterators.RdfStream;
 import org.fcrepo.kernel.modeshape.rdf.impl.DefaultIdentifierTranslator;
 import org.fcrepo.kernel.modeshape.rdf.impl.PropertiesRdfContext;
+import org.fcrepo.kernel.modeshape.rdf.impl.TypeRdfContext;
 import org.fcrepo.transform.transformations.SparqlQueryTransform;
 
 import org.junit.Test;
@@ -43,6 +44,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
 import static org.fcrepo.kernel.api.RdfLexicon.REPOSITORY_NAMESPACE;
+import static org.fcrepo.kernel.api.RdfLexicon.RDF_NAMESPACE;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -68,19 +70,19 @@ public class SparqlQueryTransformIT extends AbstractResourceIT {
     private SparqlQueryTransform testObj;
 
     @Test
-    public void testQueryPrimaryType() throws RepositoryException, IOException {
+    public void testQueryRdfType() throws RepositoryException, IOException {
         final Session session = repo.login();
         try {
             final Container object = containerService.findOrCreate(session, "/testObject-" + randomUUID());
 
             final String s = "SELECT ?x ?type\n" +
-                    "WHERE { ?x  <" + REPOSITORY_NAMESPACE + "primaryType> ?type }";
+                    "WHERE { ?x  <" + RDF_NAMESPACE + "type> ?type }";
             try (final InputStream stringReader = new ByteArrayInputStream(s.getBytes())) {
 
                 testObj = new SparqlQueryTransform(stringReader);
 
                 final RdfStream stream = object.getTriples(new DefaultIdentifierTranslator(session),
-                        PropertiesRdfContext.class);
+                        TypeRdfContext.class);
                 try (final QueryExecution qexec = testObj.apply(stream)) {
                     final ResultSet results = requireNonNull(qexec).execSelect();
                     assertTrue(requireNonNull(results).hasNext());