diff options
10 files changed, 34 insertions, 28 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java index 39e9617b12c..dac1f1ed15a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java @@ -75,18 +75,13 @@ public class VespaModelFactory implements ModelFactory { } // For testing only - public VespaModelFactory(ConfigModelRegistry configModelRegistry) { - this(configModelRegistry, Clock.systemUTC()); - } - - // For testing only - public VespaModelFactory(ConfigModelRegistry configModelRegistry, Clock clock) { + protected VespaModelFactory(ConfigModelRegistry configModelRegistry) { this(new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), configModelRegistry, - clock, Zone.defaultZone()); + Clock.systemUTC(), Zone.defaultZone()); } // For testing only - public VespaModelFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock, Zone zone) { + private VespaModelFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock, Zone zone) { this.version = version; if (configModelRegistry == null) { this.configModelRegistry = new NullConfigModelRegistry(); @@ -100,6 +95,18 @@ public class VespaModelFactory implements ModelFactory { this.clock = clock; } + public static VespaModelFactory createTestFactory() { + return createTestFactory(new NullConfigModelRegistry(), Clock.systemUTC()); + } + public static VespaModelFactory createTestFactory(ConfigModelRegistry configModelRegistry, Clock clock) { + return createTestFactory(new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), configModelRegistry, + clock, Zone.defaultZone()); + } + + public static VespaModelFactory createTestFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock, Zone zone) { + return new VespaModelFactory(version, configModelRegistry, clock, zone); + } + /** Returns the version this model is build for */ @Override public Version version() { return version; } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java index bff90080115..104fdea0e40 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java @@ -44,7 +44,7 @@ public class VespaModelFactoryTest { @Test public void testThatFactoryCanBuildModel() { - VespaModelFactory modelFactory = new VespaModelFactory(new NullConfigModelRegistry()); + VespaModelFactory modelFactory = VespaModelFactory.createTestFactory(); Model model = modelFactory.createModel(testModelContext); assertNotNull(model); assertTrue(model instanceof VespaModel); @@ -53,20 +53,20 @@ public class VespaModelFactoryTest { // Uses an application package that throws IllegalArgumentException when validating @Test(expected = IllegalArgumentException.class) public void testThatFactoryModelValidationFailsWithIllegalArgumentException() { - VespaModelFactory modelFactory = new VespaModelFactory(new NullConfigModelRegistry()); + VespaModelFactory modelFactory = VespaModelFactory.createTestFactory(); modelFactory.createAndValidateModel(new MockModelContext(createApplicationPackageThatFailsWhenValidating()), new ValidationParameters()); } // Uses a MockApplicationPackage that throws throws UnsupportedOperationException (rethrown as RuntimeException) when validating @Test(expected = RuntimeException.class) public void testThatFactoryModelValidationFails() { - VespaModelFactory modelFactory = new VespaModelFactory(new NullConfigModelRegistry()); + VespaModelFactory modelFactory = VespaModelFactory.createTestFactory(); modelFactory.createAndValidateModel(testModelContext, new ValidationParameters()); } @Test public void testThatFactoryModelValidationCanBeIgnored() { - VespaModelFactory modelFactory = new VespaModelFactory(new NullConfigModelRegistry()); + VespaModelFactory modelFactory = VespaModelFactory.createTestFactory(); ModelCreateResult createResult = modelFactory.createAndValidateModel( new MockModelContext(createApplicationPackageThatFailsWhenValidating()), new ValidationParameters(ValidationParameters.IgnoreValidationErrors.TRUE)); @@ -118,7 +118,7 @@ public class VespaModelFactoryTest { }; ModelContext modelContext = createMockModelContext(hosts, services, provisionerToOverride); - Model model = new VespaModelFactory(new NullConfigModelRegistry()).createModel(modelContext); + Model model = VespaModelFactory.createTestFactory().createModel(modelContext); List<HostInfo> allocatedHosts = new ArrayList<>(model.getHosts()); assertEquals(1, allocatedHosts.size()); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index 17a0a2e3cab..d9ca31d561d 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -627,7 +627,7 @@ public class ApplicationRepositoryTest { @Test public void testResolveForAppId() { - Version vespaVersion = new VespaModelFactory(new NullConfigModelRegistry()).version(); + Version vespaVersion = VespaModelFactory.createTestFactory().version(); applicationRepository.deploy(app1, new PrepareParams.Builder() .applicationId(applicationId()) .vespaVersion(vespaVersion) @@ -639,7 +639,7 @@ public class ApplicationRepositoryTest { @Test public void testResolveConfigForMultipleApps() { - Version vespaVersion = new VespaModelFactory(new NullConfigModelRegistry()).version(); + Version vespaVersion = VespaModelFactory.createTestFactory().version(); applicationRepository.deploy(app1, new PrepareParams.Builder() .applicationId(applicationId()) .vespaVersion(vespaVersion) @@ -670,7 +670,7 @@ public class ApplicationRepositoryTest { @Test public void testResolveMultipleVersions() { - Version vespaVersion = new VespaModelFactory(new NullConfigModelRegistry()).version(); + Version vespaVersion = VespaModelFactory.createTestFactory().version(); applicationRepository.deploy(app1, new PrepareParams.Builder() .applicationId(applicationId()) .vespaVersion(vespaVersion) @@ -686,7 +686,7 @@ public class ApplicationRepositoryTest { @Test public void testResolveForDeletedApp() { - Version vespaVersion = new VespaModelFactory(new NullConfigModelRegistry()).version(); + Version vespaVersion = VespaModelFactory.createTestFactory().version(); applicationRepository.deploy(app1, new PrepareParams.Builder() .applicationId(applicationId()) .vespaVersion(vespaVersion) diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java index 93637536182..abb8f9a9df3 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java @@ -68,7 +68,7 @@ import static org.junit.Assert.fail; public class TenantApplicationsTest { private static final TenantName tenantName = TenantName.from("tenant"); - private static final Version vespaVersion = new VespaModelFactory(new NullConfigModelRegistry()).version(); + private static final Version vespaVersion = VespaModelFactory.createTestFactory().version(); private Curator curator; private CuratorFramework curatorFramework; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java index 0ae4c43695c..4b03847571f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java @@ -215,19 +215,19 @@ public class DeployTester { private int creationCount; public CountingModelFactory(Clock clock) { - this.wrapped = new VespaModelFactory(new NullConfigModelRegistry(), clock); + this.wrapped = VespaModelFactory.createTestFactory(new NullConfigModelRegistry(), clock); } public CountingModelFactory(Version version, Clock clock, Zone zone) { - this.wrapped = new VespaModelFactory(version, new NullConfigModelRegistry(), clock, zone); + this.wrapped = VespaModelFactory.createTestFactory(version, new NullConfigModelRegistry(), clock, zone); } public CountingModelFactory(ConfigModelRegistry registry, Clock clock) { - this.wrapped = new VespaModelFactory(registry, clock); + this.wrapped = VespaModelFactory.createTestFactory(registry, clock); } public CountingModelFactory(ConfigModelRegistry registry, Version version, Clock clock, Zone zone) { - this.wrapped = new VespaModelFactory(version, registry, clock, zone); + this.wrapped = VespaModelFactory.createTestFactory(version, registry, clock, zone); } /** Returns the number of models created successfully by this instance */ diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java index ed739d73860..0a8aeed7970 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java @@ -27,7 +27,7 @@ public class StatusHandlerTest { @Test public void require_that_handler_works() throws IOException { - ModelFactoryRegistry modelFactoryRegistry = new ModelFactoryRegistry(List.of(new VespaModelFactory(new NullConfigModelRegistry()))); + ModelFactoryRegistry modelFactoryRegistry = new ModelFactoryRegistry(List.of(VespaModelFactory.createTestFactory())); ConfigserverConfig configserverConfig = new ConfigserverConfig.Builder().build(); StatusHandler handler = new StatusHandler(StatusHandler.testContext(), modelFactoryRegistry, configserverConfig); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/TestModelFactory.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/TestModelFactory.java index b5e88297a3a..ac7c4bf92ae 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/TestModelFactory.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/TestModelFactory.java @@ -18,8 +18,7 @@ public class TestModelFactory extends VespaModelFactory { private ModelContext modelContext; public TestModelFactory(Version vespaVersion) { - super(new NullConfigModelRegistry()); - this.vespaVersion = vespaVersion; + this(new NullConfigModelRegistry(), vespaVersion); } public TestModelFactory(ConfigModelRegistry registry, Version vespaVersion) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java index 40f0b9c6e71..89f1548e9eb 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java @@ -83,7 +83,7 @@ public class SessionRepositoryTest { public ExpectedException expectedException = ExpectedException.none(); public void setup() throws Exception { - setup(new ModelFactoryRegistry(List.of(new VespaModelFactory(new NullConfigModelRegistry())))); + setup(new ModelFactoryRegistry(List.of(VespaModelFactory.createTestFactory()))); } private void setup(ModelFactoryRegistry modelFactoryRegistry) throws Exception { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java index 1a394bbb8cd..86f8dc03af3 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java @@ -222,7 +222,7 @@ public class TenantRepositoryTest { new ConfigServerDB(configserverConfig), Zone.defaultZone(), Clock.systemUTC(), - new ModelFactoryRegistry(List.of(new VespaModelFactory(new NullConfigModelRegistry()))), + new ModelFactoryRegistry(List.of(VespaModelFactory.createTestFactory())), new TestConfigDefinitionRepo(), new TenantApplicationsTest.MockReloadListener(), new MockTenantListener(), diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java index cd92248f00c..42bb62b06c2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java @@ -76,7 +76,7 @@ public class TestTenantRepository extends TenantRepository { FileDistributionFactory fileDistributionFactory = null; FlagSource flagSource = new InMemoryFlagSource(); HostProvisionerProvider hostProvisionerProvider = HostProvisionerProvider.empty(); - ModelFactoryRegistry modelFactoryRegistry = new ModelFactoryRegistry(List.of(new VespaModelFactory(new NullConfigModelRegistry()))); + ModelFactoryRegistry modelFactoryRegistry = new ModelFactoryRegistry(List.of(VespaModelFactory.createTestFactory())); ConfigserverConfig configserverConfig = new ConfigserverConfig.Builder().build(); ReloadListener reloadListener = new TenantApplicationsTest.MockReloadListener(); TenantListener tenantListener = new MockTenantListener(); |