summaryrefslogtreecommitdiffstats
path: root/config-model/src/test
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2018-09-20 12:24:04 +0200
committergjoranv <gv@oath.com>2019-01-21 15:09:22 +0100
commit7b58424ddd4cdf0c2e963cd89bac83dcf8566381 (patch)
treea0d1c4b7f8fecbc9d999ce8417e78b40bdc6f7bd /config-model/src/test
parentb940326231702e8a07dc7e2d3fb5da440bf171cf (diff)
Track removal of fileHandler.rotateSchema from access-log.def
Diffstat (limited to 'config-model/src/test')
-rw-r--r--config-model/src/test/derived/importedfields/imported-fields.cfg10
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java2
2 files changed, 0 insertions, 12 deletions
diff --git a/config-model/src/test/derived/importedfields/imported-fields.cfg b/config-model/src/test/derived/importedfields/imported-fields.cfg
index d1895d02290..c8de7d4fb7e 100644
--- a/config-model/src/test/derived/importedfields/imported-fields.cfg
+++ b/config-model/src/test/derived/importedfields/imported-fields.cfg
@@ -1,25 +1,15 @@
attribute[].name "my_int_field"
attribute[].referencefield "a_ref"
attribute[].targetfield "int_field"
-attribute[].datatype NONE
-attribute[].collectiontype SINGLE
attribute[].name "my_string_field"
attribute[].referencefield "b_ref"
attribute[].targetfield "string_field"
-attribute[].datatype NONE
-attribute[].collectiontype SINGLE
attribute[].name "my_int_array_field"
attribute[].referencefield "a_ref"
attribute[].targetfield "int_array_field"
-attribute[].datatype NONE
-attribute[].collectiontype SINGLE
attribute[].name "my_int_wset_field"
attribute[].referencefield "a_ref"
attribute[].targetfield "int_wset_field"
-attribute[].datatype NONE
-attribute[].collectiontype SINGLE
attribute[].name "my_ancient_int_field"
attribute[].referencefield "a_ref"
attribute[].targetfield "ancient_int_field"
-attribute[].datatype NONE
-attribute[].collectiontype SINGLE
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index a4a8eef74dd..817d9a943e0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -85,7 +85,6 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler();
assertEquals("pattern", fileHandlerConfig.pattern());
assertEquals("interval", fileHandlerConfig.rotation());
- assertEquals(AccessLogConfig.FileHandler.RotateScheme.DATE, fileHandlerConfig.rotateScheme());
}
{ // json
@@ -96,7 +95,6 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler();
assertEquals("pattern", fileHandlerConfig.pattern());
assertEquals("interval", fileHandlerConfig.rotation());
- assertEquals(AccessLogConfig.FileHandler.RotateScheme.DATE, fileHandlerConfig.rotateScheme());
}
}