You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2013/08/24 18:18:21 UTC
svn commit: r1517158 - in /uima/sandbox/uimafit/trunk:
uimafit-core/src/test/java/org/apache/uima/fit/testing/factory/
uimafit-core/src/test/resources/data/docs/
uimafit-core/src/test/resources/org/uimafit/
uimafit-legacy-support/src/test/java/org/apac...
Author: rec
Date: Sat Aug 24 16:18:20 2013
New Revision: 1517158
URL: http://svn.apache.org/r1517158
Log:
[UIMA-3201] Test files for different line-ending styles use svn:native
- Renamed files to avoid confusion about line-endings
- Remove svn:eol-style properties
- Converted files which should have Windows line endings to Windows line endings
- Updated tests
Added:
uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/unix-newlines.txt.bin (props changed)
- copied unchanged from r1515974, uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/unix-newlines.txt
uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt.bin (contents, props changed)
- copied, changed from r1515974, uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/unix-newlines.txt.bin (props changed)
- copied unchanged from r1515974, uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/unix-newlines.txt
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt.bin (contents, props changed)
- copied, changed from r1515974, uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt
Removed:
uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/unix-newlines.txt
uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt
uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/org/uimafit/
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/unix-newlines.txt
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt
Modified:
uima/sandbox/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java
Modified: uima/sandbox/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java?rev=1517158&r1=1517157&r2=1517158&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java Sat Aug 24 16:18:20 2013
@@ -198,9 +198,9 @@ public class TokenBuilderTest extends Co
@Test
public void testNewlinesFromFile() throws Exception {
- String text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/unix-newlines.txt"),
+ String text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/unix-newlines.txt.bin"),
"UTF-8");
- text = text.substring(1); // remove "\uFEFF" character from begining of text
+ text = text.substring(1); // remove "\uFEFF" character from beginning of text
tokenBuilder.buildTokens(jCas, text);
Collection<Sentence> sentences = JCasUtil.select(jCas, Sentence.class);
@@ -212,9 +212,9 @@ public class TokenBuilderTest extends Co
assertEquals("sentence 4.", iterator.next().getCoveredText());
jCas.reset();
- text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/windows-newlines.txt"),
+ text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/windows-newlines.txt.bin"),
"UTF-8");
- text = text.substring(1); // remove "\uFEFF" character from begining of text
+ text = text.substring(1); // remove "\uFEFF" character from beginning of text
tokenBuilder.buildTokens(jCas, text);
sentences = JCasUtil.select(jCas, Sentence.class);
@@ -224,7 +224,5 @@ public class TokenBuilderTest extends Co
assertEquals("sentence 2.", iterator.next().getCoveredText());
assertEquals("sentence 3.", iterator.next().getCoveredText());
assertEquals("sentence 4.", iterator.next().getCoveredText());
-
}
-
}
Copied: uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt.bin (from r1515974, uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt.bin?p2=uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt.bin&p1=uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt&r1=1515974&r2=1517158&rev=1517158&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt (original)
+++ uima/sandbox/uimafit/trunk/uimafit-core/src/test/resources/data/docs/windows-newlines.txt.bin Sat Aug 24 16:18:20 2013
@@ -1,9 +1,9 @@
-sentence 1.
-sentence 2.
-
-
-sentence 3.
-
-sentence 4.
-
-
+sentence 1.
+sentence 2.
+
+
+sentence 3.
+
+sentence 4.
+
+
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java?rev=1517158&r1=1517157&r2=1517158&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java Sat Aug 24 16:18:20 2013
@@ -198,9 +198,9 @@ public class TokenBuilderTest extends Co
@Test
public void testNewlinesFromFile() throws Exception {
- String text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/unix-newlines.txt"),
+ String text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/unix-newlines.txt.bin"),
"UTF-8");
- text = text.substring(1); // remove "\uFEFF" character from begining of text
+ text = text.substring(1); // remove "\uFEFF" character from beginning of text
tokenBuilder.buildTokens(jCas, text);
Collection<Sentence> sentences = JCasUtil.select(jCas, Sentence.class);
@@ -212,9 +212,9 @@ public class TokenBuilderTest extends Co
assertEquals("sentence 4.", iterator.next().getCoveredText());
jCas.reset();
- text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/windows-newlines.txt"),
+ text = FileUtil.loadTextFile(new File("src/test/resources/data/docs/windows-newlines.txt.bin"),
"UTF-8");
- text = text.substring(1); // remove "\uFEFF" character from begining of text
+ text = text.substring(1); // remove "\uFEFF" character from beginning of text
tokenBuilder.buildTokens(jCas, text);
sentences = JCasUtil.select(jCas, Sentence.class);
@@ -224,7 +224,5 @@ public class TokenBuilderTest extends Co
assertEquals("sentence 2.", iterator.next().getCoveredText());
assertEquals("sentence 3.", iterator.next().getCoveredText());
assertEquals("sentence 4.", iterator.next().getCoveredText());
-
}
-
}
Copied: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt.bin (from r1515974, uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt.bin?p2=uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt.bin&p1=uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt&r1=1515974&r2=1517158&rev=1517158&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt.bin Sat Aug 24 16:18:20 2013
@@ -1,9 +1,9 @@
-sentence 1.
-sentence 2.
-
-
-sentence 3.
-
-sentence 4.
-
-
+sentence 1.
+sentence 2.
+
+
+sentence 3.
+
+sentence 4.
+
+