mirror of
https://github.com/2006-Scape/apollo.git
synced 2026-07-07 08:39:17 +00:00
Fix two failing tests.
This commit is contained in:
@@ -46,7 +46,7 @@ public class TestGamePacketEncoder {
|
|||||||
|
|
||||||
packet = new GamePacket(9, PacketType.VARIABLE_BYTE, payload.copy());
|
packet = new GamePacket(9, PacketType.VARIABLE_BYTE, payload.copy());
|
||||||
out.clear();
|
out.clear();
|
||||||
encoder.encode(null, null, out);
|
encoder.encode(null, packet, out);
|
||||||
buf = (ByteBuf) out.get(0);
|
buf = (ByteBuf) out.get(0);
|
||||||
|
|
||||||
assertEquals(7, buf.readableBytes());
|
assertEquals(7, buf.readableBytes());
|
||||||
|
|||||||
@@ -19,22 +19,28 @@ public final class TextUtil {
|
|||||||
/**
|
/**
|
||||||
* Capitalizes the string correctly.
|
* Capitalizes the string correctly.
|
||||||
*
|
*
|
||||||
* @param str The input string.
|
* @param string The input string.
|
||||||
* @return The string with correct capitalization.
|
* @return The string with correct capitalization.
|
||||||
*/
|
*/
|
||||||
public static String capitalize(String str) {
|
public static String capitalize(String string) {
|
||||||
boolean capitalize = true;
|
boolean capitalize = true;
|
||||||
StringBuilder bldr = new StringBuilder(str);
|
StringBuilder builder = new StringBuilder(string);
|
||||||
for (int index = 0, length = str.length(); index < length; index++) {
|
int length = string.length();
|
||||||
char character = bldr.charAt(index);
|
|
||||||
|
for (int index = 0; index < length; index++) {
|
||||||
|
char character = builder.charAt(index);
|
||||||
|
|
||||||
if (character == '.' || character == '!' || character == '?') {
|
if (character == '.' || character == '!' || character == '?') {
|
||||||
capitalize = true;
|
capitalize = true;
|
||||||
} else if (capitalize && !Character.isWhitespace(character)) {
|
} else if (capitalize && !Character.isWhitespace(character)) {
|
||||||
bldr.setCharAt(index, Character.toUpperCase(character));
|
builder.setCharAt(index, Character.toUpperCase(character));
|
||||||
capitalize = false;
|
capitalize = false;
|
||||||
|
} else {
|
||||||
|
builder.setCharAt(index, Character.toLowerCase(character));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return bldr.toString();
|
|
||||||
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -22,4 +22,4 @@ public class TestLanguageUtil {
|
|||||||
assertEquals("a", LanguageUtil.getIndefiniteArticle("foot"));
|
assertEquals("a", LanguageUtil.getIndefiniteArticle("foot"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -16,9 +16,11 @@ public class TestTextUtil {
|
|||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testCapitalize() {
|
public void testCapitalize() {
|
||||||
String str = "tHiS is BAD capitAliZation. do You AGreE? YES!";
|
String incorrect = "tHiS is BAD capitAliZation. do You AGreE? YES!";
|
||||||
String capitalized = "This is bad capitalization. Do you agree? Yes!";
|
String correct = "This is bad capitalization. Do you agree? Yes!";
|
||||||
assertEquals(capitalized, TextUtil.capitalize(str));
|
assertEquals(correct, TextUtil.capitalize(incorrect));
|
||||||
|
|
||||||
|
assertEquals("Test", TextUtil.capitalize("test"));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user