You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2002/10/27 02:39:00 UTC
cvs commit: jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/schema TestSchema.java
dion 2002/10/26 17:39:00
Modified: betwixt/src/test/org/apache/commons/betwixt
AbstractTestCase.java
betwixt/src/test/org/apache/commons/betwixt/recursion
TestRecursion.java
betwixt/src/test/org/apache/commons/betwixt/schema
TestSchema.java
Log:
Fix for tests failing when an absolute path had a space in the name
Revision Changes Path
1.3 +6 -0 jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/AbstractTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTestCase.java 26 Jul 2002 21:04:05 -0000 1.2
+++ AbstractTestCase.java 27 Oct 2002 00:39:00 -0000 1.3
@@ -63,6 +63,7 @@
import java.io.File;
import java.io.StringWriter;
+import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
@@ -93,6 +94,11 @@
return new File(basedir,path).getAbsolutePath();
}
+ public String getTestFileURL(String path) throws MalformedURLException
+ {
+ return new File(basedir,path).toURL().toString();
+ }
+
protected Object createBean() {
CustomerBean bean = new CustomerBean();
bean.setID( "1" );
1.3 +7 -7 jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java
Index: TestRecursion.java
===================================================================
RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestRecursion.java 26 Sep 2002 19:29:34 -0000 1.2
+++ TestRecursion.java 27 Oct 2002 00:39:00 -0000 1.3
@@ -110,7 +110,7 @@
BeanReader reader = new BeanReader();
reader.registerBeanClass(ElementBean.class);
reader.setXMLIntrospector(intro);
- Object object = reader.parse("src/test/org/apache/commons/betwixt/recursion/recursion.xml");
+ Object object = reader.parse(getTestFileURL("src/test/org/apache/commons/betwixt/recursion/recursion.xml"));
StringWriter buffer = new StringWriter();
write (object, buffer, true);
System.out.println("buffer : "+buffer);
@@ -126,7 +126,7 @@
BeanReader reader = new BeanReader();
reader.registerBeanClass(ElementBean.class);
reader.setXMLIntrospector(intro);
- Object object = reader.parse("src/test/org/apache/commons/betwixt/recursion/recursion2.xml");
+ Object object = reader.parse(getTestFileURL("src/test/org/apache/commons/betwixt/recursion/recursion2.xml"));
StringWriter buffer = new StringWriter();
write (object, buffer, false);
System.out.println("buffer : "+buffer);
1.3 +9 -7 jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/schema/TestSchema.java
Index: TestSchema.java
===================================================================
RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/schema/TestSchema.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestSchema.java 26 Jul 2002 21:04:05 -0000 1.2
+++ TestSchema.java 27 Oct 2002 00:39:00 -0000 1.3
@@ -106,7 +106,8 @@
throws Exception
{
BeanReader reader = createBeanReader();
- PhysicalSchema schema = (PhysicalSchema) reader.parse(getTestFile("src/test/org/apache/commons/betwixt/schema/schema.xml"));
+ PhysicalSchema schema = (PhysicalSchema) reader.parse(
+ getTestFileURL("src/test/org/apache/commons/betwixt/schema/schema.xml"));
StringWriter buffer = new StringWriter();
write(schema, buffer, true);
StringReader in = new StringReader(buffer.getBuffer().toString());
@@ -136,7 +137,8 @@
throws Exception
{
BeanReader reader = createBeanReader();
- PhysicalSchema schema = (PhysicalSchema) reader.parse(getTestFile("src/test/org/apache/commons/betwixt/schema/schema.xml"));
+ PhysicalSchema schema = (PhysicalSchema) reader.parse(
+ getTestFileURL("src/test/org/apache/commons/betwixt/schema/schema.xml"));
StringWriter buffer = new StringWriter();
write(schema, buffer, false);
StringReader in = new StringReader(buffer.getBuffer().toString());
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>