pnever 2004/12/03 06:28:01
Modified: proposals/wvcm/test/junit/src/org/apache/webdav/methods
PropfindMethodTest.java ProppatchMethodTest.java
ReportMethodTest.java
Log:
Upgraded to JDOM_1.0
Revision Changes Path
1.15 +7 -6
jakarta-slide/proposals/wvcm/test/junit/src/org/apache/webdav/methods/PropfindMethodTest.java
Index: PropfindMethodTest.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/wvcm/test/junit/src/org/apache/webdav/methods/PropfindMethodTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PropfindMethodTest.java 30 Jul 2004 06:52:31 -0000 1.14
+++ PropfindMethodTest.java 3 Dec 2004 14:28:01 -0000 1.15
@@ -138,13 +138,14 @@
Element dnameElm = new Element( "getcontenttype", davNsp );
propElm.addContent( dnameElm );
Document pfindBody = new Document( pfindElm );
+ Format ft = Format.getPrettyFormat().setEncoding("UTF-8");
pfindMethod.setRequestBody(
- new XMLOutputter("", false, "UTF-8").outputString(pfindBody) );
+ new XMLOutputter(ft).outputString(pfindBody) );
client.executeMethod( pfindMethod );
assertEquals( 207, pfindMethod.getStatusCode() );
Document mstatusBody =
new SAXBuilder().build(pfindMethod.getResponseBodyAsStream());
- new XMLOutputter(" ", true, "UTF-8").output( mstatusBody,
System.out );
+ new XMLOutputter(ft).output( mstatusBody, System.out );
Element mstatusElm = mstatusBody.getRootElement();
XPathWrapper xpath = new XPathWrapper(
//
"/d:multistatus/d:response[/d:href=\""+resourcePath+"\"]/d:propstat/d:prop/d:displayname"
);
1.12 +7 -6
jakarta-slide/proposals/wvcm/test/junit/src/org/apache/webdav/methods/ProppatchMethodTest.java
Index: ProppatchMethodTest.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/wvcm/test/junit/src/org/apache/webdav/methods/ProppatchMethodTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProppatchMethodTest.java 30 Jul 2004 06:52:31 -0000 1.11
+++ ProppatchMethodTest.java 3 Dec 2004 14:28:01 -0000 1.12
@@ -144,13 +144,14 @@
myattElm.addContent( new Text("My Attribute Value") );
propElm.addContent( myattElm );
Document ppatchBody = new Document( propupdElm );
+ Format ft = Format.getPrettyFormat().setEncoding("UTF-8");
ppatchMethod.setRequestBody(
- new XMLOutputter("", false, "UTF-8").outputString(ppatchBody) );
+ new XMLOutputter(ft).outputString(ppatchBody) );
client.executeMethod( ppatchMethod );
assertEquals( 207, ppatchMethod.getStatusCode() );
Document mstatusBody =
new SAXBuilder().build(ppatchMethod.getResponseBodyAsStream());
- new XMLOutputter(" ", true, "UTF-8").output( mstatusBody,
System.out );
+ new XMLOutputter(ft).output( mstatusBody, System.out );
Element mstatusElm = mstatusBody.getRootElement();
XPathWrapper xpath = new XPathWrapper(
//
"/d:multistatus/d:response[/d:href=\""+resourcePath+"\"]/d:propstat/d:prop/d:displayname"
);
1.15 +8 -7
jakarta-slide/proposals/wvcm/test/junit/src/org/apache/webdav/methods/ReportMethodTest.java
Index: ReportMethodTest.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/wvcm/test/junit/src/org/apache/webdav/methods/ReportMethodTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ReportMethodTest.java 30 Jul 2004 06:52:31 -0000 1.14
+++ ReportMethodTest.java 3 Dec 2004 14:28:01 -0000 1.15
@@ -143,15 +143,16 @@
dname2Elm.setAttribute( "name", "displayname" );
ownerElm.addContent( dname2Elm );
Document repBody = new Document( expropElm );
- new XMLOutputter(" ", true, "UTF-8").output( repBody, System.out );
+ Format ft = Format.getPrettyFormat().setEncoding("UTF-8");
+ new XMLOutputter(ft).output( repBody, System.out );
repMethod.setRequestBody(
- new XMLOutputter("", false, "UTF-8").outputString(repBody) );
+ new XMLOutputter(ft).outputString(repBody) );
repMethod.addRequestHeader( "Content-Type", "text/xml;
charset=\"utf-8\"" );
client.executeMethod( repMethod );
assertEquals( 207, repMethod.getStatusCode() );
Document mstatusBody =
new SAXBuilder().build(repMethod.getResponseBodyAsStream());
- new XMLOutputter("", false, "UTF-8").output( mstatusBody, System.out
);
+ new XMLOutputter(ft).output( mstatusBody, System.out );
Element mstatusElm = mstatusBody.getRootElement();
XPathWrapper xpath = new XPathWrapper(
"/d:multistatus/d:response/d:propstat/d:prop/d:getcontenttype",
davNsp );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
