You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/09/26 18:27:49 UTC
svn commit: r819167 - in /incubator/uima/sandbox/trunk/SimpleServer:
docs/pdf/simpleServerUserGuide.pdf
src/test/java/org/apache/uima/simpleserver/test/ConfigTest.java
Author: schor
Date: Sat Sep 26 16:27:48 2009
New Revision: 819167
URL: http://svn.apache.org/viewvc?rev=819167&view=rev
Log:
UIMA-1582 fix compare of expected vs actual to use a new compareStrings method which ignores whitespace (including, therefore, different platform line endings)
Modified:
incubator/uima/sandbox/trunk/SimpleServer/docs/pdf/simpleServerUserGuide.pdf
incubator/uima/sandbox/trunk/SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ConfigTest.java
Modified: incubator/uima/sandbox/trunk/SimpleServer/docs/pdf/simpleServerUserGuide.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/docs/pdf/simpleServerUserGuide.pdf?rev=819167&r1=819166&r2=819167&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ConfigTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ConfigTest.java?rev=819167&r1=819166&r2=819167&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ConfigTest.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ConfigTest.java Sat Sep 26 16:27:48 2009
@@ -39,6 +39,7 @@
import org.apache.uima.simpleserver.config.impl.XmlConfigReader;
import org.apache.uima.simpleserver.output.Result;
import org.apache.uima.simpleserver.output.ResultConverter;
+import org.apache.uima.test.junit_extension.FileCompare;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.FileUtils;
import org.apache.uima.util.InvalidXMLException;
@@ -177,10 +178,10 @@
e.printStackTrace();
}
assertTrue("Expected inline output:\n" + inlineExpected + "\nbut found:\n" + inlineActual,
- inlineActual.equals(inlineExpected));
+ FileCompare.compareStrings(inlineActual, inlineExpected));
assertTrue(
"Expected standoff output:\n" + standoffExpected + "\nbut found:\n" + standoffActual,
- standoffActual.equals(standoffExpected));
+ FileCompare.compareStrings(standoffActual, standoffExpected));
// final int len = configFile.length();
// final String suffix = configFile.substring(len - 6, len);
// final String outInlineFileName = "out/inline" + suffix;