aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-01-11 07:32:33 +0100
committerHarald Musum <musum@verizonmedia.com>2021-01-11 07:32:33 +0100
commite22afb2c116b4e9ffb0d49021aeede8ad4d56785 (patch)
tree2478ba14a1f12daed2407c45858f130255e31487 /configserver
parentcb9a88b27931b87e11161aa982657b9fb1016891 (diff)
Remove legacy test that is now identical to the ordinary test
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java28
1 files changed, 0 insertions, 28 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
index 965374f2aa4..c58bd6d6b0a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
@@ -83,34 +83,6 @@ public class SuperModelControllerTest {
}
@Test
- public void test_lb_config_multiple_apps_legacy_super_model() throws IOException, SAXException {
- Map<ApplicationId, ApplicationInfo> models = new LinkedHashMap<>();
- TenantName t1 = TenantName.from("t1");
- TenantName t2 = TenantName.from("t2");
- File testApp1 = new File("src/test/resources/deploy/app");
- File testApp2 = new File("src/test/resources/deploy/advancedapp");
- File testApp3 = new File("src/test/resources/deploy/advancedapp");
-
- ApplicationId simple = applicationId("mysimpleapp", t1);
- ApplicationId advanced = applicationId("myadvancedapp", t1);
- ApplicationId tooAdvanced = applicationId("minetooadvancedapp", t2);
- models.put(simple, createApplicationInfo(testApp1, simple, 4L));
- models.put(advanced, createApplicationInfo(testApp2, advanced, 4L));
- models.put(tooAdvanced, createApplicationInfo(testApp3, tooAdvanced, 4L));
-
- SuperModel superModel = new SuperModel(models, true);
- SuperModelController han = new SuperModelController(new SuperModelConfigProvider(superModel, Zone.defaultZone(), new InMemoryFlagSource()), new TestConfigDefinitionRepo(), 2, new UncompressedConfigResponseFactory());
- LbServicesConfig.Builder lb = new LbServicesConfig.Builder();
- han.getSuperModel().getConfig(lb);
- LbServicesConfig lbc = new LbServicesConfig(lb);
- assertThat(lbc.tenants().size(), is(2));
- assertThat(lbc.tenants("t1").applications().size(), is(2));
- assertThat(lbc.tenants("t2").applications().size(), is(1));
- assertThat(lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default").hosts().size(), is(1));
- assertQrServer(lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default"));
- }
-
- @Test
public void test_lb_config_multiple_apps() throws IOException, SAXException {
Map<ApplicationId, ApplicationInfo> models = new LinkedHashMap<>();
TenantName t1 = TenantName.from("t1");