From a4cb23e1a152e204d67f3cd5140590e9e037c885 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 15 Oct 2018 21:26:28 +0200 Subject: Avoid deprecated method --- .../engine/test/ExecutionAbstractTestCase.java | 6 +++--- .../pagetemplates/engine/test/PageTestCase.java | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'container-search/src/test/java/com/yahoo') diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java index e873d93d8cd..8bb3e9cd2db 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java @@ -48,12 +48,12 @@ public class ExecutionAbstractTestCase { return source; } - protected void assertRendered(Result result,String resultFileName) { + protected void assertRendered(Result result, String resultFileName) { assertRendered(result,resultFileName,false); } - protected void assertRendered(Result result,String resultFileName, UserTemplate template) { - assertRendered(result,resultFileName,template,false); + protected void assertRendered(Result result, String resultFileName, UserTemplate template) { + assertRendered(result, resultFileName, template,false); } protected void assertRendered(Result result,String resultFileName,boolean print) { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java index a09088c3410..d2f109aad76 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java @@ -21,24 +21,24 @@ public class PageTestCase extends ExecutionAbstractTestCase { @Test public void testExecution() { // Create the page template - Choice page=Choice.createSingleton(importPage("Page.xml")); + Choice page = Choice.createSingleton(importPage("Page.xml")); // Create a federated result - Query query=new Query(); - Result result=new Result(query); - result.hits().add(createHits("news",2)); - result.hits().add(createHits("htmlSource",1)); + Query query = new Query(); + Result result = new Result(query); + result.hits().add(createHits("news", 2)); + result.hits().add(createHits("htmlSource", 1)); // Resolve (noop here) - Resolver resolver=new DeterministicResolver(); - Resolution resolution=resolver.resolve(page,query,result); + Resolver resolver = new DeterministicResolver(); + Resolution resolution = resolver.resolve(page, query, result); // Execute - Organizer organizer =new Organizer(); - organizer.organize(page,resolution,result); + Organizer organizer = new Organizer(); + organizer.organize(page, resolution, result); // Check rendering - assertRendered(result,"PageResult.xml",new PageTemplateSet()); + assertRendered(result, "PageResult.xml", new PageTemplateSet()); } } -- cgit v1.2.3