Polish tests

Author: izeye

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/JsonContentHandlerTests.java

@@ -48,15 +48,15 @@ public void typeForFieldWithNotNullAndThenNullValueMustMatch() throws IOExceptio
 		this.thrown.expect(FieldTypesDoNotMatchException.class);
 		new JsonContentHandler("{\"a\":[{\"id\":1},{\"id\":null}]}".getBytes())
 				.determineFieldType(
-						new FieldDescriptor("a[].id").type(JsonFieldType.STRING));
+						new FieldDescriptor("a[].id").type(JsonFieldType.NUMBER));
 	}
 
 	@Test
 	public void typeForFieldWithNullAndThenNotNullValueMustMatch() throws IOException {
 		this.thrown.expect(FieldTypesDoNotMatchException.class);
 		new JsonContentHandler("{\"a\":[{\"id\":null},{\"id\":1}]}".getBytes())
 				.determineFieldType(
-						new FieldDescriptor("a.[].id").type(JsonFieldType.STRING));
+						new FieldDescriptor("a.[].id").type(JsonFieldType.NUMBER));
 	}
 
 	@Test

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/JsonFieldProcessorTests.java

@@ -50,7 +50,7 @@ public void extractTopLevelMapEntry() {
 		Map<String, Object> payload = new HashMap<>();
 		payload.put("a", "alpha");
 		assertThat(this.fieldProcessor.extract("a", payload).getValue(),
-				equalTo((Object) "alpha"));
+				equalTo("alpha"));
 	}
 
 	@Test
@@ -60,7 +60,7 @@ public void extractNestedMapEntry() {
 		payload.put("a", alpha);
 		alpha.put("b", "bravo");
 		assertThat(this.fieldProcessor.extract("a.b", payload).getValue(),
-				equalTo((Object) "bravo"));
+				equalTo("bravo"));
 	}
 
 	@Test
@@ -71,7 +71,7 @@ public void extractTopLevelArray() {
 		payload.add(bravo);
 		payload.add(bravo);
 		assertThat(this.fieldProcessor.extract("[]", payload).getValue(),
-				equalTo((Object) payload));
+				equalTo(payload));
 	}
 
 	@Test
@@ -82,7 +82,7 @@ public void extractArray() {
 		List<Map<String, Object>> alpha = Arrays.asList(bravo, bravo);
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a", payload).getValue(),
-				equalTo((Object) alpha));
+				equalTo(alpha));
 	}
 
 	@Test
@@ -93,7 +93,7 @@ public void extractArrayContents() {
 		List<Map<String, Object>> alpha = Arrays.asList(bravo, bravo);
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a[]", payload).getValue(),
-				equalTo((Object) alpha));
+				equalTo(alpha));
 	}
 
 	@Test
@@ -104,7 +104,7 @@ public void extractFromItemsInArray() {
 		List<Map<String, Object>> alpha = Arrays.asList(entry, entry);
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a[].b", payload).getValue(),
-				equalTo((Object) Arrays.asList("bravo", "bravo")));
+				equalTo(Arrays.asList("bravo", "bravo")));
 	}
 
 	@Test
@@ -116,7 +116,7 @@ public void extractOccasionallyAbsentFieldFromItemsInArray() {
 				new HashMap<String, Object>());
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a[].b", payload).getValue(),
-				equalTo((Object) Arrays.asList("bravo")));
+				equalTo(Arrays.asList("bravo")));
 	}
 
 	@Test
@@ -129,7 +129,7 @@ public void extractOccasionallyNullFieldFromItemsInArray() {
 		List<Map<String, Object>> alpha = Arrays.asList(nonNullField, nullField);
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a[].b", payload).getValue(),
-				equalTo((Object) Arrays.asList("bravo", null)));
+				equalTo(Arrays.asList("bravo", null)));
 	}
 
 	@Test
@@ -142,7 +142,7 @@ public void extractNestedArray() {
 				.asList(Arrays.asList(entry1, entry2), Arrays.asList(entry3));
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a[][]", payload).getValue(),
-				equalTo((Object) Arrays.asList(Arrays.asList(entry1, entry2),
+				equalTo(Arrays.asList(Arrays.asList(entry1, entry2),
 						Arrays.asList(entry3))));
 	}
 
@@ -156,7 +156,7 @@ public void extractFromItemsInNestedArray() {
 				.asList(Arrays.asList(entry1, entry2), Arrays.asList(entry3));
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a[][].id", payload).getValue(),
-				equalTo((Object) Arrays.asList("1", "2", "3")));
+				equalTo(Arrays.asList("1", "2", "3")));
 	}
 
 	@Test
@@ -169,27 +169,27 @@ public void extractArraysFromItemsInNestedArray() {
 				.asList(Arrays.asList(entry1, entry2), Arrays.asList(entry3));
 		payload.put("a", alpha);
 		assertThat(this.fieldProcessor.extract("a[][].ids", payload).getValue(),
-				equalTo((Object) Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3),
+				equalTo(Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3),
 						Arrays.asList(4))));
 	}
 
 	@Test(expected = FieldDoesNotExistException.class)
 	public void nonExistentTopLevelField() {
-		this.fieldProcessor.extract("a", Collections.emptyMap()).getValue();
+		this.fieldProcessor.extract("a", Collections.emptyMap());
 	}
 
 	@Test(expected = FieldDoesNotExistException.class)
 	public void nonExistentNestedField() {
 		HashMap<String, Object> payload = new HashMap<>();
 		payload.put("a", new HashMap<String, Object>());
-		this.fieldProcessor.extract("a.b", payload).getValue();
+		this.fieldProcessor.extract("a.b", payload);
 	}
 
 	@Test(expected = FieldDoesNotExistException.class)
 	public void nonExistentNestedFieldWhenParentIsNotAMap() {
 		HashMap<String, Object> payload = new HashMap<>();
 		payload.put("a", 5);
-		this.fieldProcessor.extract("a.b", payload).getValue();
+		this.fieldProcessor.extract("a.b", payload);
 	}
 
 	@Test(expected = FieldDoesNotExistException.class)
@@ -198,20 +198,20 @@ public void nonExistentFieldWhenParentIsAnArray() {
 		HashMap<String, Object> alpha = new HashMap<>();
 		alpha.put("b", Arrays.asList(new HashMap<String, Object>()));
 		payload.put("a", alpha);
-		this.fieldProcessor.extract("a.b.c", payload).getValue();
+		this.fieldProcessor.extract("a.b.c", payload);
 	}
 
 	@Test(expected = FieldDoesNotExistException.class)
 	public void nonExistentArrayField() {
 		HashMap<String, Object> payload = new HashMap<>();
-		this.fieldProcessor.extract("a[]", payload).getValue();
+		this.fieldProcessor.extract("a[]", payload);
 	}
 
 	@Test(expected = FieldDoesNotExistException.class)
 	public void nonExistentArrayFieldAsTypeDoesNotMatch() {
 		HashMap<String, Object> payload = new HashMap<>();
 		payload.put("a", 5);
-		this.fieldProcessor.extract("a[]", payload).getValue();
+		this.fieldProcessor.extract("a[]", payload);
 	}
 
 	@Test(expected = FieldDoesNotExistException.class)
@@ -220,7 +220,7 @@ public void nonExistentFieldBeneathAnArray() {
 		HashMap<String, Object> alpha = new HashMap<>();
 		alpha.put("b", Arrays.asList(new HashMap<String, Object>()));
 		payload.put("a", alpha);
-		this.fieldProcessor.extract("a.b[].id", payload).getValue();
+		this.fieldProcessor.extract("a.b[].id", payload);
 	}
 
 	@Test
@@ -331,7 +331,7 @@ public void extractNestedEntryWithDotInKeys() throws IOException {
 		payload.put("a.key", alpha);
 		alpha.put("b.key", "bravo");
 		assertThat(this.fieldProcessor.extract("['a.key']['b.key']", payload).getValue(),
-				equalTo((Object) "bravo"));
+				equalTo("bravo"));
 	}
 
 	@SuppressWarnings("unchecked")