Run Application with VespaModel instead of MockRoot

2 files changed, 4 insertions, 4 deletions

diff --git a/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainer.scala b/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainer.scala
index 7152c0c0af1..f0c2ce6fa0d 100644
--- a/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainer.scala
+++ b/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainer.scala
@@ -32,7 +32,7 @@ object StandaloneContainer {
     }
   }
 
-  def withContainerModel[T](containerNode: Node)(f: MockRoot => T) {
+  def withContainerModel[T](containerNode: Node)(f: VespaModel => T) {
     withTempDirectory { applicationPath =>
       createServicesXml(applicationPath, containerNode)
 
diff --git a/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala b/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala
index 41026e1c263..2705322ab32 100644
--- a/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala
+++ b/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala
@@ -58,7 +58,7 @@ class StandaloneContainerTest {
       </services>
     StandaloneContainer.withContainerModel(servicesXml) {
       root =>
-        assertNotNull(root.getProducer("container-1/standalone"))
+        assertTrue(root.getConfigProducer("container-1/standalone").isPresent)
     }
   }
 
@@ -72,10 +72,10 @@ class StandaloneContainerTest {
       </jdisc>
 
     StandaloneContainer.withContainerModel(xml) { root =>
-      val container = root.getProducer("jdisc/standalone").asInstanceOf[AbstractService]
+      val container = root.getConfigProducer("jdisc/standalone").get().asInstanceOf[AbstractService]
       println("portCnt: " + container.getPortCount)
       println("numPorts: " + container.getNumPortsAllocated)
-      assertThat(container.getNumPortsAllocated, is(1))
+      assertEquals(1, container.getNumPortsAllocated)
     }
   }