aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/test/java/com/yahoo/container/di
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-01-25 13:45:33 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2022-01-25 13:45:33 +0100
commit144216ecb6712be44fb1dce5ab637159750bc9b3 (patch)
tree4da8a163500038dd06b424e73459e6538c94dd61 /container-core/src/test/java/com/yahoo/container/di
parent1608bedc17ea020f0a5a4834552aded54e82ab5d (diff)
Rename methods to 'waitForNextGraphGeneration'
Diffstat (limited to 'container-core/src/test/java/com/yahoo/container/di')
-rw-r--r--container-core/src/test/java/com/yahoo/container/di/ContainerTest.java4
-rw-r--r--container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
index 020aa1e1ae4..35c2e8f25c6 100644
--- a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
@@ -333,13 +333,13 @@ public class ContainerTest extends ContainerTestBase {
}
ComponentGraph getNewComponentGraph(Container container, ComponentGraph oldGraph) {
- Container.ComponentGraphResult result = container.waitForNextComponentGeneration(oldGraph, Guice.createInjector(), true);
+ Container.ComponentGraphResult result = container.waitForNextGraphGeneration(oldGraph, Guice.createInjector(), true);
result.oldComponentsCleanupTask().run();
return result.newGraph();
}
ComponentGraph getNewComponentGraph(Container container) {
- return container.waitForNextComponentGeneration(new ComponentGraph(), Guice.createInjector(), true).newGraph();
+ return container.waitForNextGraphGeneration(new ComponentGraph(), Guice.createInjector(), true).newGraph();
}
private ComponentTakingConfig createComponentTakingConfig(ComponentGraph componentGraph) {
diff --git a/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java
index 4f4ffe3732a..e7f12d3f228 100644
--- a/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTestBase.java
@@ -65,7 +65,7 @@ public class ContainerTestBase {
throw new UnsupportedOperationException("getBundle not supported.");
}
});
- Container.ComponentGraphResult result = container.waitForNextComponentGeneration(this.componentGraph, Guice.createInjector(), true);
+ Container.ComponentGraphResult result = container.waitForNextGraphGeneration(this.componentGraph, Guice.createInjector(), true);
result.oldComponentsCleanupTask().run();
this.componentGraph = result.newGraph();
} catch (Exception e) {