aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon.hallingstad@gmail.com>2022-07-12 23:11:15 +0200
committerGitHub <noreply@github.com>2022-07-12 23:11:15 +0200
commitd1b77979a83f5e227175230e895c557693098e9b (patch)
tree7943b9da9e5cf6a8dc3548f8c17dc36ebfe0b8b5 /config-model/src/test/java
parentd2e319ad2609e00b1ded032228739bbbc0ecc191 (diff)
Revert "Validate that complex fields do not have struct fields with 'indexing…"
Diffstat (limited to 'config-model/src/test/java')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java (renamed from config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexFieldsValidatorTestCase.java)26
1 files changed, 1 insertions, 25 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexFieldsValidatorTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java
index 11e4ae855a5..85050aa0cf9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexFieldsValidatorTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java
@@ -22,7 +22,7 @@ import static com.yahoo.config.model.test.TestUtil.joinLines;
/**
* @author geirst
*/
-public class ComplexFieldsValidatorTestCase {
+public class ComplexAttributeFieldsValidatorTestCase {
@SuppressWarnings("deprecation")
@Rule
@@ -78,30 +78,6 @@ public class ComplexFieldsValidatorTestCase {
}
@Test
- public void throws_when_complex_fields_have_struct_fields_with_index() throws IOException, SAXException {
- exceptionRule.expect(IllegalArgumentException.class);
- exceptionRule.expectMessage("For cluster 'mycluster', schema 'test': " +
- "The following complex fields have struct fields with 'indexing: index' which is not supported: " +
- "topics (topics.id, topics.label). Change to 'indexing: attribute' instead");
- createModelAndValidate(joinLines(
- "schema test {",
- "document test {",
- "struct topic {",
- " field id type string {}",
- " field label type string {}",
- " field desc type string {}",
- "}",
- "field topics type array<topic> {",
- " indexing: summary",
- " struct-field id { indexing: index }",
- " struct-field label { indexing: index | attribute }",
- " struct-field desc { indexing: attribute }",
- "}",
- "}",
- "}"));
- }
-
- @Test
public void validation_passes_when_only_supported_struct_field_attributes_are_used() throws IOException, SAXException {
createModelAndValidate(joinLines("search test {",
" document test {",