summaryrefslogtreecommitdiffstats
path: root/docprocs
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-08-16 16:21:27 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2019-08-16 16:21:27 +0200
commitf5a1eb11c45abb80c05736c8db675e94f3b5ea06 (patch)
treee4361448985e10f3e4a92afa48f61d561b85ae9c /docprocs
parent57eb9f0a62789e7216809f2a14b516be19265a6c (diff)
doc: -> id:
Diffstat (limited to 'docprocs')
-rw-r--r--docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java14
-rw-r--r--docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java10
2 files changed, 12 insertions, 12 deletions
diff --git a/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java b/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java
index cfaee10a07d..6e4057c57a0 100644
--- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java
+++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java
@@ -180,7 +180,7 @@ public class DocumentScriptTestCase {
}
DocumentUpdate executeWithUpdate(String fieldName, FieldPathUpdate updateIn) {
- DocumentUpdate update = new DocumentUpdate(type, "doc:scheme:");
+ DocumentUpdate update = new DocumentUpdate(type, "id:ns:documentType::");
update.addFieldPathUpdate(updateIn);
return newScript(type, fieldName).execute(ADAPTER_FACTORY, update);
}
@@ -240,7 +240,7 @@ public class DocumentScriptTestCase {
private static FieldValue processDocument(FieldValue fieldValue) {
DocumentType docType = new DocumentType("myDocumentType");
docType.addField("myField", fieldValue.getDataType());
- Document doc = new Document(docType, "doc:scheme:");
+ Document doc = new Document(docType, "id:ns:myDocumentType::");
doc.setFieldValue("myField", fieldValue.clone());
doc = newScript(docType).execute(ADAPTER_FACTORY, doc);
return doc.getFieldValue("myField");
@@ -249,7 +249,7 @@ public class DocumentScriptTestCase {
private static ValueUpdate<?> processFieldUpdate(FieldValue fieldValue) {
DocumentType docType = new DocumentType("myDocumentType");
docType.addField("myField", fieldValue.getDataType());
- DocumentUpdate update = new DocumentUpdate(docType, "doc:scheme:");
+ DocumentUpdate update = new DocumentUpdate(docType, "id:ns:myDocumentType::");
update.addFieldUpdate(FieldUpdate.createAssign(docType.getField("myField"), fieldValue));
update = newScript(docType).execute(ADAPTER_FACTORY, update);
return update.getFieldUpdate("myField").getValueUpdate(0);
@@ -258,7 +258,7 @@ public class DocumentScriptTestCase {
private static ValueUpdate<?> processPathUpdate(FieldValue fieldValue) {
DocumentType docType = new DocumentType("myDocumentType");
docType.addField("myField", fieldValue.getDataType());
- DocumentUpdate update = new DocumentUpdate(docType, "doc:scheme:");
+ DocumentUpdate update = new DocumentUpdate(docType, "id:ns:myDocumentType::");
update.addFieldPathUpdate(new AssignFieldPathUpdate(docType, "myField", fieldValue));
update = newScript(docType).execute(ADAPTER_FACTORY, update);
return update.getFieldUpdate("myField").getValueUpdate(0);
@@ -299,7 +299,7 @@ public class DocumentScriptTestCase {
}
private static Document newDocument(FieldValue documentFieldValue, FieldValue extraFieldValue) {
- Document document = new Document(newDocumentType(), "doc:scheme:");
+ Document document = new Document(newDocumentType(), "id:ns:documentType::");
if (documentFieldValue != null) {
document.setFieldValue("documentField", documentFieldValue);
}
@@ -311,7 +311,7 @@ public class DocumentScriptTestCase {
private static DocumentUpdate newFieldUpdate(FieldValue documentFieldValue, FieldValue extraFieldValue) {
DocumentType type = newDocumentType();
- DocumentUpdate update = new DocumentUpdate(type, "doc:scheme:");
+ DocumentUpdate update = new DocumentUpdate(type, "id:ns:documentType::");
if (documentFieldValue != null) {
update.addFieldUpdate(FieldUpdate.createAssign(type.getField("documentField"), documentFieldValue));
}
@@ -323,7 +323,7 @@ public class DocumentScriptTestCase {
private static DocumentUpdate newPathUpdate(FieldValue documentFieldValue, FieldValue extraFieldValue) {
DocumentType type = newDocumentType();
- DocumentUpdate update = new DocumentUpdate(type, "doc:scheme:");
+ DocumentUpdate update = new DocumentUpdate(type, "id:ns:documentType::");
if (documentFieldValue != null) {
update.addFieldPathUpdate(new AssignFieldPathUpdate(type, "documentField", documentFieldValue));
}
diff --git a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
index 5979672524d..8ad2ff0aaad 100644
--- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
+++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
@@ -33,7 +33,7 @@ public class IndexingProcessorTestCase {
@Test
public void requireThatIndexerProcessesDocuments() {
- Document input = new Document(indexer.getDocumentTypeManager().getDocumentType("music"), "doc:scheme:");
+ Document input = new Document(indexer.getDocumentTypeManager().getDocumentType("music"), "id:ns:music::");
input.setFieldValue("artist", new StringFieldValue("69"));
DocumentOperation op = process(new DocumentPut(input));
assertTrue(op instanceof DocumentPut);
@@ -45,7 +45,7 @@ public class IndexingProcessorTestCase {
@Test
public void requireThatIndexerForwardsDocumentsOfUnknownType() {
- Document input = new Document(new DocumentType("unknown"), "doc:scheme:");
+ Document input = new Document(new DocumentType("unknown"), "id:ns:unknown::");
DocumentOperation output = process(new DocumentPut(input));
assertTrue(output instanceof DocumentPut);
assertSame(input, ((DocumentPut)output).getDocument());
@@ -54,7 +54,7 @@ public class IndexingProcessorTestCase {
@Test
public void requireThatIndexerProcessesUpdates() {
DocumentType inputType = indexer.getDocumentTypeManager().getDocumentType("music");
- DocumentUpdate input = new DocumentUpdate(inputType, "doc:scheme:");
+ DocumentUpdate input = new DocumentUpdate(inputType, "id:ns:music::");
input.addFieldUpdate(FieldUpdate.createAssign(inputType.getField("isbn"), new StringFieldValue("isbnmarker")));
input.addFieldUpdate(FieldUpdate.createAssign(inputType.getField("artist"), new StringFieldValue("69")));
DocumentOperation output = process(input);
@@ -98,7 +98,7 @@ public class IndexingProcessorTestCase {
@Test
public void requireThatEmptyDocumentUpdateOutputDoesNotThrow() {
DocumentType inputType = indexer.getDocumentTypeManager().getDocumentType("music");
- DocumentUpdate input = new DocumentUpdate(inputType, "doc:scheme:");
+ DocumentUpdate input = new DocumentUpdate(inputType, "id:ns:music::");
Processing proc = new Processing();
proc.getDocumentOperations().add(input);
indexer.process(proc);
@@ -107,7 +107,7 @@ public class IndexingProcessorTestCase {
@Test
public void requireThatIndexerForwardsUpdatesOfUnknownType() {
- DocumentUpdate input = new DocumentUpdate(new DocumentType("unknown"), "doc:scheme:");
+ DocumentUpdate input = new DocumentUpdate(new DocumentType("unknown"), "id:ns:music::");
DocumentOperation output = process(input);
assertSame(input, output);
}