commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r224662 - in /jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt: ./ dotbetwixt/ io/read/ nowrap/ recursion/ scarab/ strategy/ strategy/alt/
Date Sun, 24 Jul 2005 21:50:08 GMT
Author: rdonkin
Date: Sun Jul 24 14:49:57 2005
New Revision: 224662

URL: http://svn.apache.org/viewcvs?rev=224662&view=rev
Log:
Attempt to fix any spurious test failures on windoz due to EOL changes. Working on linux box
so working a bit blind.

Modified:
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanReader.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanWriter.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestCollectionMapping.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMaps.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMultiMapping.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestRSSRoundTrip.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestReferenceMapping.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestLoopType.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMap.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMsgParser.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/nowrap/TestNoWrap.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanReader.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanReader.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanReader.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanReader.java
Sun Jul 24 14:49:57 2005
@@ -135,6 +135,7 @@
         out.write("<?xml version='1.0'?>");
         BeanWriter writer = new BeanWriter(out);
 		writer.getBindingConfiguration().setMapIDs(false);
+        writer.setEndOfLine("\n");
         writer.enablePrettyPrint();
         writer.write( bean );
         return out.getBuffer().toString();

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanWriter.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanWriter.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanWriter.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestBeanWriter.java
Sun Jul 24 14:49:57 2005
@@ -59,6 +59,7 @@
         
         BeanWriter writer = new BeanWriter();
         writer.setWriteEmptyElements(true);
+        writer.setEndOfLine("\n");
         writer.enablePrettyPrint();
         writer.write( bean );
     }
@@ -71,17 +72,7 @@
         writer.setWriteEmptyElements( true );
         
         // logging for debugging jsut this method 
-//        SimpleLog log = new SimpleLog("[testLooping:BeanWriter]");
-//        log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-//        writer.setLog(log);
-        
-//        log = new SimpleLog("[testLooping:AbstractBeanWriter]");
-//        log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-//        writer.setAbstractBeanWriterLog(log);
-        
-//        log = new SimpleLog("[testLooping]");
-//        log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-        
+        writer.setEndOfLine("\n");
         writer.enablePrettyPrint();
         writer.write( LoopBean.createNoLoopExampleBean() );    
         
@@ -173,6 +164,7 @@
         BeanWriter writer = new BeanWriter(out);
         writer.setWriteEmptyElements( true );
 		writer.getBindingConfiguration().setMapIDs(false);
+        writer.setEndOfLine("\n");
         writer.enablePrettyPrint(); 
         XMLIntrospector introspector = new XMLIntrospector();
         introspector.getConfiguration().setAttributesForPrimitives(true);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestCollectionMapping.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestCollectionMapping.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestCollectionMapping.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestCollectionMapping.java
Sun Jul 24 14:49:57 2005
@@ -103,7 +103,7 @@
         outputWriter.write("<?xml version=\"1.0\" ?>\n");
 
         BeanWriter beanWriter = new BeanWriter(outputWriter);
-
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.setWriteEmptyElements(true);
         beanWriter.getBindingConfiguration().setMapIDs(false);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMaps.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMaps.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMaps.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMaps.java
Sun Jul 24 14:49:57 2005
@@ -58,6 +58,7 @@
         StringWriter out = new StringWriter();
         
         BeanWriter beanWriter = new BeanWriter(out);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.setWriteEmptyElements(false);
         beanWriter.getBindingConfiguration().setMapIDs(false);
@@ -94,6 +95,7 @@
         StringWriter out = new StringWriter();
         
         BeanWriter beanWriter = new BeanWriter(out);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.setWriteEmptyElements(true);
         beanWriter.getBindingConfiguration().setMapIDs(false);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMultiMapping.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMultiMapping.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMultiMapping.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestMultiMapping.java
Sun Jul 24 14:49:57 2005
@@ -57,7 +57,8 @@
 		    StringWriter outputWriter = new StringWriter();
 		    outputWriter.write("<?xml version='1.0' ?>\n");
 		    BeanWriter beanWriter = new BeanWriter(outputWriter);
-		    beanWriter.enablePrettyPrint();
+            beanWriter.setEndOfLine("\n");
+            beanWriter.enablePrettyPrint();
 		    beanWriter.setWriteEmptyElements(true);
 		    beanWriter.getXMLIntrospector().register(source);
 		    beanWriter.write(partyBean);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestRSSRoundTrip.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestRSSRoundTrip.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestRSSRoundTrip.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestRSSRoundTrip.java
Sun Jul 24 14:49:57 2005
@@ -177,16 +177,11 @@
     }
     
     protected void write(Object bean, Writer out) throws Exception {
-        //SimpleLog log = new SimpleLog("[TestRSSRoundTrip:BeanWriter]");
-        //log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
         BeanWriter writer = new BeanWriter(out);
-        //writer.setLog(log);
-        //log = new SimpleLog("[TestRSSRoundTrip:AbstractBeanWriter]");
-        //log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-        //writer.setAbstractBeanWriterLog(log);
         writer.setWriteEmptyElements(true);
         writer.getXMLIntrospector().getConfiguration().setAttributesForPrimitives(false);
         writer.getBindingConfiguration().setMapIDs(false);
+        writer.setEndOfLine("\n");
         writer.enablePrettyPrint();
         writer.write( bean );
     }

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestReferenceMapping.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestReferenceMapping.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestReferenceMapping.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestReferenceMapping.java
Sun Jul 24 14:49:57 2005
@@ -108,7 +108,7 @@
         outputWriter.write("<?xml version=\"1.0\" ?>\n");
 
         BeanWriter beanWriter = new BeanWriter(outputWriter);
-
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.setWriteEmptyElements(true);
         beanWriter.getBindingConfiguration().setMapIDs(false);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestLoopType.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestLoopType.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestLoopType.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestLoopType.java
Sun Jul 24 14:49:57 2005
@@ -44,6 +44,7 @@
 
         outputWriter.write("<?xml version='1.0' ?>\n");
         BeanWriter beanWriter = new BeanWriter(outputWriter);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.getBindingConfiguration().setMapIDs(true);
         beanWriter.write(father);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMap.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMap.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMap.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMap.java
Sun Jul 24 14:49:57 2005
@@ -37,6 +37,7 @@
         StringWriter outputWriter = new StringWriter();
         outputWriter.write("<?xml version='1.0' ?>\n");
         BeanWriter beanWriter = new BeanWriter(outputWriter);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.getBindingConfiguration().setMapIDs(true);
         beanWriter.write(map);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMsgParser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMsgParser.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMsgParser.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/dotbetwixt/TestMsgParser.java
Sun Jul 24 14:49:57 2005
@@ -100,6 +100,7 @@
         // For more details see java docs or later in the main documentation
         beanWriter.getXMLIntrospector().getConfiguration().setAttributesForPrimitives(true);
         beanWriter.getBindingConfiguration().setMapIDs(false);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
 
         // Write example bean as base element 'person'

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
Sun Jul 24 14:49:57 2005
@@ -137,6 +137,7 @@
         StringWriter outputWriter = new StringWriter();
         outputWriter.write("<?xml version='1.0' ?>\n");
         BeanWriter beanWriter = new BeanWriter(outputWriter);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.write(addressBook);
     

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/nowrap/TestNoWrap.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/nowrap/TestNoWrap.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/nowrap/TestNoWrap.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/nowrap/TestNoWrap.java
Sun Jul 24 14:49:57 2005
@@ -107,6 +107,7 @@
         BeanWriter beanWriter = new BeanWriter(out);
         beanWriter.setXMLIntrospector(createXMLIntrospector());
         beanWriter.getBindingConfiguration().setMapIDs(false);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         
         beanWriter.write(po);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java
Sun Jul 24 14:49:57 2005
@@ -352,6 +352,7 @@
 
         outputWriter.write("<?xml version='1.0' ?>\n");
         BeanWriter beanWriter = new BeanWriter(outputWriter);
+        beanWriter.setEndOfLine("\n");
         beanWriter.enablePrettyPrint();
         beanWriter.getBindingConfiguration().setMapIDs(true);
         beanWriter.write(person);

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/scarab/TestScarabSettings.java
Sun Jul 24 14:49:57 2005
@@ -174,6 +174,7 @@
     {
         BeanWriter writer = new BeanWriter(out);
         writer.setXMLIntrospector(createXMLIntrospector());
+        writer.setEndOfLine("\n");
         writer.enablePrettyPrint();
         writer.write(bean);
     }

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java
Sun Jul 24 14:49:57 2005
@@ -102,19 +102,12 @@
         assertNotNull("Element 'c' is null (" + testName + ")", result.getElement("c"));
     }
 
-    private BeanWriter newBeanWriter(Writer writer, NameMapper mapper) {
-//        SimpleLog log = new SimpleLog("[TextElementsIO:BeanWriter]");
-//        log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-        
+    private BeanWriter newBeanWriter(Writer writer, NameMapper mapper) {        
         BeanWriter result = new BeanWriter(writer);
         result.setWriteEmptyElements(true);
-//        result.setLog(log);
-        
-//        log = new SimpleLog("[TextElementsIO:AbstractBeanWriter]");
-//        log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-//        result.setAbstractBeanWriterLog(log);
         
         result.setXMLIntrospector(newXMLIntrospector(mapper));
+        result.setEndOfLine("\n");
         result.enablePrettyPrint();
         result.getBindingConfiguration().setMapIDs(false);
         return result;

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java?rev=224662&r1=224661&r2=224662&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java
Sun Jul 24 14:49:57 2005
@@ -107,19 +107,12 @@
         assertNotNull("Element 'c' is null (" + testName + ")", result.getElement("c"));
     }
 
-    private BeanWriter newBeanWriter(Writer writer, NameMapper mapper) {
-//        SimpleLog log = new SimpleLog("[TestElementsAlt:BeanWriter]");
-//        log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-        
+    private BeanWriter newBeanWriter(Writer writer, NameMapper mapper) {        
         BeanWriter result = new BeanWriter(writer);
         result.setWriteEmptyElements( true );
-//        result.setLog(log);
-        
-//        log = new SimpleLog("[TestElementsAlt:AbstractBeanWriter]");
-//        log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
-//        result.setAbstractBeanWriterLog(log);
         
         result.setXMLIntrospector(newXMLIntrospector(mapper));
+        result.setEndOfLine("\n");
         result.enablePrettyPrint();
         result.getBindingConfiguration().setMapIDs(false);
         return result;



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message