DATACMNS-478 - Allow build to be run on Java 8.

Introduced XmlUnit to make sure we can test XML rendering Java 6, 7 and 8.

Author: odrotbohm

pom.xml

@@ -160,6 +160,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>xmlunit</groupId>
+			<artifactId>xmlunit</artifactId>
+			<version>1.3</version>
+			<scope>test</scope>
+		</dependency>
+
 		<!-- Groovy -->
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>

src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -18,6 +18,7 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
+import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.List;
@@ -33,7 +34,7 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.junit.After;
+import org.custommonkey.xmlunit.Diff;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.core.io.ClassPathResource;
@@ -57,11 +58,11 @@ public class SpringDataJaxbUnitTests {
 	Unmarshaller unmarshaller;
 
 	Sort sort = new Sort(Direction.ASC, "firstname", "lastname");
-	Pageable reference = new PageRequest(2, 15, sort);
+	Pageable pageable = new PageRequest(2, 15, sort);
 	Resource resource = new ClassPathResource("pageable.xml", this.getClass());
 	Resource schemaFile = new ClassPathResource("spring-data-jaxb.xsd", this.getClass());
 
-	Scanner scanner;
+	String reference = readFile(resource);
 
 	@Before
 	public void setUp() throws Exception {
@@ -72,29 +73,19 @@ public void setUp() throws Exception {
 		marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
 
 		unmarshaller = context.createUnmarshaller();
-
-		scanner = new Scanner(resource.getFile());
-	}
-
-	@After
-	public void tearDown() {
-		scanner.close();
 	}
 
 	@Test
 	public void usesCustomTypeAdapterForPageRequests() throws Exception {
 
 		StringWriter writer = new StringWriter();
 		Wrapper wrapper = new Wrapper();
-		wrapper.pageable = reference;
+		wrapper.pageable = pageable;
 		wrapper.sort = sort;
 		wrapper.pageableWithoutSort = new PageRequest(10, 20);
 		marshaller.marshal(wrapper, writer);
 
-		for (String line : writer.toString().split("\n")) {
-			assertThat(scanner.hasNextLine(), is(true));
-			assertThat(line, is(scanner.nextLine()));
-		}
+		assertThat(new Diff(reference, writer.toString()).similar(), is(true));
 	}
 
 	@Test
@@ -103,7 +94,7 @@ public void readsPageRequest() throws Exception {
 		Object result = unmarshaller.unmarshal(resource.getFile());
 
 		assertThat(result, is(instanceOf(Wrapper.class)));
-		assertThat(((Wrapper) result).pageable, is(reference));
+		assertThat(((Wrapper) result).pageable, is(pageable));
 		assertThat(((Wrapper) result).sort, is(sort));
 	}
 
@@ -119,35 +110,49 @@ public void writesPlainPage() throws Exception {
 		marshaller.marshal(wrapper, new StringWriter());
 	}
 
+	private static String readFile(Resource resource) {
+
+		try {
+
+			Scanner scanner = new Scanner(resource.getInputStream());
+			StringBuilder builder = new StringBuilder();
+
+			while (scanner.hasNextLine()) {
+				builder.append(scanner.nextLine()).append("\n");
+			}
+
+			scanner.close();
+
+			return builder.toString();
+
+		} catch (IOException o_O) {
+			throw new RuntimeException(o_O);
+		}
+	}
+
 	@XmlRootElement
 	@XmlAccessorType(XmlAccessType.FIELD)
 	static class Wrapper {
 
-		@XmlElement(name = "page-request", namespace = SpringDataJaxb.NAMESPACE)
-		Pageable pageable;
+		@XmlElement(name = "page-request", namespace = SpringDataJaxb.NAMESPACE) Pageable pageable;
 
-		@XmlElement(name = "page-request-without-sort", namespace = SpringDataJaxb.NAMESPACE)
-		Pageable pageableWithoutSort;
+		@XmlElement(name = "page-request-without-sort", namespace = SpringDataJaxb.NAMESPACE) Pageable pageableWithoutSort;
 
-		@XmlElement(name = "sort", namespace = SpringDataJaxb.NAMESPACE)
-		Sort sort;
+		@XmlElement(name = "sort", namespace = SpringDataJaxb.NAMESPACE) Sort sort;
 	}
 
 	@XmlRootElement(name = "wrapper", namespace = SpringDataJaxb.NAMESPACE)
 	static class PageWrapper {
 
 		Page<Content> page;
 
-		@XmlElement(name = "page-with-links")
-		@XmlJavaTypeAdapter(LinkedPageAdapter.class)
-		Page<Content> pageWithLinks;
+		@XmlElement(name = "page-with-links") @XmlJavaTypeAdapter(LinkedPageAdapter.class) Page<Content> pageWithLinks;
 	}
 
 	@XmlRootElement
 	static class Content {
 
-		@XmlAttribute
-		String name;
+		@XmlAttribute String name;
 	}
 
 	static class LinkedPageAdapter extends PageAdapter {