diff options
author | Harald Musum <musum@yahooinc.com> | 2021-11-29 22:16:15 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-11-29 22:16:15 +0100 |
commit | ca2dc28d3cbf24917d19721469ce596f4d9cf159 (patch) | |
tree | 45d64feedd5fd6179f4b9425b76d827a0b3b2c29 /config/src/test | |
parent | 2073de457281adee18c5c310644bb4169bd3af7a (diff) |
Simplify ConfigSubscription
COnfigSubscriber isn't needed for all subscription (used only in equals method,
whoch is only used by tests)
Diffstat (limited to 'config/src/test')
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/ConfigSetSubscriptionTest.java | 9 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java | 11 |
2 files changed, 8 insertions, 12 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 0eb51e734c8..0d9b8745888 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigSetSubscriptionTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSetSubscriptionTest.java @@ -1,16 +1,19 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.subscription; -import static org.junit.Assert.*; - +import com.yahoo.config.subscription.impl.ConfigSubscription; import com.yahoo.foo.AppConfig; import com.yahoo.foo.SimpletypesConfig; import com.yahoo.foo.StringConfig; -import com.yahoo.config.subscription.impl.ConfigSubscription; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.TimingValues; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + public class ConfigSetSubscriptionTest { @Test 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 3eb532d8f7f..15f39f590aa 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,11 +1,10 @@ // 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.foo.SimpletypesConfig; -import com.yahoo.foo.TestReferenceConfig; import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.config.subscription.DirSource; -import com.yahoo.config.subscription.FileSource; +import com.yahoo.foo.SimpletypesConfig; +import com.yahoo.foo.TestReferenceConfig; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.TimingValues; import org.junit.Before; @@ -43,10 +42,8 @@ public class FileConfigSubscriptionTest { @Test public void require_that_new_config_is_detected_in_time() throws IOException, InterruptedException { writeConfig("intval", "23"); - ConfigSubscriber subscriber = new ConfigSubscriber(new FileSource(TEST_TYPES_FILE)); ConfigSubscription<SimpletypesConfig> sub = new FileConfigSubscription<>( new ConfigKey<>(SimpletypesConfig.class, ""), - subscriber, TEST_TYPES_FILE); assertTrue(sub.nextConfig(1000)); assertThat(sub.getConfigState().getConfig().intval(), is(23)); @@ -59,10 +56,8 @@ public class FileConfigSubscriptionTest { @Test public void require_that_new_config_is_detected_on_reload() throws IOException { writeConfig("intval", "23"); - ConfigSubscriber subscriber = new ConfigSubscriber(new FileSource(TEST_TYPES_FILE)); ConfigSubscription<SimpletypesConfig> sub = new FileConfigSubscription<>( new ConfigKey<>(SimpletypesConfig.class, ""), - subscriber, TEST_TYPES_FILE); assertTrue(sub.nextConfig(1000)); assertThat(sub.getConfigState().getConfig().intval(), is(23)); @@ -113,10 +108,8 @@ public class FileConfigSubscriptionTest { public void require_that_bad_file_throws_exception() throws IOException { // A little trick to ensure that we can create the subscriber, but that we get an error when reading. writeConfig("intval", "23"); - ConfigSubscriber subscriber = new ConfigSubscriber(new FileSource(TEST_TYPES_FILE)); ConfigSubscription<SimpletypesConfig> sub = new FileConfigSubscription<>( new ConfigKey<>(SimpletypesConfig.class, ""), - subscriber, TEST_TYPES_FILE); sub.reload(1); Files.delete(TEST_TYPES_FILE.toPath()); // delete file so the below statement throws exception |