Do not hardcode entries and source host in mock

* Use hostname of localhost if host not found and equal to localhost
  instead of hardcoded name for tests

2 files changed, 18 insertions, 29 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 e9c100938dd..bba0c762558 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
@@ -3,37 +3,30 @@ package com.yahoo.config.model.application.provider;
 
 import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.FileRegistry;
+import com.yahoo.net.HostName;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
 /**
  * A file registry for testing, and, it seems, doubling as a null registry in some code paths.
  *
  * @author Tony Vaagenes
+ * @author hmusum
  */
 public class MockFileRegistry implements FileRegistry {
+    private final List<Entry> entries = new ArrayList<>();
 
     public FileReference addFile(String relativePath) {
-        return new FileReference("0123456789abcdef");
+        FileReference fileReference = new FileReference(relativePath);
+        entries.add(new Entry("", fileReference));
+        return fileReference;
     }
 
     @Override
-    public String fileSourceHost() {
-        return "localhost.fortestingpurposesonly";
-    }
-
-    public static final Entry entry1 = new Entry("component/path1", new FileReference("1234"));
-    public static final Entry entry2 = new Entry("component/path2", new FileReference("56789"));
+    public String fileSourceHost() { return HostName.getLocalhost(); }
 
-    public List<Entry> export() {
-        List<Entry> result = new ArrayList<>();
-        result.add(entry1);
-        result.add(entry2);
-        return result;
-    }
+    public List<Entry> export() { return entries; }
 
     @Override
     public FileReference addUri(String uri) {
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 e2b75542a5f..da8300fd300 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
@@ -1,11 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.application.provider;
 
+import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.FileRegistry;
 import org.junit.Test;
 
 import java.io.StringReader;
-import java.util.Arrays;
+import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -14,27 +15,22 @@ import static org.junit.Assert.assertTrue;
  * @author Tony Vaagenes
  */
 public class PreGeneratedFileRegistryTestCase {
+
     @Test
     public void importAndExport() {
         FileRegistry fileRegistry = new MockFileRegistry();
+        fileRegistry.addFile("1234");
         String serializedRegistry = PreGeneratedFileRegistry.exportRegistry(fileRegistry);
 
-        PreGeneratedFileRegistry importedRegistry =
-                PreGeneratedFileRegistry.importRegistry(
-                        new StringReader(serializedRegistry));
-
-        assertTrue(importedRegistry.getPaths().containsAll(
-                Arrays.asList(
-                        MockFileRegistry.entry1.relativePath,
-                        MockFileRegistry.entry2.relativePath)));
+        PreGeneratedFileRegistry importedRegistry = PreGeneratedFileRegistry.importRegistry(new StringReader(serializedRegistry));
 
-        assertEquals(2, importedRegistry.getPaths().size());
+        FileReference fileReference = new FileReference("1234");
+        assertTrue(importedRegistry.getPaths().containsAll(List.of("1234", fileReference)));
 
-        checkConsistentEntry(MockFileRegistry.entry1, importedRegistry);
-        checkConsistentEntry(MockFileRegistry.entry2, importedRegistry);
+        assertEquals(1, importedRegistry.getPaths().size());
 
-        assertEquals(fileRegistry.fileSourceHost(),
-                importedRegistry.fileSourceHost());
+        checkConsistentEntry(fileRegistry.export().get(0), importedRegistry);
+        assertEquals(fileRegistry.fileSourceHost(), importedRegistry.fileSourceHost());
     }
 
     void checkConsistentEntry(FileRegistry.Entry entry, FileRegistry registry) {