From 54842f0ede7da19dbe2ade81cd1dba3917d4540a Mon Sep 17 00:00:00 2001 From: Yinlin Chen Date: Thu, 4 Jun 2015 13:53:50 -0400 Subject: [PATCH 1/5] Resolves: https://jira.duraspace.org/browse/FCREPO-1552 --- .../org/fcrepo/camel/audit/triplestore/ProcessorTest.java | 4 ++-- .../camel/audit/triplestore/integration/AuditSparqlIT.java | 3 +-- fcrepo-indexing-solr/src/test/resources/container.rdf | 1 - fcrepo-indexing-solr/src/test/resources/indexable.rdf | 1 - .../src/test/resources/solr/testCore/conf/schema.xml | 1 - .../camel/indexing/triplestore/integration/TestUtils.java | 4 +--- fcrepo-indexing-triplestore/src/test/resources/container.nt | 2 +- fcrepo-indexing-triplestore/src/test/resources/container.rdf | 1 - fcrepo-indexing-triplestore/src/test/resources/indexable.rdf | 1 - 9 files changed, 5 insertions(+), 13 deletions(-) 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 9597b6bc..c64b52c6 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 @@ -70,7 +70,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)); assertMockEndpointsSatisfied(); @@ -134,7 +134,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)); 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 b3a668fa..23b6b4de 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 @@ -97,8 +97,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..14330cac 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 @@ -145,7 +145,6 @@ "resourcename": From SolrCell request param resource.name --> - diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java index b88058a7..4a305df2 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java @@ -45,14 +45,12 @@ public class TestUtils { public static String sparqlUpdate(final String uri) { final String rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; final String fcrepo = "http://fedora.info/definitions/v4/repository#"; - final String uuid = "278bad29-b6c9-4574-a921-00d822cd65da"; return "update=INSERT DATA { " + "<" + uri + "> <" + rdf + "type> . " + "<" + uri + "> <" + rdf + "type> <" + fcrepo + "Resource> . " + "<" + uri + "> <" + rdf + "type> . " + - "<" + uri + "> <" + rdf + "type> <" + fcrepo + "Container> . " + - "<" + uri + "> <" + fcrepo + "uuid> \"" + uuid + "\"^^ . }"; + "<" + uri + "> <" + rdf + "type> <" + fcrepo + "Container> . }"; } /** diff --git a/fcrepo-indexing-triplestore/src/test/resources/container.nt b/fcrepo-indexing-triplestore/src/test/resources/container.nt index 04464163..99bf97bb 100644 --- a/fcrepo-indexing-triplestore/src/test/resources/container.nt +++ b/fcrepo-indexing-triplestore/src/test/resources/container.nt @@ -2,4 +2,4 @@ . . . - "278bad29-b6c9-4574-a921-00d822cd65da"^^ . + . diff --git a/fcrepo-indexing-triplestore/src/test/resources/container.rdf b/fcrepo-indexing-triplestore/src/test/resources/container.rdf index e2f08b7c..50501830 100644 --- a/fcrepo-indexing-triplestore/src/test/resources/container.rdf +++ b/fcrepo-indexing-triplestore/src/test/resources/container.rdf @@ -9,6 +9,5 @@ - 278bad29-b6c9-4574-a921-00d822cd65da diff --git a/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf b/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf index d2512ca4..f77891ba 100644 --- a/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf +++ b/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf @@ -12,6 +12,5 @@ default - 278bad29-b6c9-4574-a921-00d822cd65da From 788ee7ae47faa1c461731ee527c9ef6a5f79c5db Mon Sep 17 00:00:00 2001 From: Yinlin Chen Date: Thu, 4 Jun 2015 13:53:50 -0400 Subject: [PATCH 2/5] Resolves: https://jira.duraspace.org/browse/FCREPO-1552 --- .../org/fcrepo/camel/audit/triplestore/ProcessorTest.java | 2 +- .../camel/audit/triplestore/integration/AuditSparqlIT.java | 3 +-- fcrepo-indexing-solr/src/test/resources/container.rdf | 1 - fcrepo-indexing-solr/src/test/resources/indexable.rdf | 1 - .../src/test/resources/solr/testCore/conf/schema.xml | 1 - .../camel/indexing/triplestore/integration/TestUtils.java | 4 +--- fcrepo-indexing-triplestore/src/test/resources/container.nt | 2 +- fcrepo-indexing-triplestore/src/test/resources/container.rdf | 1 - fcrepo-indexing-triplestore/src/test/resources/indexable.rdf | 1 - 9 files changed, 4 insertions(+), 12 deletions(-) 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..619fe0f3 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 @@ -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..14330cac 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 @@ -145,7 +145,6 @@ "resourcename": From SolrCell request param resource.name --> - diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java index 8ad0a36d..10f12e30 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java @@ -45,14 +45,12 @@ public class TestUtils { public static String sparqlUpdate(final String uri) { final String rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; final String fcrepo = "http://fedora.info/definitions/v4/repository#"; - final String uuid = "278bad29-b6c9-4574-a921-00d822cd65da"; return "update=INSERT DATA { " + "<" + uri + "> <" + rdf + "type> . " + "<" + uri + "> <" + rdf + "type> <" + fcrepo + "Resource> . " + "<" + uri + "> <" + rdf + "type> . " + - "<" + uri + "> <" + rdf + "type> <" + fcrepo + "Container> . " + - "<" + uri + "> <" + fcrepo + "uuid> \"" + uuid + "\"^^ . }"; + "<" + uri + "> <" + rdf + "type> <" + fcrepo + "Container> . }"; } /** diff --git a/fcrepo-indexing-triplestore/src/test/resources/container.nt b/fcrepo-indexing-triplestore/src/test/resources/container.nt index 04464163..99bf97bb 100644 --- a/fcrepo-indexing-triplestore/src/test/resources/container.nt +++ b/fcrepo-indexing-triplestore/src/test/resources/container.nt @@ -2,4 +2,4 @@ . . . - "278bad29-b6c9-4574-a921-00d822cd65da"^^ . + . diff --git a/fcrepo-indexing-triplestore/src/test/resources/container.rdf b/fcrepo-indexing-triplestore/src/test/resources/container.rdf index e2f08b7c..50501830 100644 --- a/fcrepo-indexing-triplestore/src/test/resources/container.rdf +++ b/fcrepo-indexing-triplestore/src/test/resources/container.rdf @@ -9,6 +9,5 @@ - 278bad29-b6c9-4574-a921-00d822cd65da diff --git a/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf b/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf index d2512ca4..f77891ba 100644 --- a/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf +++ b/fcrepo-indexing-triplestore/src/test/resources/indexable.rdf @@ -12,6 +12,5 @@ default - 278bad29-b6c9-4574-a921-00d822cd65da From c2a0f0889f69ffb115dbbb6502921a6b08f86870 Mon Sep 17 00:00:00 2001 From: Yinlin Chen Date: Fri, 26 Jun 2015 13:44:17 -0400 Subject: [PATCH 3/5] PR updated --- .../java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java | 2 +- .../src/test/resources/solr/testCore/conf/schema.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 619fe0f3..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(); 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 14330cac..51e861d1 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 @@ -145,6 +145,7 @@ "resourcename": From SolrCell request param resource.name --> + From 0d7bd2c818fdd8b9d2cc86d74169bbe02d61b2fa Mon Sep 17 00:00:00 2001 From: Yinlin Chen Date: Fri, 26 Jun 2015 13:48:16 -0400 Subject: [PATCH 4/5] PR updated - restore schema.xml --- .../src/test/resources/solr/testCore/conf/schema.xml | 1 + 1 file changed, 1 insertion(+) 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 14330cac..51e861d1 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 @@ -145,6 +145,7 @@ "resourcename": From SolrCell request param resource.name --> + From 6980c343f215f2683df2da3907a76e6712f70ee1 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Mon, 29 Jun 2015 18:48:12 -0400 Subject: [PATCH 5/5] Update test schema.xml due to impact of updated transform Related to: https://jira.duraspace.org/browse/FCREPO-1552 --- .../src/test/resources/solr/testCore/conf/schema.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 @@ - +