Remove template support

25 files changed, 15 insertions, 626 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/BoomTemplate.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/BoomTemplate.java
deleted file mode 100644
index 0bbc5151b40..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/BoomTemplate.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.prelude.templates.test;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import com.yahoo.prelude.templates.Context;
-import com.yahoo.prelude.templates.UserTemplate;
-
-/**
- * Test template which throws a runtime exception in its footer.
- *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- */
-@SuppressWarnings("rawtypes")
-public class BoomTemplate extends UserTemplate {
-    public BoomTemplate(String name, String mimeType, String encoding) {
-        super(name, mimeType, encoding);
-    }
-
-    @Override
-    public void error(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void footer(Context context, Writer writer) throws IOException {
-        throw new RuntimeException("Boom!");
-    }
-
-    @Override
-    public void header(Context context, Writer writer) throws IOException {
-        writer.write("header");
-    }
-
-    @Override
-    public void hit(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void hitFooter(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void noHits(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/GroupedResultTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/GroupedResultTestCase.java
deleted file mode 100644
index 07d5dcc9e2d..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/GroupedResultTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.prelude.templates.test;
-
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.yahoo.search.result.Hit;
-import com.yahoo.search.result.HitGroup;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests composition of grouped results using the HitGroup class
- *
- * @author bratseth
- */
-public class GroupedResultTestCase {
-
-    @Test
-    public void testGroupedResult() {
-        Result result=new Result(new Query("?query=foo"));
-        HitGroup hitGroup1=new HitGroup("group1",300);
-        hitGroup1.add(new Hit("group1.1",200));
-        HitGroup hitGroup2=new HitGroup("group2",600);
-        Hit topLevelHit1=new Hit("toplevel.1",500);
-        Hit topLevelHit2=new Hit("toplevel.2",700);
-        result.hits().add(hitGroup1);
-        result.hits().add(topLevelHit1);
-        result.hits().add(hitGroup2);
-        result.hits().add(topLevelHit2);
-        hitGroup1.add(new Hit("group1.2",800));
-        hitGroup2.add(new Hit("group2.1",800));
-        hitGroup2.add(new Hit("group2.2",300));
-        hitGroup2.add(new Hit("group2.3",500));
-
-        // Should have 7 concrete hits, ordered as
-        // toplevel.2
-        // group2
-        //   group2.1
-        //   group2.3
-        //   group2.2
-        // toplevel.1
-        // group1
-        //   group1.2
-        //   group1.1
-        // Assert this:
-
-        assertEquals(7,result.getConcreteHitCount());
-        assertEquals(4,result.getHitCount());
-
-        Hit topLevel2=result.hits().get(0);
-        assertEquals("toplevel.2",topLevel2.getId().stringValue());
-
-        HitGroup returnedGroup2=(HitGroup)result.hits().get(1);
-        assertEquals(3,returnedGroup2.getConcreteSize());
-        assertEquals(3,returnedGroup2.size());
-        assertEquals("group2.1",returnedGroup2.get(0).getId().stringValue());
-        assertEquals("group2.3",returnedGroup2.get(1).getId().stringValue());
-        assertEquals("group2.2",returnedGroup2.get(2).getId().stringValue());
-
-        Hit topLevel1=result.hits().get(2);
-        assertEquals("toplevel.1",topLevel1.getId().stringValue());
-
-        HitGroup returnedGroup1=(HitGroup)result.hits().get(3);
-        assertEquals(2,returnedGroup1.getConcreteSize());
-        assertEquals(2,returnedGroup1.size());
-        assertEquals("group1.2",returnedGroup1.get(0).getId().stringValue());
-        assertEquals("group1.1",returnedGroup1.get(1).getId().stringValue());
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/HitContextTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/HitContextTestCase.java
deleted file mode 100644
index 6ff8c2f9d6c..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/HitContextTestCase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.prelude.templates.test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.yahoo.prelude.templates.HitContext;
-import com.yahoo.protect.ClassValidator;
-
-/**
- * Check the entire Context class is correctly masked.
- *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- */
-public class HitContextTestCase {
-
-    @Test
-    public void checkMethods() {
-        List<Method> unmasked = ClassValidator.unmaskedMethodsFromSuperclass(HitContext.class);
-        assertEquals("Unmasked methods from superclass: " + unmasked, 0, unmasked.size());
-    }
-}
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/TemplateTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/TemplateTestCase.java
deleted file mode 100644
index 6f49ebbdee0..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/TemplateTestCase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.prelude.templates.test;
-
-import java.io.ByteArrayOutputStream;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-
-import com.yahoo.io.ByteWriter;
-import com.yahoo.prelude.templates.UserTemplate;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Steinar Knutsen
- */
-public class TemplateTestCase {
-
-    private CharsetEncoder encoder;
-    private ByteArrayOutputStream stream;
-
-    public TemplateTestCase () {
-        Charset cs = Charset.forName("UTF-8");
-        encoder = cs.newEncoder();
-        stream = new ByteArrayOutputStream();
-    }
-
-    @Test
-    public void testASCIIQuoting() throws java.io.IOException {
-        stream.reset();
-        byte[] c = new byte[] { 97, 98, 99, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
-        ByteWriter bw = new ByteWriter(stream, encoder);
-        UserTemplate.dumpAndXMLQuoteUTF8(bw, c);
-        bw.close();
-        String res = stream.toString("UTF-8");
-        String correct = "abc\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u0008\t\n\\u000B\\u000C\r\\u000E\\u000F\\u0010\\u0011";
-        assertEquals(correct, res);
-
-    }
-
-    @Test
-    public void testXMLQuoting() throws java.io.IOException {
-        stream.reset();
-        // c = <s>&gt;
-        byte[] c = new byte[] { 60, 115, 62, 38, 103, 116, 59 };
-        ByteWriter bw = new ByteWriter(stream, encoder);
-        UserTemplate.dumpAndXMLQuoteUTF8(bw, c);
-        bw.close();
-        String res = stream.toString("UTF-8");
-        String correct = "&lt;s&gt;&amp;gt;";
-        assertEquals(correct, res);
-
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/TestTemplate.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/TestTemplate.java
deleted file mode 100644
index 0f5e126dae8..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/TestTemplate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.prelude.templates.test;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import com.yahoo.prelude.templates.Context;
-import com.yahoo.prelude.templates.UserTemplate;
-
-/**
- * Test basic UserTemplate functionality of detecting
- * overridden group rendering methods.
- *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- */
-@SuppressWarnings("rawtypes")
-public class TestTemplate extends UserTemplate {
-
-    public TestTemplate(String name, String mimeType, String encoding) {
-        super(name, mimeType, encoding);
-    }
-
-    @Override
-    public void error(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void footer(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void header(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void hit(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void hitFooter(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-    @Override
-    public void noHits(Context context, Writer writer) throws IOException {
-        // NOP
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/error.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/error.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/error.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/footer.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/footer.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/footer.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/header.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/header.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/header.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/hit.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/hit.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/hit.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/nohits.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/nohits.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/asearch/nohits.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/error.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/error.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/error.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/footer.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/footer.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/footer.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/header.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/header.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/header.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/hit.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/hit.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/hit.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/nohits.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/nohits.templ
deleted file mode 100644
index 4e7a9379b73..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/cgi-bin/asearch/nohits.templ
+++ /dev/null
@@ -1 +0,0 @@
-### Result
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/error.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/error.templ
deleted file mode 100644
index ca186b86259..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/error.templ
+++ /dev/null
@@ -1 +0,0 @@
-<ERROR CODE="$result.error.code">$result.error.message</ERROR>
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/footer.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/footer.templ
deleted file mode 100644
index 07a5dd6a881..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/footer.templ
+++ /dev/null
@@ -1 +0,0 @@
-</RESULTSET>
\ No newline at end of file
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/header.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/header.templ
deleted file mode 100644
index 8e3a001545d..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/header.templ
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<RESULTSET TOTALHITS="$result.totalHitCount">
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/hit.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/hit.templ
deleted file mode 100644
index 428a2f15ef5..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/hit.templ
+++ /dev/null
@@ -1,5 +0,0 @@
-<XTEMPLATEHIT RELEVANCY="$relevancy" SOURCE="$hit.source" TYPE="$hit.typeString" OFFSET="$hitno">
-<FIELD NAME="uri">$uri</FIELD>
-<FIELD NAME="category">$category</FIELD>
-<FIELD NAME="bsumtitle">$bsumtitle</FIELD>
-</XTEMPLATEHIT>
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/nohits.templ b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/nohits.templ
deleted file mode 100644
index d466f0bb7d2..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/xsearch/nohits.templ
+++ /dev/null
@@ -1 +0,0 @@
-<XTEMPLATENOHITS/>
\ No newline at end of file
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample.xml b/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample.xml
deleted file mode 100644
index ea5d56d2b31..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<result version="1.0">
-
-  <section id="section:center" region="center">
-    <group type="navigation" relevance="1.0"></group>
-    <group type="ads" relevance="0.9">
-      <hit type="ad" relevance="0.7">
-        <id>http://www.hotels.com/</id>
-        <title>Cheap <hi>hotels</hi></title>
-        <body>Low Rates Guaranteed. Call a <hi>Hotel</hi> Expert.</body>
-      </hit>
-      <hit type="ad" relevance="0.6">
-        <id>http://www.expedia.com/</id>
-        <title>Cheap <hi>hotels</hi> at Expedia</title>
-        <body>Expedia Special Rates Means We Guarantee Our Low Rates on Rooms.</body>
-      </hit>
-    </group>
-    <group type="hits" relevance="0.8">
-      <hit type="hit.collapsed" relevance="0.8">
-        <id>www.hotels.com</id>
-        <title>Hotels.com | Cheap Hotels | Discount Hotel Rooms | Motels | Lodging</title>
-        <body>Hotels.com helps you find great rates on hotels and discount <hi>hotel</hi> packages.</body>
-      </hit>
-      <hit type="hit" relevance="0.7">
-        <id>www.indigohotels.com</id>
-        <title>Hotel Indigo Hotels United States - Official Web Site</title>
-        <body>Make Hotel Indigo online hotel reservations and book your hotel rooms today.</body>
-      </hit>
-      <hit type="hit" relevance="0.6">
-        <id>www.all-hotels.com</id>
-        <title>All hotels</title>
-        <body>Online hotel directory and reservations.</body>
-      </hit>
-    </group>
-    <group type="ads" relevance="0.7">
-      <hit type="ad" relevance="1.0">
-        <id>www.daysinn.com</id>
-        <title>Days Inn Special Deal</title>
-        <body>Buy now and Save 15% Off Our Best Available Rate with Days Inn.</body>
-      </hit>
-      <hit type="ad" relevance="0.9">
-        <id>http://www.expedia.com/</id>
-        <title>Cheap <hi>hotels</hi> at Expedia</title>
-        <body>Expedia Special Rates Means We Guarantee Our Low Rates on Rooms.</body>
-      </hit>
-    </group>
-  </section>
-
-  <section id="section:right" region="right">
-    <group type="ads" relevance="0.7">
-      <hit type="ad" relevance="1.0">
-        <id>www.daysinn.com</id>
-        <title>Days Inn Special Deal</title>
-        <body>Buy now and Save 15% Off Our Best Available Rate with Days Inn.</body>
-      </hit>
-      <hit type="ad" relevance="0.9">
-        <id>www.holidayinn.com</id>
-        <title>Holiday Inn: Official Site</title>
-        <body>Book with Holiday Inn. Free Internet. Kids eat free.</body>
-      </hit>
-    </group>
-  </section>
-
-</result>
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample2.xml b/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample2.xml
deleted file mode 100644
index 2e936b0015a..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<result version="1.0">
-
-  <section id="section:center" region="center">
-    <group type="sr" relevance="1.0" source="sr" provider="yst">
-      <hit type="sr" relevance="1.0" source="sr" provider="yst">
-        <id>159</id>
-        <title>Yahoo</title>
-      </hit>
-    </group>
-  </section>
-
-  <meta>
-    <provider name="yst" scheme="http" host="proxy-tw1cache.idp.inktomisearch.com" port="55556" path="/search" result="200">
-      <id>com.yahoo.search.federation.yst.YSTBackendSearcherproxy-tw1cache.idp.inktomisearch.com55556/search</id>
-      <uri>http://proxy-tw1cache.idp.inktomisearch.com:55556/search?qp=yahootw-twp&amp;Fields=url%2Credirecturl%2Cdate%2Csize%2Cformat%2Csms_product%2Ccacheurl%2Cnodename%2Cid%2Clanguage%2Crsslinks%2Crssvalidatedlinks%2Ccpc%2Cclustertype%2Cxml.active_abstract%2Cactive_abstract_type%2Cactive_abstract_source%2Ccontract_id%2Ctranslated%2Cxml.ydir_tw_hotlist_data%2Cxml.summary%2Cclustercollision%2Cxml.pi_info%2Cpage_adult_overridable%2Cpage_spam_overridable%2Ccategory_ydir%2Chate_edb&amp;Unique=doc%2Chost+2&amp;QueryEncoding=utf-8&amp;Query=ALLWORDS%28yahoo%29&amp;Database=dewownrm-zh-tw&amp;FirstResult=0&amp;srcpvid=&amp;cacheecho=1&amp;ResultsEncoding=utf-8&amp;QueryLanguage=Chinese-traditional&amp;Region=US&amp;NumResults=10&amp;Client=yahoous2</uri>
-      <latency type="connect">757</latency>
-      <response-header name="content-length">16217</response-header>
-    </provider>
-  </meta>
-
-</result>
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 d2f6721a0ab..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
@@ -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();
diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java
index 1b44fc13b56..20b18ba6723 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java
@@ -105,12 +105,12 @@ public class SearchHandlerTestCase {
     }
 
     @Test
-    public void testFailing() throws Exception {
+    public void testFailing() {
          assertTrue(driver.sendRequest("http://localhost?query=test&searchChain=classLoadingError").readAll().contains("NoClassDefFoundError"));
     }
 
     @Test
-    public synchronized void testPluginError() throws Exception {
+    public synchronized void testPluginError() {
         assertTrue(driver.sendRequest("http://localhost?query=test&searchChain=exceptionInPlugin").readAll().contains("NullPointerException"));
     }
 
@@ -191,7 +191,7 @@ public class SearchHandlerTestCase {
         }
     }
     @Test
-    public void testInvalidQueryParamWithoutQueryProfile() throws Exception {
+    public void testInvalidQueryParamWithoutQueryProfile() {
         testInvalidQueryParam(driver);
     }
     private void testInvalidQueryParam(final RequestHandlerTestDriver testDriver) {
@@ -213,45 +213,35 @@ public class SearchHandlerTestCase {
     }
 
     @Test
-    public void testNormalResultImplicitDefaultRendering() throws Exception {
+    public void testNormalResultImplicitDefaultRendering() {
         assertJsonResult("http://localhost?query=abc", driver);
     }
 
     @Test
-    public void testNormalResultExplicitDefaultRendering() throws Exception {
+    public void testNormalResultExplicitDefaultRendering() {
         assertJsonResult("http://localhost?query=abc&format=default", driver);
     }
 
     @Test
-    public void testNormalResultXmlAliasRendering() throws Exception {
+    public void testNormalResultXmlAliasRendering() {
         assertXmlResult("http://localhost?query=abc&format=xml", driver);
     }
 
     @Test
-    public void testNormalResultJsonAliasRendering() throws Exception {
+    public void testNormalResultJsonAliasRendering() {
         assertJsonResult("http://localhost?query=abc&format=json", driver);
     }
 
     @Test
-    public void testNormalResultExplicitDefaultRenderingFullRendererName1() throws Exception {
+    public void testNormalResultExplicitDefaultRenderingFullRendererName1() {
         assertXmlResult("http://localhost?query=abc&format=XmlRenderer", driver);
     }
 
     @Test
-    public void testNormalResultExplicitDefaultRenderingFullRendererName2() throws Exception {
+    public void testNormalResultExplicitDefaultRenderingFullRendererName2() {
         assertJsonResult("http://localhost?query=abc&format=JsonRenderer", driver);
     }
 
-    @Test
-    public void testResultLegacyTiledFormat() throws Exception {
-        assertTiledResult("http://localhost?query=abc&format=tiled", driver);
-    }
-
-    @Test
-    public void testResultLegacyPageFormat() throws Exception {
-        assertPageResult("http://localhost?query=abc&format=page", driver);
-    }
-
     private static final String xmlResult =
             "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
             "<result total-hit-count=\"0\">\n" +
@@ -260,10 +250,12 @@ public class SearchHandlerTestCase {
             "    <field name=\"uri\">testHit</field>\n" +
             "  </hit>\n" +
             "</result>\n";
-    private void assertXmlResult(String request, RequestHandlerTestDriver driver) throws Exception {
+
+    private void assertXmlResult(String request, RequestHandlerTestDriver driver) {
         assertOkResult(driver.sendRequest(request), xmlResult);
     }
-    private void assertXmlResult(RequestHandlerTestDriver driver) throws Exception {
+
+    private void assertXmlResult(RequestHandlerTestDriver driver) {
         assertXmlResult("http://localhost?query=abc", driver);
     }
 
@@ -272,38 +264,9 @@ public class SearchHandlerTestCase {
             + "\"children\":["
             + "{\"id\":\"testHit\",\"relevance\":1.0,\"fields\":{\"uri\":\"testHit\"}}"
             + "]}}";
-    private void assertJsonResult(String request, RequestHandlerTestDriver driver) throws Exception {
-        assertOkResult(driver.sendRequest(request), jsonResult);
-    }
-
-    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(String request, RequestHandlerTestDriver driver) throws Exception {
-        assertOkResult(driver.sendRequest(request), tiledResult);
-    }
 
-    private static final String pageResult =
-            "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
-            "<page version=\"1.0\">\n" +
-            "\n" +
-            "  <content>\n" +
-            "    <hit relevance=\"1.0\">\n" +
-            "      <id>testHit</id>\n" +
-            "      <uri>testHit</uri>\n" +
-            "    </hit>\n" +
-            "  </content>\n" +
-            "\n" +
-            "</page>\n";
-    private void assertPageResult(String request, RequestHandlerTestDriver driver) throws Exception {
-        assertOkResult(driver.sendRequest(request), pageResult);
+    private void assertJsonResult(String request, RequestHandlerTestDriver driver) {
+        assertOkResult(driver.sendRequest(request), jsonResult);
     }
 
     private void assertOkResult(RequestHandlerTestDriver.MockResponseHandler response, String expected) {
diff --git a/container-search/src/test/java/com/yahoo/search/result/TemplatingTestCase.java b/container-search/src/test/java/com/yahoo/search/result/TemplatingTestCase.java
deleted file mode 100644
index 13d0c64a0c2..00000000000
--- a/container-search/src/test/java/com/yahoo/search/result/TemplatingTestCase.java
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.result;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.yahoo.search.rendering.Renderer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.base.Splitter;
-import com.yahoo.prelude.fastsearch.FastHit;
-import com.yahoo.prelude.templates.UserTemplate;
-import com.yahoo.prelude.templates.test.BoomTemplate;
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-
-/**
- * Control helper method for result rendering/result templates.
- *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- */
-public class TemplatingTestCase {
-    Result result;
-
-    @Before
-    public void setUp() throws Exception {
-        Query q = new Query("/?query=a&presentation.format=nalle&offset=1&hits=5");
-        result = new Result(q);
-        result.setTotalHitCount(1000L);
-        result.hits().add(new FastHit("http://localhost/1", .95));
-        result.hits().add(new FastHit("http://localhost/2", .90));
-        result.hits().add(new FastHit("http://localhost/3", .85));
-        result.hits().add(new FastHit("http://localhost/4", .80));
-        result.hits().add(new FastHit("http://localhost/5", .75));
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    }
-
-    @Test
-    public final void testGetFirstHitNo() {
-        assertEquals(2, result.getTemplating().getFirstHitNo());
-    }
-
-    @Test
-    public final void testGetNextFirstHitNo() {
-        assertEquals(7, result.getTemplating().getNextFirstHitNo());
-        result.getQuery().setHits(6);
-        assertEquals(0, result.getTemplating().getNextFirstHitNo());
-    }
-
-    @Test
-    public final void testGetNextLastHitNo() {
-        assertEquals(11, result.getTemplating().getNextLastHitNo());
-        result.getQuery().setHits(6);
-        assertEquals(0, result.getTemplating().getNextLastHitNo());
-    }
-
-    @Test
-    public final void testGetLastHitNo() {
-        assertEquals(6, result.getTemplating().getLastHitNo());
-    }
-
-    @Test
-    public final void testGetPrevFirstHitNo() {
-        assertEquals(1, result.getTemplating().getPrevFirstHitNo());
-    }
-
-    @Test
-    public final void testGetPrevLastHitNo() {
-        assertEquals(1, result.getTemplating().getPrevLastHitNo());
-    }
-
-    @Test
-    public final void testGetNextResultURL() {
-        String next = result.getTemplating().getNextResultURL();
-        Set<String> expectedParameters = new HashSet<>(Arrays.asList(new String[] {
-                "hits=5",
-                "query=a",
-                "presentation.format=nalle",
-                "offset=6"
-        }));
-        Set<String> actualParameters = new HashSet<>();
-        Splitter s = Splitter.on("&");
-        for (String parameter : s.split(next.substring(next.indexOf('?') + 1))) {
-            actualParameters.add(parameter);
-        }
-        assertEquals(expectedParameters, actualParameters);
-    }
-
-    @Test
-    public final void testGetPreviousResultURL() {
-        String previous = result.getTemplating().getPreviousResultURL();
-        Set<String> expectedParameters = new HashSet<>(Arrays.asList(new String[] {
-                "hits=5",
-                "query=a",
-                "presentation.format=nalle",
-                "offset=0"
-        }));
-        Set<String> actualParameters = new HashSet<>();
-        Splitter s = Splitter.on("&");
-        for (String parameter : s.split(previous.substring(previous.indexOf('?') + 1))) {
-            actualParameters.add(parameter);
-        }
-        assertEquals(expectedParameters, actualParameters);
-    }
-
-    @Test
-    public final void testGetCurrentResultURL() {
-        String previous = result.getTemplating().getCurrentResultURL();
-        Set<String> expectedParameters = new HashSet<>(Arrays.asList(new String[] {
-                "hits=5",
-                "query=a",
-                "presentation.format=nalle",
-                "offset=1"
-        }));
-        Set<String> actualParameters = new HashSet<>();
-        Splitter s = Splitter.on("&");
-        for (String parameter : s.split(previous.substring(previous.indexOf('?') + 1))) {
-            actualParameters.add(parameter);
-        }
-        assertEquals(expectedParameters, actualParameters);
-    }
-
-    @Test
-    public final void testGetTemplates() {
-        @SuppressWarnings({ "unchecked", "deprecation" })
-        UserTemplate<Writer> t = result.getTemplating().getTemplates();
-        assertEquals("default", t.getName());
-    }
-
-    @SuppressWarnings("deprecation")
-    @Test
-    public final void testSetTemplates() {
-        result.getTemplating().setTemplates(new BoomTemplate("gnuff", "text/plain", "ISO-8859-15"));
-        @SuppressWarnings("unchecked")
-        UserTemplate<Writer> t = result.getTemplating().getTemplates();
-        assertEquals("gnuff", t.getName());
-    }
-
-    private static class TestRenderer extends Renderer {
-
-        @Override
-        public void render(Writer writer, Result result) throws IOException {
-        }
-
-        @Override
-        public String getEncoding() {
-            return null;
-        }
-
-        @Override
-        public String getMimeType() {
-            return null;
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    @Test
-    public final void testUsesDefaultTemplate() {
-        assertTrue(result.getTemplating().usesDefaultTemplate());
-        result.getTemplating().setRenderer(new TestRenderer());
-        assertFalse(result.getTemplating().usesDefaultTemplate());
-    }
-
-}