diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-28 12:22:26 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-28 12:22:26 +0200 |
commit | 321194bbe4a36d100d92188644d90c6cf4d373c7 (patch) | |
tree | dc2056158a3412aad0fda352496d86e6318d8959 /vespaclient-container-plugin | |
parent | cc406b3dacac9de80d16ed4f56998defce33556f (diff) |
Run Application with VespaModel instead of MockRoot
Diffstat (limited to 'vespaclient-container-plugin')
-rw-r--r-- | vespaclient-container-plugin/pom.xml | 2 | ||||
-rw-r--r-- | vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index 422565f55ae..4ef26498718 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -77,12 +77,14 @@ <version>1.8.4</version> <scope>test</scope> </dependency> + <!-- <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>application</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + --> </dependencies> <build> <plugins> diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java index c4e9e27ca75..ddd17ae71ec 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.restapi.resource; -import com.yahoo.application.Application; -import com.yahoo.application.Networking; -import com.yahoo.application.container.handler.Request; +//import com.yahoo.application.Application; +//import com.yahoo.application.Networking; +//import com.yahoo.application.container.handler.Request; import com.yahoo.container.Container; import com.yahoo.jdisc.http.server.jetty.JettyHttpServer; import org.apache.http.HttpEntity; @@ -33,6 +33,7 @@ import static org.hamcrest.core.StringStartsWith.startsWith; import static org.junit.Assert.assertThat; public class RestApiTest { + /* Application application; @Before @@ -295,5 +296,5 @@ public class RestApiTest { (JettyHttpServer) Container.get().getServerProviderRegistry().allComponents().get(0); return Integer.toString(serverProvider.getListenPort()); } - +*/ } |