aboutsummaryrefslogtreecommitdiffstats
path: root/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java')
-rw-r--r--config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java18
1 files changed, 8 insertions, 10 deletions
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
index 1b0bc858361..270c618ee1b 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
@@ -4,7 +4,6 @@ package com.yahoo.config.subscription;
import com.yahoo.config.ConfigInstance;
import com.yahoo.config.ConfigurationRuntimeException;
import com.yahoo.config.subscription.impl.ConfigSubscription;
-import com.yahoo.config.subscription.impl.JrtConfigRequesters;
import com.yahoo.foo.AppConfig;
import com.yahoo.foo.SimpletypesConfig;
import com.yahoo.vespa.config.ConfigKey;
@@ -30,10 +29,9 @@ public class ConfigSubscriptionTest {
public void testEquals() {
ConfigSubscriber sub = new ConfigSubscriber();
- JrtConfigRequesters requesters = new JrtConfigRequesters();
- ConfigSubscription<SimpletypesConfig> a = createSubscription(requesters, "test");
- ConfigSubscription<SimpletypesConfig> b = createSubscription(requesters, "test");
- ConfigSubscription<SimpletypesConfig> c = createSubscription(requesters, "test2");
+ ConfigSubscription<SimpletypesConfig> a = createSubscription(sub, "test");
+ ConfigSubscription<SimpletypesConfig> b = createSubscription(sub, "test");
+ ConfigSubscription<SimpletypesConfig> c = createSubscription(sub, "test2");
assertEquals(b, a);
assertEquals(a, a);
assertEquals(b, b);
@@ -41,21 +39,21 @@ public class ConfigSubscriptionTest {
assertNotEquals(c, a);
assertNotEquals(c, b);
+ ConfigSubscriber subscriber = new ConfigSubscriber();
ConfigSet configSet = new ConfigSet();
AppConfig.Builder a0builder = new AppConfig.Builder().message("A message, 0").times(88);
configSet.addBuilder("app/0", a0builder);
AppConfig.Builder a1builder = new AppConfig.Builder().message("A message, 1").times(89);
configSet.addBuilder("app/1", a1builder);
-
ConfigSubscription<AppConfig> c1 = ConfigSubscription.get(
new ConfigKey<>(AppConfig.class, "app/0"),
- requesters,
+ subscriber,
configSet,
new TimingValues());
ConfigSubscription<AppConfig> c2 = ConfigSubscription.get(
new ConfigKey<>(AppConfig.class, "app/1"),
- requesters,
+ subscriber,
configSet,
new TimingValues());
@@ -88,9 +86,9 @@ public class ConfigSubscriptionTest {
}
}
- private ConfigSubscription<SimpletypesConfig> createSubscription(JrtConfigRequesters requesters, String configId) {
+ private ConfigSubscription<SimpletypesConfig> createSubscription(ConfigSubscriber sub, String configId) {
return ConfigSubscription.get(new ConfigKey<>(SimpletypesConfig.class, configId),
- requesters, new RawSource("boolval true"), new TimingValues());
+ sub, new RawSource("boolval true"), new TimingValues());
}
private static class TestConfigSubscriber extends ConfigSubscriber {