diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-07-12 08:32:59 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-07-12 08:32:59 +0200 |
commit | 3ba6a9df0d1264486d575e83b404927f3eb177c1 (patch) | |
tree | ff5cae4e40ff4b298133403a1b4668f972e7dc22 /config-application-package/src/main/java/com/yahoo/config | |
parent | e9656bd66a67c38add039e7feccbd1fbc39614fb (diff) |
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
Diffstat (limited to 'config-application-package/src/main/java/com/yahoo/config')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/MockFileRegistry.java | 23 |
1 files changed, 8 insertions, 15 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) { |