From 4abbbe29cf9c38104be31ff6820f0118fddb3557 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 10 Jun 2023 11:44:14 +0200 Subject: Revert "Validate semantic rules when building config model" This reverts commit fa0044d92067bfe91a104d0a6bb6b085c0b9439e. --- .../model/container/search/SemanticRulesTest.java | 48 ++++++++-------------- .../rules/one.sr | 5 --- .../rules/other.sr | 5 --- .../semanticrules_with_errors/rules/invalid.sr | 7 ---- 4 files changed, 17 insertions(+), 48 deletions(-) delete mode 100644 config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/one.sr delete mode 100644 config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/other.sr delete mode 100644 config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_errors/rules/invalid.sr (limited to 'config-model/src/test/java') diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/SemanticRulesTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/SemanticRulesTest.java index f0e28f9df09..d9e2ae59ef6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/SemanticRulesTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/SemanticRulesTest.java @@ -2,66 +2,52 @@ package com.yahoo.vespa.model.container.search; import com.yahoo.config.model.application.provider.FilesApplicationPackage; +import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.prelude.semantics.RuleBase; +import com.yahoo.prelude.semantics.RuleImporter; import com.yahoo.prelude.semantics.SemanticRulesConfig; import com.yahoo.prelude.semantics.parser.ParseException; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + import java.io.File; import java.io.IOException; +import java.util.HashMap; import java.util.Map; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - /** * @author bratseth */ public class SemanticRulesTest { - private static final String basePath = "src/test/java/com/yahoo/vespa/model/container/search/"; - private static final String root = basePath + "semanticrules"; - private static final String rootWithErrors = basePath + "semanticrules_with_errors"; - private static final String rootWithDuplicateDefault = basePath + "semanticrules_with_duplicate_default_rule"; + private final static String root = "src/test/java/com/yahoo/vespa/model/container/search/semanticrules"; @Test - void semanticRulesTest() throws ParseException, IOException { + void semanticRulesTest() throws ParseException, IOException { SemanticRuleBuilder ruleBuilder = new SemanticRuleBuilder(); SemanticRules rules = ruleBuilder.build(FilesApplicationPackage.fromFile(new File(root))); SemanticRulesConfig.Builder configBuilder = new SemanticRulesConfig.Builder(); rules.getConfig(configBuilder); SemanticRulesConfig config = new SemanticRulesConfig(configBuilder); - Map ruleBases = SemanticRuleBuilder.toMap(config); + Map ruleBases = toMap(config); assertEquals(2, ruleBases.size()); assertTrue(ruleBases.containsKey("common")); assertTrue(ruleBases.containsKey("other")); assertFalse(ruleBases.get("common").isDefault()); assertTrue(ruleBases.get("other").isDefault()); - assertTrue(ruleBases.get("other").includes("common")); - assertNotNull(ruleBases.get("other").getCondition("stopword")); } - @Test - void rulesWithErrors() { - try { - new SemanticRuleBuilder().build(FilesApplicationPackage.fromFile(new File(rootWithErrors))); - fail("should fail with exception"); - } catch (Exception e) { - assertEquals("com.yahoo.prelude.semantics.parser.ParseException: Could not parse 'semantic-rules.cfg'", e.getMessage()); - } - } - - @Test - void rulesWithDuplicateDefault() { - try { - new SemanticRuleBuilder().build(FilesApplicationPackage.fromFile(new File(rootWithDuplicateDefault))); - fail("should fail with exception"); - } catch (Exception e) { - assertEquals("Both 'one' and 'other' is marked as default rule, there can only be one", e.getMessage()); + private static Map toMap(SemanticRulesConfig config) throws ParseException, IOException { + RuleImporter ruleImporter = new RuleImporter(config, new SimpleLinguistics()); + Map ruleBaseMap = new HashMap<>(); + for (SemanticRulesConfig.Rulebase ruleBaseConfig : config.rulebase()) { + RuleBase ruleBase = ruleImporter.importConfig(ruleBaseConfig); + if (ruleBaseConfig.isdefault()) + ruleBase.setDefault(true); + ruleBaseMap.put(ruleBase.getName(), ruleBase); } + return ruleBaseMap; } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/one.sr b/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/one.sr deleted file mode 100644 index 4f2271e91ba..00000000000 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/one.sr +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@default - -# Spelling correction -bahc -> bach; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/other.sr b/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/other.sr deleted file mode 100644 index 29f7e85967f..00000000000 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_duplicate_default_rule/rules/other.sr +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@default - -# Spelling correction -list-> liszt; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_errors/rules/invalid.sr b/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_errors/rules/invalid.sr deleted file mode 100644 index 9d89cab7e31..00000000000 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/semanticrules_with_errors/rules/invalid.sr +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Stopwords -[stopword] -> ; -[stopword] :- and, or, the, what, why, how; - -# Synonyms, with wrong character at end of line -[bill] :- Bill, bill, William: -- cgit v1.2.3