diff options
Diffstat (limited to 'config/src/test/java/com')
7 files changed, 75 insertions, 83 deletions
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSetSubscriptionTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSetSubscriptionTest.java index 0d9b8745888..346368ee7d9 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigSetSubscriptionTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSetSubscriptionTest.java @@ -2,6 +2,7 @@ package com.yahoo.config.subscription; 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.foo.StringConfig; @@ -18,21 +19,21 @@ public class ConfigSetSubscriptionTest { @Test public void testConfigSubscription() { - 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); + JrtConfigRequesters requesters = new JrtConfigRequesters(); ConfigSubscription<AppConfig> c1 = ConfigSubscription.get( new ConfigKey<>(AppConfig.class, "app/0"), - subscriber, + requesters, configSet, new TimingValues()); ConfigSubscription<AppConfig> c2 = ConfigSubscription.get( new ConfigKey<>(AppConfig.class, "app/1"), - subscriber, + requesters, configSet, new TimingValues()); @@ -42,14 +43,13 @@ public class ConfigSetSubscriptionTest { @Test(expected = IllegalArgumentException.class) public void testUnknownKey() { - 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); ConfigSubscription.get( new ConfigKey<>(SimpletypesConfig.class, "simpletypes/1"), - subscriber, + new JrtConfigRequesters(), configSet, new TimingValues()); } 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 270c618ee1b..1b0bc858361 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java @@ -4,6 +4,7 @@ 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; @@ -29,9 +30,10 @@ public class ConfigSubscriptionTest { public void testEquals() { ConfigSubscriber sub = new ConfigSubscriber(); - ConfigSubscription<SimpletypesConfig> a = createSubscription(sub, "test"); - ConfigSubscription<SimpletypesConfig> b = createSubscription(sub, "test"); - ConfigSubscription<SimpletypesConfig> c = createSubscription(sub, "test2"); + JrtConfigRequesters requesters = new JrtConfigRequesters(); + ConfigSubscription<SimpletypesConfig> a = createSubscription(requesters, "test"); + ConfigSubscription<SimpletypesConfig> b = createSubscription(requesters, "test"); + ConfigSubscription<SimpletypesConfig> c = createSubscription(requesters, "test2"); assertEquals(b, a); assertEquals(a, a); assertEquals(b, b); @@ -39,21 +41,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"), - subscriber, + requesters, configSet, new TimingValues()); ConfigSubscription<AppConfig> c2 = ConfigSubscription.get( new ConfigKey<>(AppConfig.class, "app/1"), - subscriber, + requesters, configSet, new TimingValues()); @@ -86,9 +88,9 @@ public class ConfigSubscriptionTest { } } - private ConfigSubscription<SimpletypesConfig> createSubscription(ConfigSubscriber sub, String configId) { + private ConfigSubscription<SimpletypesConfig> createSubscription(JrtConfigRequesters requesters, String configId) { return ConfigSubscription.get(new ConfigKey<>(SimpletypesConfig.class, configId), - sub, new RawSource("boolval true"), new TimingValues()); + requesters, new RawSource("boolval true"), new TimingValues()); } private static class TestConfigSubscriber extends ConfigSubscriber { diff --git a/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java b/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java index 5fada55be28..fc922cc3b07 100644 --- a/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java @@ -6,14 +6,15 @@ import com.yahoo.config.subscription.impl.GenericConfigSubscriber; import com.yahoo.config.subscription.impl.JRTConfigRequester; import com.yahoo.config.subscription.impl.JRTConfigRequesterTest; import com.yahoo.config.subscription.impl.MockConnection; +import com.yahoo.jrt.Supervisor; +import com.yahoo.jrt.Transport; import com.yahoo.vespa.config.ConfigKey; +import com.yahoo.vespa.config.JRTConnectionPool; import com.yahoo.vespa.config.TimingValues; import com.yahoo.vespa.config.protocol.CompressionType; import org.junit.Test; -import java.util.HashMap; import java.util.List; -import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,14 +31,11 @@ public class GenericConfigSubscriberTest { @Test public void testSubscribeGeneric() throws InterruptedException { - Map<ConfigSourceSet, JRTConfigRequester> requesters = new HashMap<>(); - ConfigSourceSet sourceSet = new ConfigSourceSet("blabla"); - requesters.put(sourceSet, new JRTConfigRequester(new MockConnection(), tv)); - GenericConfigSubscriber sub = new GenericConfigSubscriber(requesters); + JRTConfigRequester requester = new JRTConfigRequester(new MockConnection(), tv); + GenericConfigSubscriber sub = new GenericConfigSubscriber(requester); final List<String> defContent = List.of("myVal int"); GenericConfigHandle handle = sub.subscribe(new ConfigKey<>("simpletypes", "id", "config"), defContent, - sourceSet, tv); assertTrue(sub.nextConfig(false)); assertTrue(handle.isChanged()); @@ -75,9 +73,7 @@ public class GenericConfigSubscriberTest { } private GenericConfigSubscriber createSubscriber() { - return new GenericConfigSubscriber(Map.of( - new ConfigSourceSet("blabla"), - new JRTConfigRequester(new MockConnection(), JRTConfigRequesterTest.getTestTimingValues()))); + return new GenericConfigSubscriber(new JRTConfigRequester(new JRTConnectionPool(new ConfigSourceSet("foo"), new Supervisor(new Transport())), tv)); } } diff --git a/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java b/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java index 15f39f590aa..74af35e39dc 100644 --- a/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.subscription.impl; -import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.config.subscription.DirSource; import com.yahoo.foo.SimpletypesConfig; import com.yahoo.foo.TestReferenceConfig; @@ -98,8 +97,10 @@ public class FileConfigSubscriptionTest { final String cfgDir = "src/test/resources/configs/foo"; final String cfgId = "dir:" + cfgDir; final ConfigKey<TestReferenceConfig> key = new ConfigKey<>(TestReferenceConfig.class, cfgId); - ConfigSubscriber subscriber = new ConfigSubscriber(); - ConfigSubscription<TestReferenceConfig> sub = ConfigSubscription.get(key, subscriber, new DirSource(new File(cfgDir)), new TimingValues()); + ConfigSubscription<TestReferenceConfig> sub = ConfigSubscription.get(key, + new JrtConfigRequesters(), + new DirSource(new File(cfgDir)), + new TimingValues()); assertTrue(sub.nextConfig(1000)); assertThat(sub.getConfigState().getConfig().configId(), is(cfgId)); } diff --git a/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java b/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java index 62a25fadf25..dca0c2d0018 100644 --- a/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/impl/JRTConfigRequesterTest.java @@ -2,7 +2,6 @@ package com.yahoo.config.subscription.impl; import com.yahoo.config.subscription.ConfigSourceSet; -import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.foo.SimpletypesConfig; import com.yahoo.jrt.Request; import com.yahoo.vespa.config.ConfigKey; @@ -51,12 +50,11 @@ public class JRTConfigRequesterTest { @Test public void testFirstRequestAfterSubscribing() { - ConfigSubscriber subscriber = new ConfigSubscriber(); - final TimingValues timingValues = getTestTimingValues(); - JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(subscriber, timingValues); - - final MockConnection connection = new MockConnection(); + TimingValues timingValues = getTestTimingValues(); + MockConnection connection = new MockConnection(); JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); + JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(requester, timingValues); + assertEquals(requester.getConnectionPool(), connection); requester.request(sub); final Request request = connection.getRequest(); @@ -70,25 +68,24 @@ public class JRTConfigRequesterTest { @Test public void testFatalError() { - ConfigSubscriber subscriber = new ConfigSubscriber(); final TimingValues timingValues = getTestTimingValues(); final MockConnection connection = new MockConnection(new ErrorResponseHandler()); JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); - requester.request(createSubscription(subscriber, timingValues)); + requester.request(createSubscription(requester, timingValues)); waitUntilResponse(connection); assertEquals(1, requester.getFailures()); } @Test public void testFatalErrorSubscribed() { - ConfigSubscriber subscriber = new ConfigSubscriber(); - final TimingValues timingValues = getTestTimingValues(); - JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(subscriber, timingValues); + TimingValues timingValues = getTestTimingValues(); + MockConnection connection = new MockConnection(new ErrorResponseHandler()); + JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); + + JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(requester, timingValues); sub.setConfig(1L, false, config(), PayloadChecksums.empty()); - final MockConnection connection = new MockConnection(new ErrorResponseHandler()); - JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); requester.request(sub); waitUntilResponse(connection); assertEquals(1, requester.getFailures()); @@ -96,25 +93,23 @@ public class JRTConfigRequesterTest { @Test public void testTransientError() { - ConfigSubscriber subscriber = new ConfigSubscriber(); - final TimingValues timingValues = getTestTimingValues(); + TimingValues timingValues = getTestTimingValues(); - final MockConnection connection = new MockConnection(new ErrorResponseHandler(com.yahoo.jrt.ErrorCode.TIMEOUT)); + MockConnection connection = new MockConnection(new ErrorResponseHandler(com.yahoo.jrt.ErrorCode.TIMEOUT)); JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); - requester.request(createSubscription(subscriber, timingValues)); + requester.request(createSubscription(requester, timingValues)); waitUntilResponse(connection); assertEquals(1, requester.getFailures()); } @Test public void testTransientErrorSubscribed() { - ConfigSubscriber subscriber = new ConfigSubscriber(); - final TimingValues timingValues = getTestTimingValues(); - JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(subscriber, timingValues); + TimingValues timingValues = getTestTimingValues(); + MockConnection connection = new MockConnection(new ErrorResponseHandler(com.yahoo.jrt.ErrorCode.TIMEOUT)); + JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); + JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(requester, timingValues); sub.setConfig(1L, false, config(), PayloadChecksums.empty()); - final MockConnection connection = new MockConnection(new ErrorResponseHandler(com.yahoo.jrt.ErrorCode.TIMEOUT)); - JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); requester.request(sub); waitUntilResponse(connection); assertEquals(1, requester.getFailures()); @@ -122,13 +117,12 @@ public class JRTConfigRequesterTest { @Test public void testUnknownConfigDefinitionError() { - ConfigSubscriber subscriber = new ConfigSubscriber(); - final TimingValues timingValues = getTestTimingValues(); - JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(subscriber, timingValues); + TimingValues timingValues = getTestTimingValues(); + MockConnection connection = new MockConnection(new ErrorResponseHandler(ErrorCode.UNKNOWN_DEFINITION)); + JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); + JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(requester, timingValues); sub.setConfig(1L, false, config(), PayloadChecksums.empty()); - final MockConnection connection = new MockConnection(new ErrorResponseHandler(ErrorCode.UNKNOWN_DEFINITION)); - JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); assertEquals(requester.getConnectionPool(), connection); requester.request(sub); waitUntilResponse(connection); @@ -137,13 +131,12 @@ public class JRTConfigRequesterTest { @Test public void testClosedSubscription() { - ConfigSubscriber subscriber = new ConfigSubscriber(); - final TimingValues timingValues = getTestTimingValues(); - JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(subscriber, timingValues); + TimingValues timingValues = getTestTimingValues(); + MockConnection connection = new MockConnection(new MockConnection.OKResponseHandler()); + JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); + JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(requester, timingValues); sub.close(); - final MockConnection connection = new MockConnection(new MockConnection.OKResponseHandler()); - JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); requester.request(sub); assertEquals(1, connection.getNumberOfRequests()); // Check that no further request was sent? @@ -157,16 +150,14 @@ public class JRTConfigRequesterTest { @Test public void testTimeout() { - ConfigSubscriber subscriber = new ConfigSubscriber(); - final TimingValues timingValues = getTestTimingValues(); - JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(subscriber, timingValues); + TimingValues timingValues = getTestTimingValues(); + MockConnection connection = new MockConnection(new DelayedResponseHandler(timingValues.getSubscribeTimeout()), + 2); // fake that we have more than one source + JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); + JRTConfigSubscription<SimpletypesConfig> sub = createSubscription(requester, timingValues); sub.close(); - final MockConnection connection = new MockConnection( - new DelayedResponseHandler(timingValues.getSubscribeTimeout()), - 2); // fake that we have more than one source - JRTConfigRequester requester = new JRTConfigRequester(connection, timingValues); - requester.request(createSubscription(subscriber, timingValues)); + requester.request(createSubscription(requester, timingValues)); // Check that no further request was sent? try { Thread.sleep(timingValues.getFixedDelay()*2); @@ -175,9 +166,10 @@ public class JRTConfigRequesterTest { } } - private JRTConfigSubscription<SimpletypesConfig> createSubscription(ConfigSubscriber subscriber, TimingValues timingValues) { - return new JRTConfigSubscription<>( - new ConfigKey<>(SimpletypesConfig.class, "testid"), subscriber, null, timingValues); + private JRTConfigSubscription<SimpletypesConfig> createSubscription(JRTConfigRequester requester, TimingValues timingValues) { + return new JRTConfigSubscription<>(new ConfigKey<>(SimpletypesConfig.class, "testid"), + requester, + timingValues); } private SimpletypesConfig config() { diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java index 4f7b1df5a43..14183aa087a 100644 --- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java @@ -2,10 +2,11 @@ package com.yahoo.vespa.config.protocol; import com.yahoo.config.subscription.ConfigSourceSet; -import com.yahoo.config.subscription.ConfigSubscriber; +import com.yahoo.config.subscription.impl.JRTConfigRequester; import com.yahoo.config.subscription.impl.JRTConfigSubscription; import com.yahoo.foo.FunctionTestConfig; import com.yahoo.vespa.config.ConfigKey; +import com.yahoo.vespa.config.JRTConnectionPool; import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.TimingValues; import org.junit.Test; @@ -42,11 +43,13 @@ public class JRTConfigRequestFactoryTest { @Test public void testCreateFromSub() { - ConfigSubscriber subscriber = new ConfigSubscriber(); Class<FunctionTestConfig> clazz = FunctionTestConfig.class; final String configId = "foo"; - JRTConfigSubscription<FunctionTestConfig> sub = new JRTConfigSubscription<>( - new ConfigKey<>(clazz, configId), subscriber, new ConfigSourceSet(), new TimingValues()); + TimingValues timingValues = new TimingValues(); + JRTConfigSubscription<FunctionTestConfig> sub = + new JRTConfigSubscription<>(new ConfigKey<>(clazz, configId), + new JRTConfigRequester(new JRTConnectionPool(new ConfigSourceSet("tcp/localhost:12345")), timingValues), + timingValues); JRTClientConfigRequest request = JRTConfigRequestFactory.createFromSub(sub); assertThat(request.getVespaVersion().get(), is(defaultVespaVersion)); diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java index 5f2a5c73fa5..dabd87e1eec 100644 --- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java +++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java @@ -2,8 +2,6 @@ package com.yahoo.vespa.config.protocol; import com.yahoo.config.subscription.ConfigSourceSet; -import com.yahoo.config.subscription.ConfigSubscriber; -import com.yahoo.config.subscription.impl.GenericConfigSubscriber; import com.yahoo.config.subscription.impl.JRTConfigRequester; import com.yahoo.config.subscription.impl.JRTConfigSubscription; import com.yahoo.config.subscription.impl.MockConnection; @@ -16,6 +14,7 @@ import com.yahoo.test.ManualClock; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.ErrorCode; +import com.yahoo.vespa.config.JRTConnectionPool; import com.yahoo.vespa.config.PayloadChecksums; import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.TimingValues; @@ -23,7 +22,6 @@ import com.yahoo.vespa.config.util.ConfigUtils; import org.junit.Before; import org.junit.Test; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -190,12 +188,11 @@ public class JRTConfigRequestV3Test { @Test public void created_from_subscription() { - ConfigSubscriber subscriber = new ConfigSubscriber(); + TimingValues timingValues = new TimingValues(); JRTConfigSubscription<SimpletypesConfig> sub = new JRTConfigSubscription<>(new ConfigKey<>(SimpletypesConfig.class, configId), - subscriber, - new ConfigSourceSet(), - new TimingValues()); + new JRTConfigRequester(new JRTConnectionPool(new ConfigSourceSet("tcp/localhost:985")), timingValues), + timingValues); JRTClientConfigRequest request = createReq(sub, Trace.createNew(9)); assertThat(request.getConfigKey().getName(), is(SimpletypesConfig.CONFIG_DEF_NAME)); JRTServerConfigRequest serverRequest = createReq(request.getRequest()); @@ -212,9 +209,10 @@ public class JRTConfigRequestV3Test { } }); - ConfigSourceSet src = new ConfigSourceSet(); - ConfigSubscriber subscriber = new GenericConfigSubscriber(Collections.singletonMap(src, new JRTConfigRequester(connection, new TimingValues()))); - JRTConfigSubscription<SimpletypesConfig> sub = new JRTConfigSubscription<>(new ConfigKey<>(SimpletypesConfig.class, configId), subscriber, src, new TimingValues()); + TimingValues timingValues = new TimingValues(); + JRTConfigSubscription<SimpletypesConfig> sub = new JRTConfigSubscription<>(new ConfigKey<>(SimpletypesConfig.class, configId), + new JRTConfigRequester(connection, timingValues), + timingValues); sub.subscribe(120_0000); assertTrue(sub.nextConfig(120_0000)); sub.close(); |