Revision: 8367
http://languagetool.svn.sourceforge.net/languagetool/?rev=8367&view=rev
Author: dnaber
Date: 2012-11-11 20:55:14 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
simplify code a bit
Modified Paths:
--------------
trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java
Modified:
trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java
2012-11-11 16:50:36 UTC (rev 8366)
+++
trunk/JLanguageTool/src/test/java/org/languagetool/server/HTTPServerTest.java
2012-11-11 20:55:14 UTC (rev 8367)
@@ -28,6 +28,7 @@
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.commons.lang.StringUtils;
import org.junit.Ignore;
import org.junit.Test;
import org.languagetool.JLanguageTool;
@@ -188,23 +189,21 @@
}
}
- private String check(Language lang, String text) throws IOException {
- return check(lang, null, text);
- }
-
private String bitextCheck(Language lang, Language motherTongue, String
sourceText, String text) throws IOException {
String urlOptions = "/?language=" + lang.getShortName();
- urlOptions += "&srctext=" + URLEncoder.encode(sourceText, "UTF-8");
+ urlOptions += "&srctext=" + URLEncoder.encode(sourceText, "UTF-8");
urlOptions += "&text=" + URLEncoder.encode(text, "UTF-8"); // latin1 is
not enough for languages like polish, romanian, etc
if (null != motherTongue) {
urlOptions += "&motherTongue="+motherTongue.getShortName();
}
final URL url = new URL("http://localhost:"; + DEFAULT_PORT + urlOptions);
- final InputStream stream = (InputStream)url.getContent();
- final String result = StringTools.streamToString(stream, "UTF-8");
- return result;
+ return checkAtUrl(url);
}
-
+
+ private String check(Language lang, String text) throws IOException {
+ return check(lang, null, text);
+ }
+
private String check(Language lang, Language motherTongue, String text)
throws IOException {
String urlOptions = "/?language=" + lang.getShortName();
urlOptions += "&disabled=HUNSPELL_RULE&text=" + URLEncoder.encode(text,
"UTF-8"); // latin1 is not enough for languages like polish, romanian, etc
@@ -221,26 +220,23 @@
return result;
}
- private String checkWithOptions(Language lang, Language motherTongue, String
text,
- String[] enabledRules, String[] disabledRules) throws
IOException {
- String urlOptions = "/?language=" + lang.getShortName();
- urlOptions += "&text=" + URLEncoder.encode(text, "UTF-8"); //
latin1 is not enough for languages like polish, romanian, etc
- if (null != motherTongue) {
- urlOptions += "&motherTongue=" + motherTongue.getShortName();
- }
-
- if (disabledRules.length > 0) {
- urlOptions += "&disabled=" + join(disabledRules, ",");
- }
- if (enabledRules.length > 0) {
- urlOptions += "&enabled=" + join(enabledRules, ",");
- }
-
- final URL url = new URL("http://localhost:"; + DEFAULT_PORT +
urlOptions);
- final InputStream stream = (InputStream)url.getContent();
- final String result = StringTools.streamToString(stream, "UTF-8");
- return result;
-
+ private String checkWithOptions(Language lang, Language motherTongue, String
text,
+ String[] enabledRules, String[]
disabledRules) throws IOException {
+ String urlOptions = "/?language=" + lang.getShortName();
+ urlOptions += "&text=" + URLEncoder.encode(text, "UTF-8"); // latin1 is
not enough for languages like polish, romanian, etc
+ if (null != motherTongue) {
+ urlOptions += "&motherTongue=" + motherTongue.getShortName();
+ }
+
+ if (disabledRules.length > 0) {
+ urlOptions += "&disabled=" + StringUtils.join(disabledRules, ",");
+ }
+ if (enabledRules.length > 0) {
+ urlOptions += "&enabled=" + StringUtils.join(enabledRules, ",");
+ }
+
+ final URL url = new URL("http://localhost:"; + DEFAULT_PORT + urlOptions);
+ return checkAtUrl(url);
}
/**
@@ -255,20 +251,10 @@
try {
wr.write(postData);
wr.flush();
- final String result =
StringTools.streamToString(connection.getInputStream(), "UTF-8");
- return result;
+ return StringTools.streamToString(connection.getInputStream(),
"UTF-8");
} finally {
wr.close();
}
}
- private static String join(String[] s, String delimiter) {
- if (s == null || s.length == 0 ) return "";
- final StringBuilder builder = new StringBuilder(s[0]);
- for (int i = 1; i < s.length; i++) {
- builder.append(delimiter).append(s[i]);
- }
- return builder.toString();
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
Languagetool-commits mailing list
Languagetool-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
