You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2012/06/07 04:59:40 UTC

svn commit: r1347343 - in /uima/uimaj/trunk/uimaj-core/src/test: java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java resources/TextAnalysisEngineImplTest/AggregateWithManyDelegates.xml

Author: burn
Date: Thu Jun  7 02:59:40 2012
New Revision: 1347343

URL: http://svn.apache.org/viewvc?rev=1347343&view=rev
Log:
[UIMA-2418] Remove indenting in new test as white-space handling appears to be platform dependent

Modified:
    uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
    uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithManyDelegates.xml

Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=1347343&r1=1347342&r2=1347343&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Thu Jun  7 02:59:40 2012
@@ -1505,7 +1505,9 @@ public class AnalysisEngine_implTest ext
     BufferedOutputStream os = new BufferedOutputStream(new FileOutputStream(cloneFile));
     XMLSerializer xmlSerializer = new XMLSerializer(true);
     xmlSerializer.setOutputStream(os);
-    xmlSerializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+    // Don't try to indent nicely as appears to behave differently on Win & Unix
+    //xmlSerializer.setIndent(false);
+    xmlSerializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "0");
     ContentHandler contentHandler = xmlSerializer.getContentHandler();
     contentHandler.startDocument();
     desc.toXML(contentHandler, true);

Modified: uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithManyDelegates.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithManyDelegates.xml?rev=1347343&r1=1347342&r2=1347343&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithManyDelegates.xml (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithManyDelegates.xml Thu Jun  7 02:59:40 2012
@@ -22,61 +22,61 @@
 <!-- Descriptor for testing the editing and copying of an aggregate.  -->
 <!--                                                                  -->
 <analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>false</primitive>
-  <!-- Test that order of declarations is preserved when re-written  -->
-  <delegateAnalysisEngineSpecifiers>
-    <delegateAnalysisEngine key="D">
-      <import location="TestPrimitiveTae2.xml"/>
-    </delegateAnalysisEngine>
-    <delegateAnalysisEngine key="C">
-      <import location="TestPrimitiveTae2.xml"/>
-    </delegateAnalysisEngine>
-    <delegateAnalysisEngine key="B">
-      <import location="TestPrimitiveTae2.xml"/>
-    </delegateAnalysisEngine>
-    <delegateAnalysisEngine key="A">
-      <import location="TestPrimitiveTae2.xml"/>
-    </delegateAnalysisEngine>
-    <delegateAnalysisEngine key="F">
-      <import location="TestPrimitiveTae2.xml"/>
-    </delegateAnalysisEngine>
-    <delegateAnalysisEngine key="E">
-      <import location="TestPrimitiveTae2.xml"/>
-    </delegateAnalysisEngine>
-  </delegateAnalysisEngineSpecifiers>
-  <!-- The above declaration order should be preserved when the UIMA APIs are used to parse and -->
-  <!-- serialize back to disk  -->
-  <analysisEngineMetaData>
-    <name>AggregateWithManyDelegates</name>
-    <description/>
-    <version>1.0</version>
-    <vendor/>
-    <configurationParameters/>
-    <configurationParameterSettings/>
-    <flowConstraints>
-      <fixedFlow>
-        <node>A</node>
-        <node>B</node>
-        <node>C</node>
-        <node>D</node>
-        <node>E</node>
-        <node>F</node>
-      </fixedFlow>
-    </flowConstraints>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs/>
-        <outputs/>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <resourceManagerConfiguration/>
+<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+<primitive>false</primitive>
+<!-- Test that order of declarations is preserved when re-written  -->
+<delegateAnalysisEngineSpecifiers>
+<delegateAnalysisEngine key="D">
+<import location="TestPrimitiveTae2.xml"/>
+</delegateAnalysisEngine>
+<delegateAnalysisEngine key="C">
+<import location="TestPrimitiveTae2.xml"/>
+</delegateAnalysisEngine>
+<delegateAnalysisEngine key="B">
+<import location="TestPrimitiveTae2.xml"/>
+</delegateAnalysisEngine>
+<delegateAnalysisEngine key="A">
+<import location="TestPrimitiveTae2.xml"/>
+</delegateAnalysisEngine>
+<delegateAnalysisEngine key="F">
+<import location="TestPrimitiveTae2.xml"/>
+</delegateAnalysisEngine>
+<delegateAnalysisEngine key="E">
+<import location="TestPrimitiveTae2.xml"/>
+</delegateAnalysisEngine>
+</delegateAnalysisEngineSpecifiers>
+<!-- The above declaration order should be preserved when the UIMA APIs are used to parse and -->
+<!-- serialize back to disk  -->
+<analysisEngineMetaData>
+<name>AggregateWithManyDelegates</name>
+<description/>
+<version>1.0</version>
+<vendor/>
+<configurationParameters/>
+<configurationParameterSettings/>
+<flowConstraints>
+<fixedFlow>
+<node>A</node>
+<node>B</node>
+<node>C</node>
+<node>D</node>
+<node>E</node>
+<node>F</node>
+</fixedFlow>
+</flowConstraints>
+<fsIndexCollection/>
+<capabilities>
+<capability>
+<inputs/>
+<outputs/>
+<languagesSupported/>
+</capability>
+</capabilities>
+<operationalProperties>
+<modifiesCas>true</modifiesCas>
+<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+<outputsNewCASes>false</outputsNewCASes>
+</operationalProperties>
+</analysisEngineMetaData>
+<resourceManagerConfiguration/>
 </analysisEngineDescription>
\ No newline at end of file