Revision: 9271
http://languagetool.svn.sourceforge.net/languagetool/?rev=9271&view=rev
Author: dnaber
Date: 2013-01-30 21:26:14 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
improve test coverage a bit; tiny code cleanup
Modified Paths:
--------------
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/tools/StringTools.java
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tools/StringToolsTest.java
Modified:
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/tools/StringTools.java
===================================================================
---
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/tools/StringTools.java
2013-01-30 20:31:59 UTC (rev 9270)
+++
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/tools/StringTools.java
2013-01-30 21:26:14 UTC (rev 9271)
@@ -509,16 +509,14 @@
*/
public static String addSpace(final String word, final Language language) {
String space = " ";
- final int len = word.length();
- if (len == 1) {
+ if (word.length() == 1) {
final char c = word.charAt(0);
if ("fr".equals(language.getShortName())) {
if (c == '.' || c == ',') {
space = "";
}
} else {
- if (c == '.' || c == ',' || c == ';' || c == ':' || c == '?'
- || c == '!') {
+ if (c == '.' || c == ',' || c == ';' || c == ':' || c == '?' || c ==
'!') {
space = "";
}
}
Modified:
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tools/StringToolsTest.java
===================================================================
---
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tools/StringToolsTest.java
2013-01-30 20:31:59 UTC (rev 9270)
+++
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tools/StringToolsTest.java
2013-01-30 21:26:14 UTC (rev 9271)
@@ -21,6 +21,7 @@
import junit.framework.TestCase;
import org.languagetool.JLanguageTool;
import org.languagetool.Language;
+import org.languagetool.language.Contributor;
import org.languagetool.rules.Category;
import org.languagetool.rules.Rule;
import org.languagetool.rules.RuleMatch;
@@ -47,21 +48,15 @@
try {
StringTools.assureSet("", "varName");
fail();
- } catch (IllegalArgumentException expected) {
- // expected exception
- }
+ } catch (IllegalArgumentException expected) {}
try {
StringTools.assureSet(" \t", "varName");
fail();
- } catch (IllegalArgumentException expected) {
- // expected exception
- }
+ } catch (IllegalArgumentException expected) {}
try {
StringTools.assureSet(null, "varName");
fail();
- } catch (NullPointerException expected) {
- // expected exception
- }
+ } catch (NullPointerException expected) {}
StringTools.assureSet("foo", "varName");
}
@@ -99,7 +94,7 @@
public void testIsCapitalizedWord() {
assertTrue(StringTools.isCapitalizedWord("Abc"));
assertTrue(StringTools.isCapitalizedWord("Uppercase"));
- assertTrue(StringTools.isCapitalizedWord("Ipod"));
+ assertTrue(StringTools.isCapitalizedWord("Ipod"));
assertFalse(StringTools.isCapitalizedWord(""));
assertFalse(StringTools.isCapitalizedWord("ABC"));
@@ -262,9 +257,7 @@
try {
assertEquals(null, StringTools.trimWhitespace(null));
fail();
- } catch (NullPointerException expected) {
- // expected
- }
+ } catch (NullPointerException expected) {}
assertEquals("", StringTools.trimWhitespace(""));
assertEquals("", StringTools.trimWhitespace(" "));
assertEquals("XXY", StringTools.trimWhitespace(" \nXX\t Y"));
@@ -277,9 +270,13 @@
assertEquals("", StringTools.addSpace(",", Language.DEMO));
assertEquals("", StringTools.addSpace(",", Language.DEMO));
assertEquals("", StringTools.addSpace(",", Language.DEMO));
+ assertEquals("", StringTools.addSpace(".", new FakeLanguage("fr")));
+ assertEquals("", StringTools.addSpace(".", new FakeLanguage("de")));
+ assertEquals(" ", StringTools.addSpace("!", new FakeLanguage("fr")));
+ assertEquals("", StringTools.addSpace("!", new FakeLanguage("de")));
}
- public void testGetLabel() {
+ public void testGetLabel() {
assertEquals("This is a Label", StringTools.getLabel("This is a &Label"));
assertEquals("Bits & Pieces", StringTools.getLabel("Bits && Pieces"));
}
@@ -292,10 +289,8 @@
public void testGetMnemonic() {
assertEquals('F', StringTools.getMnemonic("&File"));
assertEquals('O', StringTools.getMnemonic("&OK"));
- assertEquals('\u0000',
- StringTools.getMnemonic("File && String operations"));
- assertEquals('O',
- StringTools.getMnemonic("File && String &Operations"));
+ assertEquals('\u0000', StringTools.getMnemonic("File && String
operations"));
+ assertEquals('O', StringTools.getMnemonic("File && String &Operations"));
}
public void testIsWhitespace() {
@@ -343,5 +338,39 @@
return "misspelling";
}
}
+
+ private class FakeLanguage extends Language {
+ private final String code;
+
+ private FakeLanguage(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String getShortName() {
+ return code;
+ }
+
+ @Override
+ public String getName() {
+ return "Fakelanguage-" + code;
+ }
+
+ @Override
+ public String[] getCountryVariants() {
+ return new String[] {"XX"};
+ }
+
+ @Override
+ public Contributor[] getMaintainers() {
+ return null;
+ }
+
+ @Override
+ public List<Class<? extends Rule>> getRelevantRules() {
+ return null;
+ }
+ }
+
}
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_jan
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
