Merge branch '1.5.x'

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/ExampleJsonObjectWithView.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2012-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test.autoconfigure.json;
+
+import com.fasterxml.jackson.annotation.JsonView;
+
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Example object to read/write as JSON with view
+ *
+ * @author Madhura Bhave
+ */
+public class ExampleJsonObjectWithView {
+
+	@JsonView(TestView.class)
+	private String value;
+
+	private int id;
+
+	public String getValue() {
+		return this.value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public int getId() {
+		return this.id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	@Override
+	public int hashCode() {
+		return 0;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null || obj.getClass() != getClass()) {
+			return false;
+		}
+		ExampleJsonObjectWithView other = (ExampleJsonObjectWithView) obj;
+		return ObjectUtils.nullSafeEquals(this.value, other.value)
+				&& ObjectUtils.nullSafeEquals(this.id, other.id);
+	}
+
+	@Override
+	public String toString() {
+		return this.value + " " + this.id;
+	}
+
+	static class TestView {
+
+	}
+
+}
+

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/JsonTestIntegrationTests.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.json.BasicJsonTester;
 import org.springframework.boot.test.json.GsonTester;
 import org.springframework.boot.test.json.JacksonTester;
+import org.springframework.boot.test.json.JsonContent;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -42,6 +43,9 @@ public class JsonTestIntegrationTests {
 	@Autowired
 	private JacksonTester<ExampleBasicObject> jacksonBasicJson;
 
+	@Autowired
+	private JacksonTester<ExampleJsonObjectWithView> jacksonWithViewJson;
+
 	@Autowired
 	private JacksonTester<ExampleCustomObject> jacksonCustomJson;
 
@@ -73,4 +77,14 @@ public class JsonTestIntegrationTests {
 		assertThat(this.gsonJson.write(object)).isEqualToJson("example.json");
 	}
 
+	@Test
+	public void customView() throws Exception {
+		ExampleJsonObjectWithView object = new ExampleJsonObjectWithView();
+		object.setValue("spring");
+		JsonContent<ExampleJsonObjectWithView> content = this.jacksonWithViewJson
+				.forView(ExampleJsonObjectWithView.TestView.class)
+				.write(object);
+		assertThat(content).doesNotHaveJsonPathValue("id");
+		assertThat(content).isEqualToJson("example.json");
+	}
 }