diff options
Diffstat (limited to 'config-lib/src/test/java/com/yahoo')
3 files changed, 19 insertions, 13 deletions
diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java index d1cd7678911..76871aaca42 100644 --- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java +++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java @@ -169,9 +169,7 @@ public class ConfigInstanceBuilderTest { fileVal("etc"). pathVal(FileReference.mockFileReferenceForUnitTesting(new File("pom.xml"))). urlVal(new UrlReference("http://docs.vespa.ai")). - modelVal(new ModelReference(Optional.empty(), - Optional.empty(), - Optional.of(FileReference.mockFileReferenceForUnitTesting(new File("pom.xml"))))). + modelVal(ModelReference.unresolved(FileReference.mockFileReferenceForUnitTesting(new File("pom.xml")))). boolarr(false). longarr(9223372036854775807L). longarr(-9223372036854775808L). diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java index 1a05c08d8f2..db1509fba93 100644 --- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java +++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java @@ -132,9 +132,9 @@ public class ConfigInstanceEqualsTest { fileVal("etc"). pathVal(FileReference.mockFileReferenceForUnitTesting(new File("pom.xml"))). urlVal(new UrlReference("http://docs.vespa.ai")). - modelVal(new ModelReference(Optional.of("my-model-id"), - Optional.of(new UrlReference("http://docs.vespa.ai")), - Optional.empty())). + modelVal(ModelReference.unresolved(Optional.of("my-model-id"), + Optional.of(new UrlReference("http://docs.vespa.ai")), + Optional.empty())). boolarr(false). longarr(9223372036854775807L). longarr(-9223372036854775808L). @@ -145,9 +145,9 @@ public class ConfigInstanceEqualsTest { refarr(Arrays.asList(":parent:", ":parent", "parent:")). // test collection based setter fileArr("bin"). urlArr(new UrlReference("http://docs.vespa.ai")). - modelArr(new ModelReference(Optional.empty(), - Optional.of(new UrlReference("http://docs.vespa.ai")), - Optional.of(FileReference.mockFileReferenceForUnitTesting(new File("pom.xml"))))). + modelArr(ModelReference.unresolved(Optional.empty(), + Optional.of(new UrlReference("http://docs.vespa.ai")), + Optional.of(FileReference.mockFileReferenceForUnitTesting(new File("pom.xml"))))). basicStruct(new BasicStruct.Builder(). foo("basicFoo"). diff --git a/config-lib/src/test/java/com/yahoo/config/ModelNodeTest.java b/config-lib/src/test/java/com/yahoo/config/ModelNodeTest.java index 696e0722714..328b27bf4c8 100644 --- a/config-lib/src/test/java/com/yahoo/config/ModelNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/ModelNodeTest.java @@ -3,6 +3,7 @@ package com.yahoo.config; import org.junit.jupiter.api.Test; +import java.nio.file.Path; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -18,12 +19,19 @@ public class ModelNodeTest { } @Test - void testReference() { - var reference = new ModelReference(Optional.of("myModelId"), - Optional.of(new UrlReference("https://host:my/path")), - Optional.of(new FileReference("foo.txt"))); + void testUnresolvedReference() { + var reference = ModelReference.unresolved(Optional.of("myModelId"), + Optional.of(new UrlReference("https://host:my/path")), + Optional.of(new FileReference("foo.txt"))); assertEquals("myModelId https://host:my/path foo.txt", reference.toString()); assertEquals(reference, ModelReference.valueOf(reference.toString())); } + @Test + void testResolvedReference() { + var reference = ModelReference.resolved(Path.of("dir/resolvedFile.txt")); + assertEquals("dir/resolvedFile.txt", reference.toString()); + assertEquals(reference, ModelReference.valueOf(reference.toString())); + } + } |