You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/08/15 05:25:23 UTC
svn commit: r431513 -
/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java
Author: aadamchik
Date: Mon Aug 14 20:25:23 2006
New Revision: 431513
URL: http://svn.apache.org/viewvc?rev=431513&view=rev
Log:
CAY-628
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java?rev=431513&r1=431512&r2=431513&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java Mon Aug 14 20:25:23 2006
@@ -20,6 +20,7 @@
package org.apache.cayenne.xml;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
@@ -34,6 +35,16 @@
public class XMLEncoderTst extends TestCase {
static final String XML_DATA_DIR = "xmlcoding/";
+ static final boolean windows;
+
+ static {
+ if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") >= 0) {
+ windows = true;
+ }
+ else {
+ windows = false;
+ }
+ }
public void testObjectWithNullProperties() throws Exception {
XMLEncoder encoder = new XMLEncoder();
@@ -54,14 +65,25 @@
encoder.encodeProperty("children", test.getChildren());
String result = encoder.nodeToString(encoder.getRootNode(false));
+ String comp = loadTestFileAsString("encoded-simple-collection.xml");
+
+ assertEquals(comp.toString(), result);
+ }
+
+ private String loadTestFileAsString(String filename) throws IOException {
BufferedReader in = new BufferedReader(new InputStreamReader(CayenneTestResources
- .getResource(XML_DATA_DIR + "encoded-simple-collection.xml")));
+ .getResource(XML_DATA_DIR + filename)));
StringBuffer comp = new StringBuffer();
while (in.ready()) {
- comp.append(in.readLine()).append("\n");
+ comp.append(in.readLine());
+ if (windows) {
+ comp.append("\r");
+ }
+ comp.append("\n");
}
-
- assertEquals(comp.toString(), result);
+ in.close();
+
+ return comp.toString();
}
public void testEncodeComplexCollection() throws Exception {
@@ -78,23 +100,12 @@
String result = encoder.encode("TestObjects", obj1);
- BufferedReader in = new BufferedReader(new InputStreamReader(CayenneTestResources
- .getResource(XML_DATA_DIR + "encoded-complex-collection.xml")));
- StringBuffer comp = new StringBuffer();
- while (in.ready()) {
- comp.append(in.readLine()).append("\n");
- }
-
+ String comp = loadTestFileAsString("encoded-complex-collection.xml");
// there are differences in attribute order encoding, so there can be more than
// one valid output depending on the parser used...
if (!comp.toString().equals(result)) {
- in = new BufferedReader(new InputStreamReader(CayenneTestResources
- .getResource(XML_DATA_DIR + "encoded-complex-collection-alt1.xml")));
- comp = new StringBuffer();
- while (in.ready()) {
- comp.append(in.readLine()).append("\n");
- }
+ comp = loadTestFileAsString("encoded-complex-collection-alt1.xml");
}
assertEquals(comp.toString(), result);
}
@@ -109,12 +120,8 @@
String result = encoder.encode(test);
- BufferedReader in = new BufferedReader(new InputStreamReader(CayenneTestResources
- .getResource(XML_DATA_DIR + "simple-mapped.xml")));
- StringBuffer comp = new StringBuffer();
- while (in.ready()) {
- comp.append(in.readLine()).append("\n");
- }
+ String comp = loadTestFileAsString("simple-mapped.xml");
+
assertEquals(comp.toString(), result);
}
@@ -131,12 +138,7 @@
String result = encoder.encode(george);
- BufferedReader in = new BufferedReader(new InputStreamReader(CayenneTestResources
- .getResource(XML_DATA_DIR + "collection-mapped.xml")));
- StringBuffer comp = new StringBuffer();
- while (in.ready()) {
- comp.append(in.readLine()).append("\n");
- }
+ String comp = loadTestFileAsString("collection-mapped.xml");
assertEquals(comp.toString(), result);
}
@@ -150,13 +152,8 @@
String xml = new XMLEncoder().encode("EncodedTestList", dataObjects);
- BufferedReader in = new BufferedReader(new InputStreamReader(CayenneTestResources
- .getResource(XML_DATA_DIR + "data-objects-encoded.xml")));
- StringBuffer comp = new StringBuffer();
- while (in.ready()) {
- comp.append(in.readLine()).append("\n");
- }
-
+ String comp = loadTestFileAsString("data-objects-encoded.xml");
+
assertEquals(comp.toString(), xml);
}
@@ -172,12 +169,7 @@
"EncodedTestList",
dataObjects);
- BufferedReader in = new BufferedReader(new InputStreamReader(CayenneTestResources
- .getResource(XML_DATA_DIR + "data-objects-mapped.xml")));
- StringBuffer comp = new StringBuffer();
- while (in.ready()) {
- comp.append(in.readLine()).append("\n");
- }
+ String comp = loadTestFileAsString("data-objects-mapped.xml");
assertEquals(comp.toString(), xml);
}