cvs commit: jakarta-commons/betwixt/src/test/org/apache/commons/betwixt TestBeanWriter.java

[rdonkin]

rdonkin     2003/06/28 03:34:28

  Modified:    betwixt/src/test/org/apache/commons/betwixt
                        TestBeanWriter.java
  Log:
  Improved unit tests by removing print to out and replacing with test of xml.
  
  Revision  Changes    Path
  1.15      +21 -4     
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- TestBeanWriter.java       28 Jun 2003 09:07:12 -0000      1.14
  +++ TestBeanWriter.java       28 Jun 2003 10:34:28 -0000      1.15
  @@ -246,10 +246,7 @@
           
           writer.write(bean);
           out.flush();
  -        String result = out.toString();
  -        
  -        System.out.println( "Created..." );
  -        System.out.println( result );
  +        String result = "<?xml version='1.0'?><beans>" + out.toString() + 
"</beans>";
           
           // check for the elemant content..
           assertTrue(result.indexOf("<email>Escape&lt;LessThan</email>") > -1 );
  @@ -263,6 +260,25 @@
           assertTrue(result.indexOf("country=\"Escape&amp;amphersand\"") != -1);
           assertTrue(result.indexOf("city=\"Escape&apos;apostrophe\"") != -1);
           assertTrue(result.indexOf("street=\"Escape&quot;Quote\"") != -1);
  +        
  +        String xml="<?xml version='1.0'?><beans>  <LoopBean 
name='Escape&lt;LessThan'/>"
  +            + "<LoopBean name='Escape&gt;GreaterThan'/><LoopBean 
name='Escape&amp;amphersand'/>"
  +            + "<LoopBean name='Escape&apos;apostrophe'/><LoopBean 
name='Escape&quot;Quote'/>"
  +            + "<CustomerBean name='Escape&lt;LessThan' time='' date='' 
bigDecimal='' "
  +            + "bigInteger='' timestamp='' ID='' nickName=''>"
  +            + 
"<projectMap/><projectNames/><emails><email>Escape&lt;LessThan</email>"
  +            + 
"<email>Escape&gt;GreaterThan</email><email>Escape&amp;amphersand</email>"
  +            + 
"<email>Escape'apostrophe</email><email>Escape\"Quote</email></emails>"
  +            + "<locations/><projectURLs/>"
  +            + "<address code='Escape&gt;GreaterThan' city='Escape&apos;apostrophe' "
  +            + "country='Escape&amp;amphersand' street='Escape&quot;Quote'/>"
  +            + "<numbers/></CustomerBean></beans>";
  +            
  +        xmlAssertIsomorphicContent(
  +                            "Test escaping ",
  +                            parseString(result),
  +                            parseString(xml), 
  +                            true);  
       }
       /**
        * Testing valid endofline characters.
  @@ -529,6 +545,7 @@
                               parseString(out.getBuffer().toString()),
                               parseString(xml), 
                               true);
  +                            
       }
       
       public void testWriteNameMapperStrategy() throws Exception {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]