summaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java')
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java b/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java
index 34da6e588be..85c5f5ece45 100644
--- a/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java
@@ -64,10 +64,10 @@ public class ModelGraphTest {
ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BC()).addBuilder(new GraphMock.BB()).addBuilder(new GraphMock.BA()).build();
List<ModelNode> nodes = graph.topologicalSort();
MockRoot root = new MockRoot();
- GraphMock.A a = (GraphMock.A) nodes.get(0).createModel(ConfigModelContext.create(null, root, "first"));
- GraphMock.B b = (GraphMock.B) nodes.get(1).createModel(ConfigModelContext.create(null, root, "second"));
- GraphMock.B b2 = (GraphMock.B) nodes.get(1).createModel(ConfigModelContext.create(null, root, "second2"));
- GraphMock.C c = (GraphMock.C) nodes.get(2).createModel(ConfigModelContext.create(null, root, "third"));
+ GraphMock.A a = (GraphMock.A) nodes.get(0).createModel(ConfigModelContext.create(null, null, root, "first"));
+ GraphMock.B b = (GraphMock.B) nodes.get(1).createModel(ConfigModelContext.create(null, null, root, "second"));
+ GraphMock.B b2 = (GraphMock.B) nodes.get(1).createModel(ConfigModelContext.create(null, null, root, "second2"));
+ GraphMock.C c = (GraphMock.C) nodes.get(2).createModel(ConfigModelContext.create(null, null, root, "third"));
assertNotNull(a);
assertNotNull(b);
assertNotNull(b2);
@@ -91,7 +91,7 @@ public class ModelGraphTest {
expectedEx.expect(IllegalArgumentException.class);
expectedEx.expectMessage("Constructor for " + GraphMock.Bad.class.getName() + " must have as its first argument a " + ConfigModelContext.class.getName());
ModelNode node = new ModelNode(new GraphMock.Bad.Builder());
- node.createModel(ConfigModelContext.create(null, new MockRoot(), "foo"));
+ node.createModel(ConfigModelContext.create(null, null, new MockRoot(), "foo"));
}
@Test
@@ -99,7 +99,7 @@ public class ModelGraphTest {
expectedEx.expect(IllegalArgumentException.class);
expectedEx.expectMessage("Unable to find constructor argument class java.lang.String for com.yahoo.config.model.graph.GraphMock$Bad2");
ModelNode node = new ModelNode(new GraphMock.Bad2.Builder());
- node.createModel(ConfigModelContext.create(null, new MockRoot(), "foo"));
+ node.createModel(ConfigModelContext.create(null, null, new MockRoot(), "foo"));
}
@Test
@@ -107,8 +107,8 @@ public class ModelGraphTest {
ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BC()).addBuilder(new GraphMock.BA()).build();
List<ModelNode> nodes = graph.topologicalSort();
MockRoot root = new MockRoot();
- GraphMock.A a = (GraphMock.A) nodes.get(0).createModel(ConfigModelContext.create(null, root, "first"));
- GraphMock.C c = (GraphMock.C) nodes.get(1).createModel(ConfigModelContext.create(null, root, "second"));
+ GraphMock.A a = (GraphMock.A) nodes.get(0).createModel(ConfigModelContext.create(null, null, root, "first"));
+ GraphMock.C c = (GraphMock.C) nodes.get(1).createModel(ConfigModelContext.create(null, null, root, "second"));
assertThat(c.a, is(a));
assertTrue(c.b.isEmpty());
}