From 3a332e556cd05c0bee7dcd7f1f1a556d371e3567 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 17 Jun 2011 09:07:12 +0000
Subject: [PATCH] SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT
 and ENTITY_REFERENCE events

---
 ...treamReaderTest.java => XMLEventStreamReaderTests.java} | 7 ++++---
 ...treamWriterTest.java => XMLEventStreamWriterTests.java} | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename org.springframework.core/src/test/java/org/springframework/util/xml/{XMLEventStreamReaderTest.java => XMLEventStreamReaderTests.java} (92%)
 rename org.springframework.core/src/test/java/org/springframework/util/xml/{XMLEventStreamWriterTest.java => XMLEventStreamWriterTests.java} (95%)

diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTest.java b/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java
similarity index 92%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTest.java
rename to org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java
index 0b49ce03f5..6e752b9d2e 100644
--- a/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTest.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 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.
@@ -24,11 +24,12 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import org.junit.Before;
 import org.junit.Test;
 
-public class XMLEventStreamReaderTest {
+import static org.custommonkey.xmlunit.XMLAssert.*;
+
+public class XMLEventStreamReaderTests {
 
 	private static final String XML =
 			"<?pi content?><root xmlns='namespace'><prefix:child xmlns:prefix='namespace2'>content</prefix:child></root>"
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTest.java b/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
similarity index 95%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTest.java
rename to org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
index f91fa68234..baa65cbf40 100644
--- a/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTest.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2011 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.
@@ -21,11 +21,12 @@ import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLOutputFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
 import org.junit.Before;
 import org.junit.Test;
 
-public class XMLEventStreamWriterTest {
+import static org.custommonkey.xmlunit.XMLAssert.*;
+
+public class XMLEventStreamWriterTests {
 
 	private static final String XML =
 			"<?pi content?><root xmlns='namespace'><prefix:child xmlns:prefix='namespace2'>content</prefix:child></root>"