1 files changed, 30 insertions, 30 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java b/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java
index c77ff2eca3c..91c8acbab12 100644
--- a/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java
@@ -5,8 +5,6 @@ import com.yahoo.data.access.simple.Value;
 
 import static org.junit.Assert.*;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -15,41 +13,43 @@ import org.junit.Test;
 public class PositionsDataTestCase {
 
     @Test
-    public void testRendering() {
-        Value.ArrayValue arr = new Value.ArrayValue();
-        Value.ObjectValue p1 = new Value.ObjectValue();
-        p1.put("x", new Value.LongValue(-122057174));
-        p1.put("y", new Value.LongValue(37374821));
-        p1.put("latlong", new Value.StringValue("N37.374821;W122.057174"));
-        arr.add(p1);
+    public void testRenderingOfSinglePosition() {
+        Value.ObjectValue pos = createPosition(-122057174, 37374821, "N37.374821;W122.057174");
 
-        PositionsData pd = new PositionsData(arr.inspect());
+        PositionsData pd = new PositionsData(pos.inspect());
 
-        String rendered = pd.toXML();
-        String correct = "<position x=\"-122057174\" y=\"37374821\" latlong=\"N37.374821;W122.057174\" />";
-        assertEquals(correct, rendered);
+        assertXml("<position x=\"-122057174\" y=\"37374821\" latlong=\"N37.374821;W122.057174\" />", pd);
+        assertJson("{\"x\":-122057174,\"y\":37374821,\"latlong\":\"N37.374821;W122.057174\"}", pd);
+    }
+
+    @Test
+    public void testRenderingOfMultiplePositions() {
+        Value.ArrayValue arr = new Value.ArrayValue();
+        arr.add(createPosition(-122057174, 37374821, "N37.374821;W122.057174"));
+        arr.add(createPosition(3, -7, "S0.000007;E0.000003"));
 
-        rendered = pd.toJson();
-        correct = "[{\"x\":-122057174,\"y\":37374821,\"latlong\":\"N37.374821;W122.057174\"}]";
-        assertEquals(correct, rendered);
+        PositionsData pd = new PositionsData(arr.inspect());
 
-        Value.ObjectValue p2 = new Value.ObjectValue();
-        p2.put("x", new Value.LongValue(3));
-        p2.put("y", new Value.LongValue(-7));
-        p2.put("latlong", new Value.StringValue("S0.000007;E0.000003"));
-        arr.add(p2);
+        assertXml("<position x=\"-122057174\" y=\"37374821\" latlong=\"N37.374821;W122.057174\" />" +
+                  "<position x=\"3\" y=\"-7\" latlong=\"S0.000007;E0.000003\" />", pd);
+        assertJson("[{\"x\":-122057174,\"y\":37374821,\"latlong\":\"N37.374821;W122.057174\"}," +
+                  "{\"x\":3,\"y\":-7,\"latlong\":\"S0.000007;E0.000003\"}]", pd);
+    }
 
-        pd = new PositionsData(arr.inspect());
+    private Value.ObjectValue createPosition(long x, long y, String latlong) {
+        Value.ObjectValue result = new Value.ObjectValue();
+        result.put("x", new Value.LongValue(x));
+        result.put("y", new Value.LongValue(y));
+        result.put("latlong", new Value.StringValue(latlong));
+        return result;
+    }
 
-        rendered = pd.toXML();
-        correct = "<position x=\"-122057174\" y=\"37374821\" latlong=\"N37.374821;W122.057174\" />" +
-                  "<position x=\"3\" y=\"-7\" latlong=\"S0.000007;E0.000003\" />";
-        assertEquals(correct, rendered);
+    private void assertXml(String expected, PositionsData pd) {
+        assertEquals(expected, pd.toXML());
+    }
 
-        rendered = pd.toJson();
-        correct = "[{\"x\":-122057174,\"y\":37374821,\"latlong\":\"N37.374821;W122.057174\"}," +
-                  "{\"x\":3,\"y\":-7,\"latlong\":\"S0.000007;E0.000003\"}]";
-        assertEquals(correct, rendered);
+    private void assertJson(String expected, PositionsData pd) {
+        assertEquals(expected, pd.toJson());
     }
 
 }