diff options
5 files changed, 17 insertions, 17 deletions
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java index cbd6c02cd26..9aae221767f 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java @@ -107,7 +107,7 @@ public class AggregationTestCase { } private GlobalId createGlobalId(int docId) { - return new GlobalId((new DocumentId("doc:test:" + docId)).getGlobalId()); + return new GlobalId((new DocumentId("id:test:type:" + docId)).getGlobalId()); } @Test diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java index b9d3bc3bd4d..cc00959174a 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java @@ -280,7 +280,7 @@ public class GroupingSerializationTest { private static GlobalId createGlobalId(int docId) { return new GlobalId( - new DocumentId(String.format("doc:test:%d", docId)).getGlobalId()); + new DocumentId(String.format("id:test:type:%d", docId)).getGlobalId()); } private static ExpressionNode createDummyExpression() { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java index 322bcb426d5..fa8ced689c1 100755 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; public class MergeTestCase { private GlobalId createGlobalId(int docId) { - return new GlobalId((new DocumentId("doc:test:" + docId)).getGlobalId()); + return new GlobalId((new DocumentId("id:test:type:" + docId)).getGlobalId()); } // Test merging of hits. diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java index 6eb878eaeea..5d1772b6ac4 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java @@ -32,10 +32,10 @@ import static org.mockito.Mockito.when; public class OperationProcessorTest { final Queue<Result> queue = new ArrayDeque<>(); - final Document doc1 = new Document("doc:a:b", null, "data doc 1", null); - final Document doc1b = new Document("doc:a:b", null, "data doc 1b", null); - final Document doc2 = new Document("doc:a:b2", null, "data doc 2", null); - final Document doc3 = new Document("doc:a:b3", null, "data doc 3", null); + final Document doc1 = new Document("doc:a:type:b", null, "data doc 1", null); + final Document doc1b = new Document("doc:a:type:b", null, "data doc 1b", null); + final Document doc2 = new Document("doc:a:type:b2", null, "data doc 2", null); + final Document doc3 = new Document("doc:a:type:b3", null, "data doc 3", null); @Test public void testBasic() { @@ -76,7 +76,7 @@ public class OperationProcessorTest { //check a, b, c, d Result aggregated = queue.poll(); - assertThat(aggregated.getDocumentId(), equalTo("doc:a:b")); + assertThat(aggregated.getDocumentId(), equalTo("doc:a:type:b")); assertThat(aggregated.getDetails().size(), is(4)); assertThat(aggregated.getDetails().get(0).getEndpoint().getHostname(), equalTo("a")); assertThat(aggregated.getDetails().get(1).getEndpoint().getHostname(), equalTo("b")); @@ -107,7 +107,7 @@ public class OperationProcessorTest { //check a, b, c, d aggregated = queue.poll(); - assertThat(aggregated.getDocumentId(), equalTo("doc:a:b2")); + assertThat(aggregated.getDocumentId(), equalTo("doc:a:type:b2")); assertThat(aggregated.getDetails().size(), is(4)); assertThat(aggregated.getDetails().get(0).getEndpoint().getHostname(), equalTo("a")); assertThat(aggregated.getDetails().get(1).getEndpoint().getHostname(), equalTo("b")); @@ -203,7 +203,7 @@ public class OperationProcessorTest { Queue<Document> documentQueue = new ArrayDeque<>(); for (int x = 0; x < 100; x++) { - Document document = new Document("doc:a:b", null, String.valueOf(x), null); + Document document = new Document("doc:a:type:b", null, String.valueOf(x), null); operationProcessor.sendDocument(document); documentQueue.add(document); } diff --git a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java b/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java index 8af4dd5dac9..f791ea971c9 100644 --- a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java +++ b/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java @@ -39,13 +39,13 @@ public class SimpleFeederTest { @Test public void requireThatXMLFeederWorks() throws Throwable { assertFeed("<vespafeed>" + - " <document documenttype='simple' documentid='doc:scheme:0'>" + + " <document documenttype='simple' documentid='id:scheme:simple:0'>" + " <my_str>foo</my_str>" + " </document>" + - " <update documenttype='simple' documentid='doc:scheme:1'>" + + " <update documenttype='simple' documentid='id:scheme:simple:1'>" + " <assign field='my_str'>bar</assign>" + " </update>" + - " <remove documenttype='simple' documentid='doc:scheme:2'/>" + + " <remove documenttype='simple' documentid='id:scheme:simple:2'/>" + "</vespafeed>", new MessageHandler() { @@ -192,14 +192,14 @@ public class SimpleFeederTest { public void requireThatParseFailuresThrowInMainThread() throws Throwable { TestDriver driver = new TestDriver(new FeederParams(), "<vespafeed>" + - " <document documenttype='unknown' documentid='doc:scheme:0'/>" + + " <document documenttype='unknown' documentid='id:scheme:simple:0'/>" + "</vespafeed>", null); try { driver.run(); fail(); } catch (DeserializationException e) { - assertEquals("Field 'doc:scheme:0': Must specify an existing document type, not 'unknown' (at line 1, column 76)", + assertEquals("Field 'id:scheme:simple:0': Must specify an existing document type, not 'unknown' (at line 1, column 76)", e.getMessage()); } assertTrue(driver.close()); @@ -209,7 +209,7 @@ public class SimpleFeederTest { public void requireThatSyncFailuresThrowInMainThread() throws Throwable { TestDriver driver = new TestDriver(new FeederParams(), "<vespafeed>" + - " <document documenttype='simple' documentid='doc:scheme:0'/>" + + " <document documenttype='simple' documentid='id:scheme:simple:0'/>" + "</vespafeed>", null); driver.feeder.getSourceSession().close(); @@ -225,7 +225,7 @@ public class SimpleFeederTest { @Test public void requireThatAsyncFailuresThrowInMainThread() throws Throwable { TestDriver driver = new TestDriver(new FeederParams(), - "<vespafeed><document documenttype='simple' documentid='doc:scheme:0'/></vespafeed>", + "<vespafeed><document documenttype='simple' documentid='id:scheme:simple:0'/></vespafeed>", new MessageHandler() { @Override |