diff --git a/net/src/test/org/apollo/net/codec/game/TestGamePacketEncoder.java b/net/src/test/org/apollo/net/codec/game/TestGamePacketEncoder.java index 0c83d5df..d8fcd5ad 100644 --- a/net/src/test/org/apollo/net/codec/game/TestGamePacketEncoder.java +++ b/net/src/test/org/apollo/net/codec/game/TestGamePacketEncoder.java @@ -46,7 +46,7 @@ public class TestGamePacketEncoder { packet = new GamePacket(9, PacketType.VARIABLE_BYTE, payload.copy()); out.clear(); - encoder.encode(null, null, out); + encoder.encode(null, packet, out); buf = (ByteBuf) out.get(0); assertEquals(7, buf.readableBytes()); diff --git a/util/src/main/org/apollo/util/TextUtil.java b/util/src/main/org/apollo/util/TextUtil.java index 222b2a93..af262f34 100644 --- a/util/src/main/org/apollo/util/TextUtil.java +++ b/util/src/main/org/apollo/util/TextUtil.java @@ -19,22 +19,28 @@ public final class TextUtil { /** * Capitalizes the string correctly. * - * @param str The input string. + * @param string The input string. * @return The string with correct capitalization. */ - public static String capitalize(String str) { + public static String capitalize(String string) { boolean capitalize = true; - StringBuilder bldr = new StringBuilder(str); - for (int index = 0, length = str.length(); index < length; index++) { - char character = bldr.charAt(index); + StringBuilder builder = new StringBuilder(string); + int length = string.length(); + + for (int index = 0; index < length; index++) { + char character = builder.charAt(index); + if (character == '.' || character == '!' || character == '?') { capitalize = true; } else if (capitalize && !Character.isWhitespace(character)) { - bldr.setCharAt(index, Character.toUpperCase(character)); + builder.setCharAt(index, Character.toUpperCase(character)); capitalize = false; + } else { + builder.setCharAt(index, Character.toLowerCase(character)); } } - return bldr.toString(); + + return builder.toString(); } /** diff --git a/util/src/test/org/apollo/util/TestLanguageUtil.java b/util/src/test/org/apollo/util/TestLanguageUtil.java index 6a5f2b80..7178da0b 100644 --- a/util/src/test/org/apollo/util/TestLanguageUtil.java +++ b/util/src/test/org/apollo/util/TestLanguageUtil.java @@ -22,4 +22,4 @@ public class TestLanguageUtil { assertEquals("a", LanguageUtil.getIndefiniteArticle("foot")); } -} +} \ No newline at end of file diff --git a/util/src/test/org/apollo/util/TestTextUtil.java b/util/src/test/org/apollo/util/TestTextUtil.java index f55ec998..7a664a9b 100644 --- a/util/src/test/org/apollo/util/TestTextUtil.java +++ b/util/src/test/org/apollo/util/TestTextUtil.java @@ -16,9 +16,11 @@ public class TestTextUtil { */ @Test public void testCapitalize() { - String str = "tHiS is BAD capitAliZation. do You AGreE? YES!"; - String capitalized = "This is bad capitalization. Do you agree? Yes!"; - assertEquals(capitalized, TextUtil.capitalize(str)); + String incorrect = "tHiS is BAD capitAliZation. do You AGreE? YES!"; + String correct = "This is bad capitalization. Do you agree? Yes!"; + assertEquals(correct, TextUtil.capitalize(incorrect)); + + assertEquals("Test", TextUtil.capitalize("test")); } /**