Revision: 7402
http://languagetool.svn.sourceforge.net/languagetool/?rev=7402&view=rev
Author: milek_pl
Date: 2012-06-18 17:43:15 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
fixing wrong column number (sf bug #3054895)
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
trunk/JLanguageTool/src/java/org/languagetool/Main.java
trunk/JLanguageTool/src/test/org/languagetool/MainTest.java
trunk/JLanguageTool/src/test/org/languagetool/test-en.txt
Modified: trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
2012-06-18 17:36:23 UTC (rev 7401)
+++ trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
2012-06-18 17:43:15 UTC (rev 7402)
@@ -635,7 +635,7 @@
final int lastLineBreakPosInError = sentencePartToEndOfError
.lastIndexOf('\n');
if (lastLineBreakPosInError == -1) {
- endColumn = sentencePartToEndOfError.length() + columnCount + 1;
+ endColumn = sentencePartToEndOfError.length() + columnCount;
} else {
endColumn = sentencePartToEndOfError.length() - lastLineBreakPosInError;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/Main.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-06-18
17:36:23 UTC (rev 7401)
+++ trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-06-18
17:43:15 UTC (rev 7402)
@@ -284,6 +284,9 @@
if (profileRules) {
sentences += lt.sentenceTokenize(sb.toString()).size();
}
+ if (apiFormat && !taggerOnly && !applySuggestions) {
+ System.out.println("</matches>");
+ }
if (listUnknownWords && !taggerOnly) {
for (String word : lt.getUnknownWords()) {
if (!unknownWords.contains(word)) {
Modified: trunk/JLanguageTool/src/test/org/languagetool/MainTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/MainTest.java 2012-06-18
17:36:23 UTC (rev 7401)
+++ trunk/JLanguageTool/src/test/org/languagetool/MainTest.java 2012-06-18
17:43:15 UTC (rev 7402)
@@ -124,7 +124,9 @@
Main.main(args);
String output = new String(this.out.toByteArray());
- assertEquals("This is a test.\n", output);
+ assertEquals("This is a test.\n\n" +
+ "This is a test of language tool.\n\n" +
+ "This is a test of language tool.\n", output);
}
@@ -163,6 +165,18 @@
assertEquals("This is a test.\n", output);
}
+ public void testEnglishStdIn4() throws Exception {
+ System.setIn(this.getClass().getResourceAsStream(ENGLISH_TEST_FILE));
+ String[] args = new String[] {"-l", "en", "--api", "-"};
+
+ Main.main(args);
+ String output = new String(this.out.toByteArray());
+ assertTrue(output.contains("<error fromy=\"4\" fromx=\"5\" toy=\"4\"
tox=\"10\" ruleId=\"ENGLISH_WORD_REPEAT_RULE\" msg=\"Possible typo: you
repeated a word\" replacements=\"is\" context=\"This is is a test of language
tool. \" contextoffset=\"5\" errorlength=\"5\"/>"));
+
+ }
+
+
+
//test line mode vs. para mode
//first line mode
public void testEnglishLineMode() throws Exception {
@@ -258,9 +272,9 @@
Main.main(args);
String output = new String(this.out.toByteArray());
assertTrue(output.indexOf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") ==
0);
- assertTrue(output.contains("<error fromy=\"0\" fromx=\"8\" toy=\"0\"
tox=\"11\" ruleId=\"EN_A_VS_AN\" " +
+ assertTrue(output.contains("<error fromy=\"0\" fromx=\"8\" toy=\"0\"
tox=\"10\" ruleId=\"EN_A_VS_AN\" " +
"msg=\"Use 'a' instead of 'an' if the following word doesn't start
with a vowel sound, e.g. 'a sentence', " +
- "'a university'\" replacements=\"a\" context=\"This is an test. \"
contextoffset=\"8\" errorlength=\"2\"/>"));
+ "'a university'\" replacements=\"a\" context=\"This is an test.
This is a test of of language tool. ...\" contextoffset=\"8\"
errorlength=\"2\"/>"));
}
public void testGermanFileWithURL() throws Exception {
@@ -301,7 +315,7 @@
Main.main(args);
String output = new String(this.out.toByteArray(),"UTF-8");
assertTrue(output.indexOf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") ==
0);
- assertTrue(output.contains("<error fromy=\"0\" fromx=\"8\" toy=\"0\"
tox=\"21\" ruleId=\"BRAK_PRZECINKA_KTORY\" subId=\"5\""));
+ assertTrue(output.contains("<error fromy=\"0\" fromx=\"8\" toy=\"0\"
tox=\"20\" ruleId=\"BRAK_PRZECINKA_KTORY\" subId=\"5\""));
//This tests whether XML encoding is actually UTF-8:
assertTrue(output.contains("msg=\"Brak przecinka w tym fragmencie zdania.
Przecinek prawdopodobnie należy postawić tak: 'świnia, która'.\"
replacements=\"świnia, która\" "));
assertTrue(output.contains("context=\"To jest świnia która się ślini. \"
contextoffset=\"8\" errorlength=\"12\"/>"));
@@ -423,7 +437,7 @@
Main.main(args);
String output = new String(this.out.toByteArray());
assertTrue(output.indexOf("Expected text language: Polish") == 0);
- assertTrue(output.contains("Unknown words: [This, an, is]"));
+ assertTrue(output.contains("Unknown words: [This, an, is, language, of,
tool]"));
}
public void testNoListUnknown() throws Exception {
Modified: trunk/JLanguageTool/src/test/org/languagetool/test-en.txt
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/test-en.txt 2012-06-18
17:36:23 UTC (rev 7401)
+++ trunk/JLanguageTool/src/test/org/languagetool/test-en.txt 2012-06-18
17:43:15 UTC (rev 7402)
@@ -1 +1,5 @@
-This is an test.
\ No newline at end of file
+This is an test.
+
+This is a test of of language tool.
+
+This is is a test of language tool.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
