FIxed tests

Author: synapticloop

src/test/java/panl/Root.java

@@ -83,7 +83,7 @@ public class Root {
 	@JsonIgnore public Object configuration;
 	@JsonIgnore public Object parameters;
 
-	public Response response;
+	public Response[] response;
 	public Panl panl;
 	public boolean error;
 
@@ -128,7 +128,7 @@ public void setError(
 	 *
 	 * @return the response
 	 */
-	public Response getResponse() {
+	public Response[] getResponse() {
 		return response;
 	}
 	/**
@@ -137,7 +137,7 @@ public Response getResponse() {
 	 * @param response the response to set
 	 */
 	public void setResponse(
-			Response response) {
+			Response[] response) {
 		this.response = response;
 	}
 

src/test/java/panl/response/panl/Response.java

@@ -49,12 +49,15 @@
 package panl.response.panl;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import panl.response.panl.response.Doc;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Response {
 	@JsonIgnore public Doc[] docs;
-	public long numFound;
-	public long start;
-	public long maxScore;
-	public boolean numFoundExact;
+	@JsonIgnore public long numFound;
+	@JsonIgnore public long start;
+	@JsonIgnore public long maxScore;
+	@JsonIgnore public boolean numFoundExact;
+	@JsonIgnore public String name;
 }

src/testintegration/java/com/synapticloop/integration/test/facet/range/DateRangeTest.java

@@ -41,7 +41,7 @@ public class DateRangeTest extends TestBase {
 	@Test public void testDefault() throws Exception {
 		Root root = mapper.readValue(new URL(BASE_URL), Root.class);
 		assertFalse(root.error);
-		assertEquals(1000L, root.response.numFound);
+		assertEquals(1000L, root.panl.pagination.num_results);
 
 		// now test the adding and removing - there is only one
 		DateRangeFacet dateRangeFacet = root.panl.available.date_range_facets[0];

src/testintegration/java/com/synapticloop/integration/test/facet/range/RangeTest.java

@@ -47,7 +47,7 @@ public class RangeTest extends TestBase {
 	@Test public void testDefault() throws Exception {
 		Root root = mapper.readValue(new URL(BASE_URL), Root.class);
 		assertFalse(root.error);
-		assertEquals(55L, root.response.numFound);
+		assertEquals(55L, root.panl.pagination.num_results);
 
 		// now test the adding and removing - there is only one
 		RangeFacet rangeFacet = root.panl.available.range_facets[0];
@@ -65,7 +65,7 @@ public class RangeTest extends TestBase {
 		// first up test the min and max value replacement
 		root = mapper.readValue(new URL(BASE_URL + beforeMinValue + during + afterMaxValue), Root.class);
 		assertFalse(root.error);
-		assertEquals(55L, root.response.numFound);
+		assertEquals(55L, root.panl.pagination.num_results);
 		assertEquals(1, root.panl.active.facet.length);
 
 		assertEquals("from%20light%20to%20heavy%20pencils", root.panl.active.facet[0].encoded);
@@ -75,7 +75,7 @@ public class RangeTest extends TestBase {
 		// Now test to ensure that min and max value replacements are made
 		root = mapper.readValue(new URL(BASE_URL + before + min + during + max + after), Root.class);
 		assertFalse(root.error);
-		assertEquals(55L, root.response.numFound);
+		assertEquals(55L, root.panl.pagination.num_results);
 		assertEquals(1, root.panl.active.facet.length);
 
 		assertEquals("from%20light%20to%20heavy%20pencils", root.panl.active.facet[0].encoded);
@@ -84,7 +84,7 @@ public class RangeTest extends TestBase {
 
 		root = mapper.readValue(new URL(BASE_URL + before + (min + 1) + during + (max - 1) + after), Root.class);
 		assertFalse(root.error);
-		assertEquals(48L, root.response.numFound);
+		assertEquals(48L, root.panl.pagination.num_results);
 		assertEquals(1, root.panl.active.facet.length);
 
 		assertEquals("weighing%20from%20" + (min + 1) + "%20grams%20to%20" + (max-1) +"%20grams", root.panl.active.facet[0].encoded);