summaryrefslogtreecommitdiffstats
path: root/config-model/src/test
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-10 17:37:13 +0200
committergjoranv <gv@oath.com>2019-01-21 15:09:23 +0100
commit2b403f1874d84ff180f1f2b196c10671be7bf802 (patch)
treecafce2434d79557835a1ae0cec1e5a05da9ef28e /config-model/src/test
parent97c11397a3dbec3c709170ece1e158ce3cc211a3 (diff)
Inline test files
Diffstat (limited to 'config-model/src/test')
-rw-r--r--config-model/src/test/examples/disksummary.sd14
-rw-r--r--config-model/src/test/examples/disksummaryexplicit.sd18
-rw-r--r--config-model/src/test/examples/memorysummary.sd14
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java61
4 files changed, 55 insertions, 52 deletions
diff --git a/config-model/src/test/examples/disksummary.sd b/config-model/src/test/examples/disksummary.sd
deleted file mode 100644
index 766f0e0d2e1..00000000000
--- a/config-model/src/test/examples/disksummary.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-search disksummary {
-
- document disksummary {
-
- field inmemory type string {
- indexing: attribute | summary
- }
- field ondisk type string {
- indexing: index | summary
- }
-
- }
-
-} \ No newline at end of file
diff --git a/config-model/src/test/examples/disksummaryexplicit.sd b/config-model/src/test/examples/disksummaryexplicit.sd
deleted file mode 100644
index b0179e04801..00000000000
--- a/config-model/src/test/examples/disksummaryexplicit.sd
+++ /dev/null
@@ -1,18 +0,0 @@
-search disksummary {
-
- document disksummary {
-
- field inmemory type string {
- indexing: attribute | summary
- }
- field ondisk type string {
- indexing: index | summary
- }
-
- }
-
- document-summary default {
- from-disk
- }
-
-} \ No newline at end of file
diff --git a/config-model/src/test/examples/memorysummary.sd b/config-model/src/test/examples/memorysummary.sd
deleted file mode 100644
index 79be30bc0fd..00000000000
--- a/config-model/src/test/examples/memorysummary.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-search memorysummary {
-
- document memorysummary {
-
- field inmemory type string {
- indexing: attribute | summary
- }
- field ondisk type string {
- indexing: index # no summary, so ignored
- }
-
- }
-
-} \ No newline at end of file
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
index 6fa716d9b76..de2a904cc48 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
@@ -19,16 +19,46 @@ import static org.junit.Assert.assertTrue;
public class SummaryTestCase {
@Test
- public void testMemorySummary() throws IOException, ParseException {
+ public void testMemorySummary() throws ParseException {
+ String sd =
+ "search memorysummary {\n" +
+ "\n" +
+ " document memorysummary {\n" +
+ "\n" +
+ " field inmemory type string {\n" +
+ " indexing: attribute | summary\n" +
+ " }\n" +
+ " field ondisk type string {\n" +
+ " indexing: index # no summary, so ignored\n" +
+ " }\n" +
+ "\n" +
+ " }\n" +
+ "\n" +
+ "}";
DeployLoggerStub logger = new DeployLoggerStub();
- SearchBuilder.createFromFile("src/test/examples/memorysummary.sd", logger);
+ SearchBuilder.createFromString(sd, logger);
assertTrue(logger.entries.isEmpty());
}
@Test
- public void testDiskSummary() throws IOException, ParseException {
+ public void testDiskSummary() throws ParseException {
+ String sd =
+ "search disksummary {\n" +
+ "\n" +
+ " document disksummary {\n" +
+ "\n" +
+ " field inmemory type string {\n" +
+ " indexing: attribute | summary\n" +
+ " }\n" +
+ " field ondisk type string {\n" +
+ " indexing: index | summary\n" +
+ " }\n" +
+ "\n" +
+ " }\n" +
+ "\n" +
+ "}";
DeployLoggerStub logger = new DeployLoggerStub();
- SearchBuilder.createFromFile("src/test/examples/disksummary.sd", logger);
+ SearchBuilder.createFromString(sd, logger);
assertEquals(1, logger.entries.size());
assertEquals(Level.FINE, logger.entries.get(0).level);
assertEquals("summary field 'ondisk' in document summary 'default' references source field 'ondisk', " +
@@ -38,9 +68,28 @@ public class SummaryTestCase {
}
@Test
- public void testDiskSummaryExplicit() throws IOException, ParseException {
+ public void testDiskSummaryExplicit() throws ParseException {
+ String sd =
+ "search disksummary {\n" +
+ "\n" +
+ " document disksummary {\n" +
+ "\n" +
+ " field inmemory type string {\n" +
+ " indexing: attribute | summary\n" +
+ " }\n" +
+ " field ondisk type string {\n" +
+ " indexing: index | summary\n" +
+ " }\n" +
+ "\n" +
+ " }\n" +
+ "\n" +
+ " document-summary default {\n" +
+ " from-disk\n" +
+ " }\n" +
+ "\n" +
+ "}";
DeployLoggerStub logger = new DeployLoggerStub();
- SearchBuilder.createFromFile("src/test/examples/disksummaryexplicit.sd", logger);
+ SearchBuilder.createFromString(sd, logger);
assertTrue(logger.entries.isEmpty());
}