aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
diff options
context:
space:
mode:
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java')
-rw-r--r--container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java38
1 files changed, 1 insertions, 37 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
index fa398efd293..9617e0ceb25 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
@@ -232,7 +232,7 @@ public class JSONSearchHandlerTestCase {
public void testNormalResultExplicitDefaultRenderingFullRendererName1() throws Exception {
JSONObject json = new JSONObject();
json.put("query", "abc");
- json.put("format", "DefaultRenderer");
+ json.put("format", "XmlRenderer");
assertXmlResult(json, driver);
}
@@ -244,22 +244,6 @@ public class JSONSearchHandlerTestCase {
assertJsonResult(json, driver);
}
- @Test
- public void testResultLegacyTiledFormat() throws Exception {
- JSONObject json = new JSONObject();
- json.put("query", "abc");
- json.put("format", "tiled");
- assertTiledResult(json, driver);
- }
-
- @Test
- public void testResultLegacyPageFormat() throws Exception {
- JSONObject json = new JSONObject();
- json.put("query", "abc");
- json.put("format", "page");
- assertPageResult(json, driver);
- }
-
private static final String xmlResult =
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
"<result total-hit-count=\"0\">\n" +
@@ -284,21 +268,6 @@ public class JSONSearchHandlerTestCase {
}
- private static final String tiledResult =
- "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
- "<result version=\"1.0\">\n" +
- "\n" +
- " <hit relevance=\"1.0\">\n" +
- " <id>testHit</id>\n" +
- " <uri>testHit</uri>\n" +
- " </hit>\n" +
- "\n" +
- "</result>\n";
-
- private void assertTiledResult(JSONObject json, RequestHandlerTestDriver driver) {
- assertOkResult(driver.sendRequest(uri, com.yahoo.jdisc.http.HttpRequest.Method.POST, json.toString(), JSON_CONTENT_TYPE), tiledResult);
- }
-
private static final String pageResult =
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
"<page version=\"1.0\">\n" +
@@ -312,10 +281,6 @@ public class JSONSearchHandlerTestCase {
"\n" +
"</page>\n";
- private void assertPageResult(JSONObject json, RequestHandlerTestDriver driver) {
- assertOkResult(driver.sendRequest(uri, com.yahoo.jdisc.http.HttpRequest.Method.POST, json.toString(), JSON_CONTENT_TYPE), pageResult);
- }
-
private void assertOkResult(RequestHandlerTestDriver.MockResponseHandler response, String expected) {
assertEquals(expected, response.readAll());
assertEquals(200, response.getStatus());
@@ -508,7 +473,6 @@ public class JSONSearchHandlerTestCase {
assertEquals("Should have same mapping for properties", map, propertyMap);
}
-
@Test
public void testContentTypeParsing() throws Exception {
JSONObject json = new JSONObject();