diff options
author | Harald Musum <musum@oath.com> | 2018-07-12 08:52:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-12 08:52:20 +0200 |
commit | ef5ac16e81ddfbb2e5553769aac53c268944e8b9 (patch) | |
tree | 2ab512c304adece0a9126add4b3e7b8f5f9bd588 /container-integration-test | |
parent | e243642ab09dc3aed3a10c7fc1634e80b4f23a57 (diff) |
Revert "Adding handler and binding when services.xml has <search>-field"
Diffstat (limited to 'container-integration-test')
-rw-r--r-- | container-integration-test/.gitignore | 31 | ||||
-rw-r--r-- | container-integration-test/OWNERS | 1 | ||||
-rw-r--r-- | container-integration-test/README | 1 | ||||
-rw-r--r-- | container-integration-test/pom.xml | 44 | ||||
-rw-r--r-- | container-integration-test/src/test/java/com/yahoo/search/query/gui/GUIHandlerTest.java | 84 |
5 files changed, 0 insertions, 161 deletions
diff --git a/container-integration-test/.gitignore b/container-integration-test/.gitignore deleted file mode 100644 index 7f4ebc3a7c6..00000000000 --- a/container-integration-test/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -.classpath -.project -.settings -/.cache -/.classpath -/.emacs.desktop -/.nbintdb -/.project -/.settings -/.version -/QueryAccessLog* -/accessLog.log -/build -/bundles -/libexec -/nbproject -/pom.xml.build -/prelude.iml -/prelude.ipr -/prelude.iws -/staging -/target -/temp -/testLogFileG.txt -/testLogs -/test_yapache_access_log -/testlogsG -/testng.out.log -/tmp -null.log -tmp diff --git a/container-integration-test/OWNERS b/container-integration-test/OWNERS deleted file mode 100644 index 6faef1015fb..00000000000 --- a/container-integration-test/OWNERS +++ /dev/null @@ -1 +0,0 @@ -gjoranv
\ No newline at end of file diff --git a/container-integration-test/README b/container-integration-test/README deleted file mode 100644 index c10341c3d8e..00000000000 --- a/container-integration-test/README +++ /dev/null @@ -1 +0,0 @@ -Test for JDisc-components diff --git a/container-integration-test/pom.xml b/container-integration-test/pom.xml deleted file mode 100644 index 4b4d5de21eb..00000000000 --- a/container-integration-test/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <artifactId>container-integration-test</artifactId> - <packaging>jar</packaging> - <version>6-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-search-gui</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>application</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> -</project>
\ No newline at end of file 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 deleted file mode 100644 index 5fd73afe800..00000000000 --- a/container-integration-test/src/test/java/com/yahoo/search/query/gui/GUIHandlerTest.java +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.search.query.gui; - -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.Before; -import org.junit.Test; -import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - - -/** - * @author Henrik Høiness - */ - -public class GUIHandlerTest { - - private JDisc container; - - @Before - public void startContainer() { - container = JDisc.fromServicesXml(servicesXml(), Networking.disable); - } - - @After - public void stopContainer() { - /* - try { - Thread.sleep(100_000); - } catch (InterruptedException e) { - e.printStackTrace(); - }*/ - container.close(); - } - - @Test - public void testRequest() throws Exception { - assertResponse("/querybuilder/", "<!-- Copyright 2018 Yahoo Holdings.","text/html; charset=UTF-8", 200); - } - - @Test - public void testContentTypes() throws Exception{ - assertResponse("/querybuilder/_includes/css/vespa.css", "/**","text/css; charset=UTF-8", 200); - assertResponse("/querybuilder/js/agency.js", "/*!","application/javascript; charset=UTF-8", 200); - assertResponse("/querybuilder/img/reload.svg", "<?xml","image/svg+xml; charset=UTF-8", 200); - assertResponse("/querybuilder/img/Vespa-V2.png", null,"image/png; charset=UTF-8", 200); - } - - @Test - public void testInvalidPath() throws Exception{ - assertResponse("/querybuilder/invalid_filepath", "{\"error-code\":\"NOT_FOUND\",\"message\":\"Nothing at path","application/json; charset=UTF-8", 404); - } - - - private void assertResponse(String path, String expectedStartString, String expectedContentType, int expectedStatusCode) throws IOException { - assertResponse(Request.Method.GET, path, expectedStartString,expectedContentType, expectedStatusCode); - } - - 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)); - assertEquals("Status code", expectedStatusCode, response.getStatus()); - assertEquals(expectedContentType, response.getHeaders().getFirst("Content-Type")); - if(expectedStartString != null){ - assertTrue(response.getBodyAsString().startsWith(expectedStartString)); - } - } - - private String servicesXml() { - return "<jdisc version='1.0'>\n" + - " <handler id='com.yahoo.search.query.gui.GUIHandler'>\n" + - " <binding>http://*/querybuilder/*</binding>\n" + - " </handler>\n" + - " <http>\n" + - " <server id='default' port='8080'/>\n" + - " </http>\n" + - "</jdisc>"; - } - -}
\ No newline at end of file |