diff options
author | Lester Solbakken <lesters@users.noreply.github.com> | 2019-06-04 08:34:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-04 08:34:06 +0200 |
commit | 05a2b4d3fbf3be03c69a42252051c141ec11fc14 (patch) | |
tree | c5e67cd5b6da9f4ab3c0f7d7b32dd1af9aa47d51 | |
parent | 10b558583628c845e219accc9dc1bb42f5d27926 (diff) | |
parent | 628f0f967a0de9281571a5e016581f0960a8ecf3 (diff) |
Merge pull request #9665 from vespa-engine/bratseth/handle-nested-names
Handle nested names
-rw-r--r-- | model-integration/src/main/javacc/ModelParser.jj | 5 | ||||
-rw-r--r-- | model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/model-integration/src/main/javacc/ModelParser.jj b/model-integration/src/main/javacc/ModelParser.jj index a5510dd89f3..5dde54e88e2 100644 --- a/model-integration/src/main/javacc/ModelParser.jj +++ b/model-integration/src/main/javacc/ModelParser.jj @@ -142,8 +142,9 @@ void model() : (<NL>)* <EOF> { - if ( ! name.equals(model.name())) - throw new IllegalArgumentException("Model '" + name + "' must be saved in a file named '" + name + ".model'"); + if ( ! model.name().endsWith(name)) + throw new IllegalArgumentException("Unexpected model name '" + model.name() + + "': Model '" + name + "' must be saved in a file named '" + name + ".model'"); } } diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java index 767af147ad7..25a24792432 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java @@ -74,7 +74,8 @@ public class VespaImportTestCase { fail("Expected exception"); } catch (IllegalArgumentException e) { - assertEquals("Model 'expectedname' must be saved in a file named 'expectedname.model'", e.getMessage()); + assertEquals("Unexpected model name 'misnamed': " + + "Model 'expectedname' must be saved in a file named 'expectedname.model'", e.getMessage()); } } |