aboutsummaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-07-12 19:24:23 +0200
committerHarald Musum <musum@verizonmedia.com>2020-07-12 19:24:23 +0200
commitce2d05cb3c104a4d7147b72720aae317b0cc88b5 (patch)
treef405e302eab8ed474261a31eeaec23ce4574e878 /config-application-package
parent3ba6a9df0d1264486d575e83b404927f3eb177c1 (diff)
Do the obvious thing in MockFileRegistry when adding a file
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/MockFileRegistry.java2
-rw-r--r--config-application-package/src/test/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistryTestCase.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/MockFileRegistry.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/MockFileRegistry.java
index bba0c762558..b3d2b061430 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/MockFileRegistry.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/MockFileRegistry.java
@@ -19,7 +19,7 @@ public class MockFileRegistry implements FileRegistry {
public FileReference addFile(String relativePath) {
FileReference fileReference = new FileReference(relativePath);
- entries.add(new Entry("", fileReference));
+ entries.add(new Entry(relativePath, fileReference));
return fileReference;
}
diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistryTestCase.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistryTestCase.java
index da8300fd300..4b2f5890a4e 100644
--- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistryTestCase.java
+++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistryTestCase.java
@@ -7,6 +7,7 @@ import org.junit.Test;
import java.io.StringReader;
import java.util.List;
+import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -24,8 +25,7 @@ public class PreGeneratedFileRegistryTestCase {
PreGeneratedFileRegistry importedRegistry = PreGeneratedFileRegistry.importRegistry(new StringReader(serializedRegistry));
- FileReference fileReference = new FileReference("1234");
- assertTrue(importedRegistry.getPaths().containsAll(List.of("1234", fileReference)));
+ assertEquals(Set.of("1234"), importedRegistry.getPaths());
assertEquals(1, importedRegistry.getPaths().size());