diff --git a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java index 3c36ffef..3ae2c8bb 100644 --- a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java +++ b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java @@ -72,7 +72,7 @@ public void testNodeAdded() throws Exception { final String eventTypes = REPOSITORY + "NODE_ADDED," + REPOSITORY + "PROPERTY_ADDED"; final String eventProps = REPOSITORY + "lastModified," + REPOSITORY + "primaryType," + REPOSITORY + "lastModifiedBy," + REPOSITORY + "created," + REPOSITORY + "mixinTypes," + - REPOSITORY + "createdBy," + REPOSITORY + "uuid"; + REPOSITORY + "createdBy"; template.sendBodyAndHeaders("", createEvent(nodeID, eventTypes, eventProps, eventID)); assertMockEndpointsSatisfied(); @@ -139,7 +139,7 @@ public void testFileAdded() throws Exception { final String eventTypes = REPOSITORY + "NODE_ADDED," + REPOSITORY + "PROPERTY_ADDED"; final String eventProps = REPOSITORY + "lastModified," + REPOSITORY + "primaryType," + REPOSITORY + "lastModifiedBy," + REPOSITORY + "created," + REPOSITORY + "mixinTypes," + - REPOSITORY + "createdBy," + REPOSITORY + "uuid" + REPOSITORY + "hasContent," + + REPOSITORY + "createdBy," + REPOSITORY + "hasContent," + PREMIS + "hasSize," + PREMIS + "hasOriginalName," + REPOSITORY + "digest"; template.sendBodyAndHeaders("", createEvent(fileID, eventTypes, eventProps, eventID)); diff --git a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java index 5340b356..dc3ed0f4 100644 --- a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java +++ b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java @@ -103,8 +103,7 @@ private Map getEventHeaders() { REPOSITORY + "primaryType", REPOSITORY + "lastModifiedBy", REPOSITORY + "created", - REPOSITORY + "mixinTypes", - REPOSITORY + "uuid" + REPOSITORY + "mixinTypes" }; // send an audit event to an external triplestore diff --git a/fcrepo-indexing-solr/src/test/resources/container.rdf b/fcrepo-indexing-solr/src/test/resources/container.rdf index e2f08b7c..50501830 100644 --- a/fcrepo-indexing-solr/src/test/resources/container.rdf +++ b/fcrepo-indexing-solr/src/test/resources/container.rdf @@ -9,6 +9,5 @@ - 278bad29-b6c9-4574-a921-00d822cd65da diff --git a/fcrepo-indexing-solr/src/test/resources/indexable.rdf b/fcrepo-indexing-solr/src/test/resources/indexable.rdf index d2512ca4..f77891ba 100644 --- a/fcrepo-indexing-solr/src/test/resources/indexable.rdf +++ b/fcrepo-indexing-solr/src/test/resources/indexable.rdf @@ -12,6 +12,5 @@ default - 278bad29-b6c9-4574-a921-00d822cd65da diff --git a/fcrepo-indexing-solr/src/test/resources/solr/testCore/conf/schema.xml b/fcrepo-indexing-solr/src/test/resources/solr/testCore/conf/schema.xml index 51e861d1..1dcc86f6 100644 --- a/fcrepo-indexing-solr/src/test/resources/solr/testCore/conf/schema.xml +++ b/fcrepo-indexing-solr/src/test/resources/solr/testCore/conf/schema.xml @@ -144,6 +144,9 @@ "content_type": From the HTTP headers of incoming stream "resourcename": From SolrCell request param resource.name --> + + + @@ -155,7 +158,7 @@ - +