Revision: 6556
http://languagetool.svn.sourceforge.net/languagetool/?rev=6556&view=rev
Author: maksim_davydov
Date: 2012-02-27 09:44:17 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Test failure problem corrected for non-utf8 based systems.
Added new maintainer for Ukrainian
Modified Paths:
--------------
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/WikipediaQuickCheck.java
trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
trunk/JLanguageTool/src/java/org/languagetool/tools/StringTools.java
trunk/JLanguageTool/src/test/org/languagetool/MainTest.java
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
Modified:
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/WikipediaQuickCheck.java
===================================================================
---
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/WikipediaQuickCheck.java
2012-02-26 18:08:08 UTC (rev 6555)
+++
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/WikipediaQuickCheck.java
2012-02-27 09:44:17 UTC (rev 6556)
@@ -128,7 +128,7 @@
private String getContent(URL wikipediaUrl) throws IOException {
final InputStream contentStream = (InputStream) wikipediaUrl.getContent();
- return StringTools.streamToString(contentStream);
+ return StringTools.streamToString(contentStream,"UTF-8");
}
/*public static void mainTest(String[] args) throws IOException {
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
2012-02-26 18:08:08 UTC (rev 6555)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
2012-02-27 09:44:17 UTC (rev 6556)
@@ -82,7 +82,9 @@
@Override
public Contributor[] getMaintainers() {
- return new Contributor[] {new Contributor("Andriy Rysin")};
+ return new Contributor[] {
+ new Contributor("Andriy Rysin"),
+ new Contributor("Maksym Davydov")};
}
@Override
Modified: trunk/JLanguageTool/src/java/org/languagetool/tools/StringTools.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tools/StringTools.java
2012-02-26 18:08:08 UTC (rev 6555)
+++ trunk/JLanguageTool/src/java/org/languagetool/tools/StringTools.java
2012-02-27 09:44:17 UTC (rev 6556)
@@ -247,6 +247,15 @@
}
}
+ public static String streamToString(final InputStream is, String
charsetName) throws IOException {
+ final InputStreamReader isr = new InputStreamReader(is, charsetName);
+ try {
+ return readerToString(isr);
+ } finally {
+ isr.close();
+ }
+ }
+
/**
* Calls escapeHTML(String).
*/
Modified: trunk/JLanguageTool/src/test/org/languagetool/MainTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/MainTest.java 2012-02-26
18:08:08 UTC (rev 6555)
+++ trunk/JLanguageTool/src/test/org/languagetool/MainTest.java 2012-02-27
09:44:17 UTC (rev 6556)
@@ -256,10 +256,10 @@
w.println("To jest świnia która się ślini.");
w.close();
- String[] args = new String[] {"-l", "pl", "--api",
input.getAbsolutePath()};
+ String[] args = new String[] {"-l", "pl", "--api", "-c", "utf-8",
input.getAbsolutePath()};
Main.main(args);
- String output = new String(this.out.toByteArray());
+ String output = new String(this.out.toByteArray(),"UTF-8");
assertTrue(output.indexOf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") ==
0);
assertTrue(output.indexOf("<error fromy=\"0\" fromx=\"8\" toy=\"0\"
tox=\"21\" ruleId=\"BRAK_PRZECINKA_KTORY\" subId=\"5\"") != -1);
//This tests whether XML encoding is actually UTF-8:
@@ -282,10 +282,10 @@
w.println("Test który wykaże błąd.");
w.close();
- String[] args = new String[] {"-l", "pl", input.getAbsolutePath()};
+ String[] args = new String[] {"-l", "pl", "-c", "utf-8",
input.getAbsolutePath()};
Main.main(args);
- String output = new String(this.out.toByteArray());
+ String output = new String(this.out.toByteArray(),"UTF-8");
assertTrue(output.indexOf("Expected text language: Polish") == 0);
assertTrue(output.indexOf("Line 8, column 1, Rule ID:
BRAK_PRZECINKA_KTORY") != -1);
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
2012-02-26 18:08:08 UTC (rev 6555)
+++ trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
2012-02-27 09:44:17 UTC (rev 6556)
@@ -79,7 +79,7 @@
assertTrue(checkByPOST(Language.ROMANIAN, "greșit
greșit").contains("greșit"));
// test supported language listing
final URL url = new URL("http://localhost:"; + HTTPServer.DEFAULT_PORT +
"/Languages");
- final String languagesXML = StringTools.streamToString((InputStream)
url.getContent());
+ final String languagesXML = StringTools.streamToString((InputStream)
url.getContent(), "UTF-8");
if (!languagesXML.contains("Romanian") ||
!languagesXML.contains("English")) {
fail("Error getting supported languages: " + languagesXML);
}
@@ -122,7 +122,7 @@
}
final URL url = new URL("http://localhost:"; + HTTPServer.DEFAULT_PORT +
urlOptions);
final InputStream stream = (InputStream)url.getContent();
- final String result = StringTools.streamToString(stream);
+ final String result = StringTools.streamToString(stream, "UTF-8");
return result;
}
@@ -134,7 +134,7 @@
}
final URL url = new URL("http://localhost:"; + HTTPServer.DEFAULT_PORT +
urlOptions);
final InputStream stream = (InputStream)url.getContent();
- final String result = StringTools.streamToString(stream);
+ final String result = StringTools.streamToString(stream, "UTF-8");
return result;
}
@@ -150,7 +150,7 @@
try {
wr.write(postData);
wr.flush();
- final String result =
StringTools.streamToString(connection.getInputStream());
+ final String result =
StringTools.streamToString(connection.getInputStream(), "UTF-8");
return result;
} finally {
wr.close();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
