aboutsummaryrefslogtreecommitdiffstats
path: root/container-integration-test
diff options
context:
space:
mode:
authorHenrik <henrik.hoiness@online.no>2018-07-11 11:13:08 +0200
committerHenrik <henrik.hoiness@online.no>2018-07-11 11:13:08 +0200
commitf958196acf413ff8633b8147f2ee06ca6b573265 (patch)
treea4afd1eed323be5a7f1367568760b4adbc2a4145 /container-integration-test
parentb118c94e7744d37e4564a79edd6a5ba9faf1307d (diff)
Changed import to static
Diffstat (limited to 'container-integration-test')
-rw-r--r--container-integration-test/src/test/java/com/yahoo/search/query/gui/GUIHandlerTest.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/container-integration-test/src/test/java/com/yahoo/search/query/gui/GUIHandlerTest.java b/container-integration-test/src/test/java/com/yahoo/search/query/gui/GUIHandlerTest.java
index 1c6b9c329fb..5fd73afe800 100644
--- a/container-integration-test/src/test/java/com/yahoo/search/query/gui/GUIHandlerTest.java
+++ b/container-integration-test/src/test/java/com/yahoo/search/query/gui/GUIHandlerTest.java
@@ -5,13 +5,13 @@ import com.yahoo.application.Networking;
import com.yahoo.application.container.JDisc;
import com.yahoo.application.container.handler.Request;
import com.yahoo.application.container.handler.Response;
+
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
import java.io.IOException;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
@@ -24,7 +24,7 @@ public class GUIHandlerTest {
@Before
public void startContainer() {
- container = JDisc.fromServicesXml(servicesXml(), Networking.enable);
+ container = JDisc.fromServicesXml(servicesXml(), Networking.disable);
}
@After
@@ -63,10 +63,10 @@ public class GUIHandlerTest {
private void assertResponse(Request.Method method, String path, String expectedStartString, String expectedContentType, int expectedStatusCode) throws IOException {
Response response = container.handleRequest(new Request("http://localhost:8080" + path, new byte[0], method));
- Assert.assertEquals("Status code", expectedStatusCode, response.getStatus());
- Assert.assertEquals(expectedContentType, response.getHeaders().getFirst("Content-Type"));
+ assertEquals("Status code", expectedStatusCode, response.getStatus());
+ assertEquals(expectedContentType, response.getHeaders().getFirst("Content-Type"));
if(expectedStartString != null){
- Assert.assertTrue(response.getBodyAsString().startsWith(expectedStartString));
+ assertTrue(response.getBodyAsString().startsWith(expectedStartString));
}
}