rdonkin 2003/03/19 14:57:41
Modified: betwixt/src/test/org/apache/commons/betwixt
TestBeanWriter.java
betwixt/src/test/org/apache/commons/betwixt/dotbetwixt
TestBeanToXml.java
Added: betwixt/src/test/org/apache/commons/betwixt/dotbetwixt
MixedContentBean.betwixt MixedContentBean.java
Log:
Tests for mixed content.
Revision Changes Path
1.9 +1 -2
jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/TestBeanWriter.java
Index: TestBeanWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/TestBeanWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestBeanWriter.java 13 Feb 2003 18:41:48 -0000 1.8
+++ TestBeanWriter.java 19 Mar 2003 22:57:40 -0000 1.9
@@ -235,7 +235,6 @@
/** Test simplest case for writing empty elements */
public void testSimpleWriteEmptyElements() throws Exception{
-
// use same bean for both tests
AddressBean bean = new AddressBean();
bean.setStreet("Pasture Lane");
@@ -259,6 +258,7 @@
String xml = "<?xml version='1.0'?><AddressBean><street>Pasture
Lane</street><city>Bradford</city>"
+ "<code/><country/></AddressBean>";
// baseLog.debug(xml);
+
xmlAssertIsomorphicContent(parseString(out.getBuffer().toString()),parseString(xml),
true);
// test output when not writing empty elements
@@ -274,7 +274,6 @@
// baseLog.debug("SIMPLE NOT EMPTY");
// baseLog.debug(out.getBuffer().toString());
xmlAssertIsomorphicContent(parseString(out.getBuffer().toString()),parseString(xml),
true);
-
}
/** Test nested case for writing empty elements */
1.10 +20 -5
jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/dotbetwixt/TestBeanToXml.java
Index: TestBeanToXml.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/dotbetwixt/TestBeanToXml.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestBeanToXml.java 13 Feb 2003 18:41:48 -0000 1.9
+++ TestBeanToXml.java 19 Mar 2003 22:57:40 -0000 1.10
@@ -162,10 +162,25 @@
writer.setWriteEmptyElements( true );
writer.write(new BadDotBetwixtNamesBean("one", "two"));
- System.out.println(out.toString());
+// System.out.println(out.toString());
// this should fail if the output is not well formed
parseString(out.toString());
}
+
+ /** Test output of bean with mixed content */
+ public void testMixedContent() throws Exception {
+ StringWriter out = new StringWriter();
+ out.write("<?xml version='1.0' encoding='UTF-8'?>");
+ BeanWriter writer = new BeanWriter( out );
+ writer.write( new MixedContentBean("First", "Last", "Always") );
+
+ String xml = "<?xml version='1.0' encoding='UTF-8'?><foo version='1.0'>"
+ + "<bar version='First'>Fiddle sticks<baa>Last</baa>Always</bar></foo>";
+
+ xmlAssertIsomorphicContent(
+ parseString(xml),
+ parseString(out.toString()));
+ }
}
1.1
jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/dotbetwixt/MixedContentBean.betwixt
Index: MixedContentBean.betwixt
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<info primitiveTypes="attribute">
<element name='foo'>
<attribute name='version' value='1.0'/>
<element name='bar'>
<attribute name='version' property='alpha'/>
<text value='Fiddle sticks'/>
<element name='baa' property='beta'/>
<text property='gamma'/>
</element>
</element>
</info>
1.1
jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/dotbetwixt/MixedContentBean.java
Index: MixedContentBean.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/dotbetwixt/MixedContentBean.java,v
1.1 2003/03/19 22:57:40 rdonkin Exp $
* $Revision: 1.1 $
* $Date: 2003/03/19 22:57:40 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* $Id: MixedContentBean.java,v 1.1 2003/03/19 22:57:40 rdonkin Exp $
*/
package org.apache.commons.betwixt.dotbetwixt;
/**
* This is a simple bean used in testing id-attribute custom mapping.
*
* @author Robert Burrell Donkin
*/
public class MixedContentBean {
//-------------------------- Attributes
private String alpha;
private String beta;
private String gamma;
//-------------------------- Constructors
public MixedContentBean(String alpha, String beta, String gamma) {
setAlpha(alpha);
setBeta(beta);
setGamma(gamma);
}
//--------------------------- Properties
public String getAlpha() {
return alpha;
}
public void setAlpha(String alpha) {
this.alpha = alpha;
}
public String getBeta() {
return beta;
}
public void setBeta(String beta) {
this.beta = beta;
}
public String getGamma() {
return gamma;
}
public void setGamma(String gamma) {
this.gamma = gamma;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
