http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java index d7efefd..9cf711e 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; /** * JUnit tests. - * + * * @see MutableInt */ public class MutableIntTest { @@ -33,9 +33,9 @@ public class MutableIntTest { @Test public void testConstructors() { assertEquals(0, new MutableInt().intValue()); - + assertEquals(1, new MutableInt(1).intValue()); - + assertEquals(2, new MutableInt(Integer.valueOf(2)).intValue()); assertEquals(3, new MutableInt(new MutableLong(3)).intValue()); @@ -53,15 +53,15 @@ public class MutableIntTest { final MutableInt mutNum = new MutableInt(0); assertEquals(0, new MutableInt().intValue()); assertEquals(Integer.valueOf(0), new MutableInt().getValue()); - + mutNum.setValue(1); assertEquals(1, mutNum.intValue()); assertEquals(Integer.valueOf(1), mutNum.getValue()); - + mutNum.setValue(Integer.valueOf(2)); assertEquals(2, mutNum.intValue()); assertEquals(Integer.valueOf(2), mutNum.getValue()); - + mutNum.setValue(new MutableLong(3)); assertEquals(3, mutNum.intValue()); assertEquals(Integer.valueOf(3), mutNum.getValue()); @@ -128,7 +128,7 @@ public class MutableIntTest { @Test public void testPrimitiveValues() { final MutableInt mutNum = new MutableInt(1); - + assertEquals( (byte) 1, mutNum.byteValue() ); assertEquals( (short) 1, mutNum.shortValue() ); assertEquals( 1.0F, mutNum.floatValue(), 0 ); @@ -146,7 +146,7 @@ public class MutableIntTest { public void testIncrement() { final MutableInt mutNum = new MutableInt(1); mutNum.increment(); - + assertEquals(2, mutNum.intValue()); assertEquals(2L, mutNum.longValue()); } @@ -175,7 +175,7 @@ public class MutableIntTest { public void testDecrement() { final MutableInt mutNum = new MutableInt(1); mutNum.decrement(); - + assertEquals(0, mutNum.intValue()); assertEquals(0L, mutNum.longValue()); } @@ -204,7 +204,7 @@ public class MutableIntTest { public void testAddValuePrimitive() { final MutableInt mutNum = new MutableInt(1); mutNum.add(1); - + assertEquals(2, mutNum.intValue()); assertEquals(2L, mutNum.longValue()); } @@ -213,7 +213,7 @@ public class MutableIntTest { public void testAddValueObject() { final MutableInt mutNum = new MutableInt(1); mutNum.add(Integer.valueOf(1)); - + assertEquals(2, mutNum.intValue()); assertEquals(2L, mutNum.longValue()); } @@ -258,7 +258,7 @@ public class MutableIntTest { public void testSubtractValuePrimitive() { final MutableInt mutNum = new MutableInt(1); mutNum.subtract(1); - + assertEquals(0, mutNum.intValue()); assertEquals(0L, mutNum.longValue()); } @@ -267,7 +267,7 @@ public class MutableIntTest { public void testSubtractValueObject() { final MutableInt mutNum = new MutableInt(1); mutNum.subtract(Integer.valueOf(1)); - + assertEquals(0, mutNum.intValue()); assertEquals(0L, mutNum.longValue()); }
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java index c65c789..1ec522e 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; /** * JUnit tests. - * + * * @see MutableLong */ public class MutableLongTest { @@ -33,9 +33,9 @@ public class MutableLongTest { @Test public void testConstructors() { assertEquals(0, new MutableLong().longValue()); - + assertEquals(1, new MutableLong(1).longValue()); - + assertEquals(2, new MutableLong(Long.valueOf(2)).longValue()); assertEquals(3, new MutableLong(new MutableLong(3)).longValue()); @@ -53,15 +53,15 @@ public class MutableLongTest { final MutableLong mutNum = new MutableLong(0); assertEquals(0, new MutableLong().longValue()); assertEquals(Long.valueOf(0), new MutableLong().getValue()); - + mutNum.setValue(1); assertEquals(1, mutNum.longValue()); assertEquals(Long.valueOf(1), mutNum.getValue()); - + mutNum.setValue(Long.valueOf(2)); assertEquals(2, mutNum.longValue()); assertEquals(Long.valueOf(2), mutNum.getValue()); - + mutNum.setValue(new MutableLong(3)); assertEquals(3, mutNum.longValue()); assertEquals(Long.valueOf(3), mutNum.getValue()); @@ -140,7 +140,7 @@ public class MutableLongTest { public void testIncrement() { final MutableLong mutNum = new MutableLong(1); mutNum.increment(); - + assertEquals(2, mutNum.intValue()); assertEquals(2L, mutNum.longValue()); } @@ -169,7 +169,7 @@ public class MutableLongTest { public void testDecrement() { final MutableLong mutNum = new MutableLong(1); mutNum.decrement(); - + assertEquals(0, mutNum.intValue()); assertEquals(0L, mutNum.longValue()); } @@ -198,7 +198,7 @@ public class MutableLongTest { public void testAddValuePrimitive() { final MutableLong mutNum = new MutableLong(1); mutNum.add(1); - + assertEquals(2, mutNum.intValue()); assertEquals(2L, mutNum.longValue()); } @@ -207,7 +207,7 @@ public class MutableLongTest { public void testAddValueObject() { final MutableLong mutNum = new MutableLong(1); mutNum.add(Long.valueOf(1)); - + assertEquals(2, mutNum.intValue()); assertEquals(2L, mutNum.longValue()); } @@ -252,7 +252,7 @@ public class MutableLongTest { public void testSubtractValuePrimitive() { final MutableLong mutNum = new MutableLong(1); mutNum.subtract(1); - + assertEquals(0, mutNum.intValue()); assertEquals(0L, mutNum.longValue()); } @@ -261,7 +261,7 @@ public class MutableLongTest { public void testSubtractValueObject() { final MutableLong mutNum = new MutableLong(1); mutNum.subtract(Long.valueOf(1)); - + assertEquals(0, mutNum.intValue()); assertEquals(0L, mutNum.longValue()); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java index 7e0047b..5050477 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,7 @@ import org.junit.Test; /** * JUnit tests. - * + * * @see MutableShort */ public class MutableObjectTest { @@ -35,7 +35,7 @@ public class MutableObjectTest { @Test public void testConstructors() { assertEquals(null, new MutableObject<String>().getValue()); - + final Integer i = Integer.valueOf(6); assertSame(i, new MutableObject<>(i).getValue()); assertSame("HI", new MutableObject<>("HI").getValue()); @@ -46,10 +46,10 @@ public class MutableObjectTest { public void testGetSet() { final MutableObject<String> mutNum = new MutableObject<>(); assertEquals(null, new MutableObject<>().getValue()); - + mutNum.setValue("HELLO"); assertSame("HELLO", mutNum.getValue()); - + mutNum.setValue(null); assertSame(null, mutNum.getValue()); } @@ -70,7 +70,7 @@ public class MutableObjectTest { assertTrue(mutNumC.equals(mutNumC)); assertFalse(mutNumA.equals(mutNumD)); assertTrue(mutNumD.equals(mutNumD)); - + assertFalse(mutNumA.equals(null)); assertFalse(mutNumA.equals(new Object())); assertFalse(mutNumA.equals("0")); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java index 2b91b79..fe926ff 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,7 @@ import static org.junit.Assert.fail; /** * JUnit tests. - * + * * @see MutableShort */ public class MutableShortTest { @@ -34,9 +34,9 @@ public class MutableShortTest { @Test public void testConstructors() { assertEquals((short) 0, new MutableShort().shortValue()); - + assertEquals((short) 1, new MutableShort((short) 1).shortValue()); - + assertEquals((short) 2, new MutableShort(Short.valueOf((short) 2)).shortValue()); assertEquals((short) 3, new MutableShort(new MutableShort((short) 3)).shortValue()); @@ -53,15 +53,15 @@ public class MutableShortTest { final MutableShort mutNum = new MutableShort((short) 0); assertEquals((short) 0, new MutableShort().shortValue()); assertEquals(Short.valueOf((short) 0), new MutableShort().getValue()); - + mutNum.setValue((short) 1); assertEquals((short) 1, mutNum.shortValue()); assertEquals(Short.valueOf((short) 1), mutNum.getValue()); - + mutNum.setValue(Short.valueOf((short) 2)); assertEquals((short) 2, mutNum.shortValue()); assertEquals(Short.valueOf((short) 2), mutNum.getValue()); - + mutNum.setValue(new MutableShort((short) 3)); assertEquals((short) 3, mutNum.shortValue()); assertEquals(Short.valueOf((short) 3), mutNum.getValue()); @@ -117,7 +117,7 @@ public class MutableShortTest { @Test public void testPrimitiveValues() { final MutableShort mutNum = new MutableShort( (short) 1 ); - + assertEquals( 1.0F, mutNum.floatValue(), 0 ); assertEquals( 1.0, mutNum.doubleValue(), 0 ); assertEquals( (byte) 1, mutNum.byteValue() ); @@ -136,7 +136,7 @@ public class MutableShortTest { public void testIncrement() { final MutableShort mutNum = new MutableShort((short) 1); mutNum.increment(); - + assertEquals(2, mutNum.intValue()); assertEquals(2L, mutNum.longValue()); } @@ -165,7 +165,7 @@ public class MutableShortTest { public void testDecrement() { final MutableShort mutNum = new MutableShort((short) 1); mutNum.decrement(); - + assertEquals(0, mutNum.intValue()); assertEquals(0L, mutNum.longValue()); } @@ -194,7 +194,7 @@ public class MutableShortTest { public void testAddValuePrimitive() { final MutableShort mutNum = new MutableShort((short) 1); mutNum.add((short) 1); - + assertEquals((short) 2, mutNum.shortValue()); } @@ -202,7 +202,7 @@ public class MutableShortTest { public void testAddValueObject() { final MutableShort mutNum = new MutableShort((short) 1); mutNum.add(Short.valueOf((short) 1)); - + assertEquals((short) 2, mutNum.shortValue()); } @@ -246,7 +246,7 @@ public class MutableShortTest { public void testSubtractValuePrimitive() { final MutableShort mutNum = new MutableShort((short) 1); mutNum.subtract((short) 1); - + assertEquals((short) 0, mutNum.shortValue()); } @@ -254,7 +254,7 @@ public class MutableShortTest { public void testSubtractValueObject() { final MutableShort mutNum = new MutableShort((short) 1); mutNum.subtract(Short.valueOf((short) 1)); - + assertEquals((short) 0, mutNum.shortValue()); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java index 3b7ca3c..16a3f59 100644 --- a/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java @@ -1332,7 +1332,7 @@ public class FieldUtilsTest { assertFalse(Modifier.isFinal(field.getModifiers())); assertFalse(field.isAccessible()); } - + @Test public void testRemoveFinalModifierWithAccess() throws Exception { final Field field = StaticContainer.class.getDeclaredField("IMMUTABLE_PRIVATE_2"); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java index 16069e9..b3cef7a 100644 --- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java @@ -685,14 +685,14 @@ public class TypeUtilsTest<B> { stringComparableType)); Assert.assertEquals("java.lang.Comparable<java.lang.String>", stringComparableType.toString()); } - + @Test public void testParameterizeWithOwner() throws Exception { final Type owner = TypeUtils.parameterize(TypeUtilsTest.class, String.class); final ParameterizedType dat2Type = TypeUtils.parameterizeWithOwner(owner, That.class, String.class, String.class); Assert.assertTrue(TypeUtils.equals(getClass().getField("dat2").getGenericType(), dat2Type)); } - + @Test public void testWildcardType() throws Exception { final WildcardType simpleWildcard = TypeUtils.wildcardType().withUpperBounds(String.class).build(); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/test/SystemDefaults.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/test/SystemDefaults.java b/src/test/java/org/apache/commons/lang3/test/SystemDefaults.java index e5893a2..0bb0912 100644 --- a/src/test/java/org/apache/commons/lang3/test/SystemDefaults.java +++ b/src/test/java/org/apache/commons/lang3/test/SystemDefaults.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitch.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitch.java b/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitch.java index 398341c..cc26fa4 100644 --- a/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitch.java +++ b/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitch.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,12 +26,12 @@ import org.junit.runners.model.Statement; /** * Test Rule used with {@link SystemDefaults} annotation that sets and restores the system default Locale and TimeZone. - * + * * <p> * Set up tests to use alternate system default Locale and/or TimeZone by creating an instance of this rule - * and annotating the test method with {@link SystemDefaults} + * and annotating the test method with {@link SystemDefaults} * </p> - * + * * <pre> * public class SystemDefaultsDependentTest { * @@ -48,7 +48,7 @@ import org.junit.runners.model.Statement; * public void testWithSimplifiedChinaDefaultLocale() { * // Locale.getDefault() will return Locale.CHINA until the end of this test method * } - * + * * {@literal @}Test * {@literal @}SystemDefaults(timezone="America/New_York") * public void testWithNorthAmericaEasternTimeZone() { @@ -58,7 +58,7 @@ import org.junit.runners.model.Statement; * </pre> */ public class SystemDefaultsSwitch implements TestRule { - + @Override public Statement apply(final Statement stmt, final Description description) { final SystemDefaults defaults = description.getAnnotation(SystemDefaults.class); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitchTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitchTest.java b/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitchTest.java index d85d6ab..f2cd6f5 100644 --- a/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitchTest.java +++ b/src/test/java/org/apache/commons/lang3/test/SystemDefaultsSwitchTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/text/CompositeFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/text/CompositeFormatTest.java b/src/test/java/org/apache/commons/lang3/text/CompositeFormatTest.java index 78202ff..f3b6cf7 100644 --- a/src/test/java/org/apache/commons/lang3/text/CompositeFormatTest.java +++ b/src/test/java/org/apache/commons/lang3/text/CompositeFormatTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,7 +34,7 @@ import java.util.Locale; public class CompositeFormatTest { /** - * Ensures that the parse/format separation is correctly maintained. + * Ensures that the parse/format separation is correctly maintained. */ @Test public void testCompositeFormat() { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java b/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java index f8916f6..41468a9 100644 --- a/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java +++ b/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -93,12 +93,12 @@ public class ExtendedMessageFormatTest { */ @Test public void testEscapedBraces_LANG_948() { - // message without placeholder because braces are escaped by quotes + // message without placeholder because braces are escaped by quotes final String pattern = "Message without placeholders '{}'"; final ExtendedMessageFormat emf = new ExtendedMessageFormat(pattern, registry); assertEquals("Message without placeholders {}", emf.format(new Object[] {"DUMMY"})); - // message with placeholder because quotes are escaped by quotes + // message with placeholder because quotes are escaped by quotes final String pattern2 = "Message with placeholder ''{0}''"; final ExtendedMessageFormat emf2 = new ExtendedMessageFormat(pattern2, registry); assertEquals("Message with placeholder 'DUMMY'", emf2.format(new Object[] {"DUMMY"})); @@ -313,7 +313,7 @@ public class ExtendedMessageFormatTest { other = new OtherExtendedMessageFormat(pattern, Locale.US, fmtRegistry); assertFalse("class, equals()", emf.equals(other)); assertTrue("class, hashcode()", emf.hashCode() == other.hashCode()); // same hashcode - + // Different pattern other = new ExtendedMessageFormat("X" + pattern, Locale.US, fmtRegistry); assertFalse("pattern, equals()", emf.equals(other)); @@ -471,7 +471,7 @@ public class ExtendedMessageFormatTest { final Map<String, ? extends FormatFactory> registry) { super(pattern, locale, registry); } - + } } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java b/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java index dbb38e2..ed86721 100644 --- a/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java +++ b/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -51,7 +51,7 @@ public class StrBuilderAppendInsertTest { StrBuilder sb = new StrBuilder("---"); sb.appendNewLine().append("+++"); assertEquals("---" + SEP + "+++", sb.toString()); - + sb = new StrBuilder("---"); sb.setNewLineText("#").appendNewLine().setNewLineText(null).appendNewLine(); assertEquals("---#" + SEP, sb.toString()); @@ -117,7 +117,7 @@ public class StrBuilderAppendInsertTest { sb.append(new StringBuilder("bld")); // Check it supports StringBuilder assertEquals("foobazyesSeqbld", sb.toString()); } - + //----------------------------------------------------------------------- @Test public void testAppend_StringBuilder() { @@ -216,7 +216,7 @@ public class StrBuilderAppendInsertTest { sb.append( (CharSequence)"abcbardef", 4, 3); assertEquals("foobarard", sb.toString()); } - + //----------------------------------------------------------------------- @Test public void testAppend_StringBuilder_int_int() { @@ -826,7 +826,7 @@ public class StrBuilderAppendInsertTest { final StrBuilder sb = new StrBuilder(); sb.appendln(true); assertEquals("true" + SEP, sb.toString()); - + sb.clear(); sb.appendln(false); assertEquals("false" + SEP, sb.toString()); @@ -838,15 +838,15 @@ public class StrBuilderAppendInsertTest { final StrBuilder sb = new StrBuilder(); sb.appendln(0); assertEquals("0" + SEP, sb.toString()); - + sb.clear(); sb.appendln(1L); assertEquals("1" + SEP, sb.toString()); - + sb.clear(); sb.appendln(2.3f); assertEquals("2.3" + SEP, sb.toString()); - + sb.clear(); sb.appendln(4.5d); assertEquals("4.5" + SEP, sb.toString()); @@ -1201,7 +1201,7 @@ public class StrBuilderAppendInsertTest { sb.appendSeparator(","); assertEquals("foo,", sb.toString()); } - + //----------------------------------------------------------------------- @Test public void testAppendSeparator_String_String() { @@ -1213,11 +1213,11 @@ public class StrBuilderAppendInsertTest { assertEquals("", sb.toString()); sb.appendSeparator(standardSeparator, null); assertEquals("", sb.toString()); - sb.appendSeparator(standardSeparator, startSeparator); + sb.appendSeparator(standardSeparator, startSeparator); assertEquals(startSeparator, sb.toString()); - sb.appendSeparator(null, null); + sb.appendSeparator(null, null); assertEquals(startSeparator, sb.toString()); - sb.appendSeparator(null, startSeparator); + sb.appendSeparator(null, startSeparator); assertEquals(startSeparator, sb.toString()); sb.append(foo); assertEquals(startSeparator + foo, sb.toString()); @@ -1260,7 +1260,7 @@ public class StrBuilderAppendInsertTest { assertEquals("foo", sb.toString()); sb.appendSeparator(",", 1); assertEquals("foo,", sb.toString()); - + sb.appendSeparator(",", -1); // no effect assertEquals("foo,", sb.toString()); } @@ -1275,7 +1275,7 @@ public class StrBuilderAppendInsertTest { assertEquals("foo", sb.toString()); sb.appendSeparator(',', 1); assertEquals("foo,", sb.toString()); - + sb.appendSeparator(',', -1); // no effect assertEquals("foo,", sb.toString()); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java index 09af460..ea684b6 100644 --- a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java +++ b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -305,7 +305,7 @@ public class StrBuilderTest { public void testLength() { final StrBuilder sb = new StrBuilder(); assertEquals(0, sb.length()); - + sb.append("Hello"); assertEquals(5, sb.length()); } @@ -334,7 +334,7 @@ public class StrBuilderTest { public void testCapacity() { final StrBuilder sb = new StrBuilder(); assertEquals(sb.buffer.length, sb.capacity()); - + sb.append("HelloWorldHelloWorldHelloWorldHelloWorld"); assertEquals(sb.buffer.length, sb.capacity()); } @@ -344,10 +344,10 @@ public class StrBuilderTest { final StrBuilder sb = new StrBuilder(); sb.ensureCapacity(2); assertTrue(sb.capacity() >= 2); - + sb.ensureCapacity(-1); assertTrue(sb.capacity() >= 0); - + sb.append("HelloWorld"); sb.ensureCapacity(40); assertTrue(sb.capacity() >= 40); @@ -358,7 +358,7 @@ public class StrBuilderTest { final StrBuilder sb = new StrBuilder(); sb.minimizeCapacity(); assertEquals(0, sb.capacity()); - + sb.append("HelloWorld"); sb.minimizeCapacity(); assertEquals(10, sb.capacity()); @@ -369,7 +369,7 @@ public class StrBuilderTest { public void testSize() { final StrBuilder sb = new StrBuilder(); assertEquals(0, sb.size()); - + sb.append("Hello"); assertEquals(5, sb.size()); } @@ -378,10 +378,10 @@ public class StrBuilderTest { public void testIsEmpty() { final StrBuilder sb = new StrBuilder(); assertTrue(sb.isEmpty()); - + sb.append("Hello"); assertFalse(sb.isEmpty()); - + sb.clear(); assertTrue(sb.isEmpty()); } @@ -463,8 +463,8 @@ public class StrBuilderTest { public void testDeleteCharAt() { final StrBuilder sb = new StrBuilder("abc"); sb.deleteCharAt(0); - assertEquals("bc", sb.toString()); - + assertEquals("bc", sb.toString()); + try { sb.deleteCharAt(1000); fail("Expected IndexOutOfBoundsException"); @@ -524,26 +524,26 @@ public class StrBuilderTest { @Test public void testGetChars ( ) { final StrBuilder sb = new StrBuilder(); - + char[] input = new char[10]; char[] a = sb.getChars(input); assertSame (input, a); assertTrue(Arrays.equals(new char[10], a)); - + sb.append("junit"); a = sb.getChars(input); assertSame(input, a); assertTrue(Arrays.equals(new char[] {'j','u','n','i','t',0,0,0,0,0},a)); - + a = sb.getChars(null); assertNotSame(input,a); assertEquals(5,a.length); assertTrue(Arrays.equals("junit".toCharArray(),a)); - + input = new char[5]; a = sb.getChars(input); assertSame(input, a); - + input = new char[4]; a = sb.getChars(input); assertNotSame(input, a); @@ -552,37 +552,37 @@ public class StrBuilderTest { @Test public void testGetCharsIntIntCharArrayInt( ) { final StrBuilder sb = new StrBuilder(); - + sb.append("junit"); char[] a = new char[5]; sb.getChars(0,5,a,0); assertTrue(Arrays.equals(new char[] {'j','u','n','i','t'},a)); - + a = new char[5]; sb.getChars(0,2,a,3); assertTrue(Arrays.equals(new char[] {0,0,0,'j','u'},a)); - + try { sb.getChars(-1,0,a,0); fail("no exception"); } catch (final IndexOutOfBoundsException e) { } - + try { sb.getChars(0,-1,a,0); fail("no exception"); } catch (final IndexOutOfBoundsException e) { } - + try { sb.getChars(0,20,a,0); fail("no exception"); } catch (final IndexOutOfBoundsException e) { } - + try { sb.getChars(4,2,a,0); fail("no exception"); @@ -596,14 +596,14 @@ public class StrBuilderTest { public void testDeleteIntInt() { StrBuilder sb = new StrBuilder("abc"); sb.delete(0, 1); - assertEquals("bc", sb.toString()); + assertEquals("bc", sb.toString()); sb.delete(1, 2); assertEquals("b", sb.toString()); sb.delete(0, 1); - assertEquals("", sb.toString()); + assertEquals("", sb.toString()); sb.delete(0, 1000); - assertEquals("", sb.toString()); - + assertEquals("", sb.toString()); + try { sb.delete(1, 2); fail("Expected IndexOutOfBoundsException"); @@ -612,7 +612,7 @@ public class StrBuilderTest { sb.delete(-1, 1); fail("Expected IndexOutOfBoundsException"); } catch (final IndexOutOfBoundsException e) {} - + sb = new StrBuilder("anything"); try { sb.delete(2, 1); @@ -663,7 +663,7 @@ public class StrBuilderTest { assertEquals("abcbccba", sb.toString()); sb.deleteAll(""); assertEquals("abcbccba", sb.toString()); - + sb.deleteAll("X"); assertEquals("abcbccba", sb.toString()); sb.deleteAll("a"); @@ -759,7 +759,7 @@ public class StrBuilderTest { assertEquals("btext", sb.toString()); sb.replace(0, 1000, "text"); assertEquals("text", sb.toString()); - + sb = new StrBuilder("atext"); sb.replace(1, 1, "ny"); assertEquals("anytext", sb.toString()); @@ -767,7 +767,7 @@ public class StrBuilderTest { sb.replace(2, 1, "anything"); fail("Expected IndexOutOfBoundsException"); } catch (final IndexOutOfBoundsException e) {} - + sb = new StrBuilder(); try { sb.replace(1, 2, "anything"); @@ -823,7 +823,7 @@ public class StrBuilderTest { assertEquals("abcbccba", sb.toString()); sb.replaceAll("", "anything"); assertEquals("abcbccba", sb.toString()); - + sb.replaceAll("x", "y"); assertEquals("abcbccba", sb.toString()); sb.replaceAll("a", "d"); @@ -832,11 +832,11 @@ public class StrBuilderTest { assertEquals("bcbccb", sb.toString()); sb.replaceAll("cb", "-"); assertEquals("b-c-", sb.toString()); - + sb = new StrBuilder("abcba"); sb.replaceAll("b", "xbx"); assertEquals("axbxcxbxa", sb.toString()); - + sb = new StrBuilder("bb"); sb.replaceAll("b", "xbx"); assertEquals("xbxxbx", sb.toString()); @@ -853,7 +853,7 @@ public class StrBuilderTest { assertEquals("abcbccba", sb.toString()); sb.replaceFirst("", "anything"); assertEquals("abcbccba", sb.toString()); - + sb.replaceFirst("x", "y"); assertEquals("abcbccba", sb.toString()); sb.replaceFirst("a", "d"); @@ -862,11 +862,11 @@ public class StrBuilderTest { assertEquals("bcbccba", sb.toString()); sb.replaceFirst("cb", "-"); assertEquals("b-ccba", sb.toString()); - + sb = new StrBuilder("abcba"); sb.replaceFirst("b", "xbx"); assertEquals("axbxcba", sb.toString()); - + sb = new StrBuilder("bb"); sb.replaceFirst("b", "xbx"); assertEquals("xbxb", sb.toString()); @@ -884,7 +884,7 @@ public class StrBuilderTest { assertEquals("abcbccba", sb.toString()); sb.replaceAll(StrMatcher.noneMatcher(), "anything"); assertEquals("abcbccba", sb.toString()); - + sb.replaceAll(StrMatcher.charMatcher('x'), "y"); assertEquals("abcbccba", sb.toString()); sb.replaceAll(StrMatcher.charMatcher('a'), "d"); @@ -893,15 +893,15 @@ public class StrBuilderTest { assertEquals("bcbccb", sb.toString()); sb.replaceAll(StrMatcher.stringMatcher("cb"), "-"); assertEquals("b-c-", sb.toString()); - + sb = new StrBuilder("abcba"); sb.replaceAll(StrMatcher.charMatcher('b'), "xbx"); assertEquals("axbxcxbxa", sb.toString()); - + sb = new StrBuilder("bb"); sb.replaceAll(StrMatcher.charMatcher('b'), "xbx"); assertEquals("xbxxbx", sb.toString()); - + sb = new StrBuilder("A1-A2A3-A4"); sb.replaceAll(A_NUMBER_MATCHER, "***"); assertEquals("***-******-***", sb.toString()); @@ -922,7 +922,7 @@ public class StrBuilderTest { assertEquals("abcbccba", sb.toString()); sb.replaceFirst(StrMatcher.noneMatcher(), "anything"); assertEquals("abcbccba", sb.toString()); - + sb.replaceFirst(StrMatcher.charMatcher('x'), "y"); assertEquals("abcbccba", sb.toString()); sb.replaceFirst(StrMatcher.charMatcher('a'), "d"); @@ -931,15 +931,15 @@ public class StrBuilderTest { assertEquals("bcbccba", sb.toString()); sb.replaceFirst(StrMatcher.stringMatcher("cb"), "-"); assertEquals("b-ccba", sb.toString()); - + sb = new StrBuilder("abcba"); sb.replaceFirst(StrMatcher.charMatcher('b'), "xbx"); assertEquals("axbxcba", sb.toString()); - + sb = new StrBuilder("bb"); sb.replaceFirst(StrMatcher.charMatcher('b'), "xbx"); assertEquals("xbxb", sb.toString()); - + sb = new StrBuilder("A1-A2A3-A4"); sb.replaceFirst(A_NUMBER_MATCHER, "***"); assertEquals("***-A2A3-A4", sb.toString()); @@ -951,17 +951,17 @@ public class StrBuilderTest { StrBuilder sb = new StrBuilder("abcbccba"); sb.replace(null, "x", 0, sb.length(), -1); assertEquals("abcbccba", sb.toString()); - + sb.replace(StrMatcher.charMatcher('a'), "x", 0, sb.length(), -1); assertEquals("xbcbccbx", sb.toString()); - + sb.replace(StrMatcher.stringMatcher("cb"), "x", 0, sb.length(), -1); assertEquals("xbxcxx", sb.toString()); - + sb = new StrBuilder("A1-A2A3-A4"); sb.replace(A_NUMBER_MATCHER, "***", 0, sb.length(), -1); assertEquals("***-******-***", sb.toString()); - + sb = new StrBuilder(); sb.replace(A_NUMBER_MATCHER, "***", 0, sb.length(), -1); assertEquals("", sb.toString()); @@ -972,19 +972,19 @@ public class StrBuilderTest { StrBuilder sb = new StrBuilder("abcbccba"); sb.replace(StrMatcher.stringMatcher("cb"), "cb", 0, sb.length(), -1); assertEquals("abcbccba", sb.toString()); - + sb = new StrBuilder("abcbccba"); sb.replace(StrMatcher.stringMatcher("cb"), "-", 0, sb.length(), -1); assertEquals("ab-c-a", sb.toString()); - + sb = new StrBuilder("abcbccba"); sb.replace(StrMatcher.stringMatcher("cb"), "+++", 0, sb.length(), -1); assertEquals("ab+++c+++a", sb.toString()); - + sb = new StrBuilder("abcbccba"); sb.replace(StrMatcher.stringMatcher("cb"), "", 0, sb.length(), -1); assertEquals("abca", sb.toString()); - + sb = new StrBuilder("abcbccba"); sb.replace(StrMatcher.stringMatcher("cb"), null, 0, sb.length(), -1); assertEquals("abca", sb.toString()); @@ -995,54 +995,54 @@ public class StrBuilderTest { StrBuilder sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, sb.length(), -1); assertEquals("-x--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 1, sb.length(), -1); assertEquals("aax--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 2, sb.length(), -1); assertEquals("aax--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 3, sb.length(), -1); assertEquals("aax--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 4, sb.length(), -1); assertEquals("aaxa-ay-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 5, sb.length(), -1); assertEquals("aaxaa-y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 6, sb.length(), -1); assertEquals("aaxaaaay-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 7, sb.length(), -1); assertEquals("aaxaaaay-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 8, sb.length(), -1); assertEquals("aaxaaaay-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 9, sb.length(), -1); assertEquals("aaxaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 10, sb.length(), -1); assertEquals("aaxaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); try { sb.replace(StrMatcher.stringMatcher("aa"), "-", 11, sb.length(), -1); fail(); } catch (final IndexOutOfBoundsException ex) {} assertEquals("aaxaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); try { sb.replace(StrMatcher.stringMatcher("aa"), "-", -1, sb.length(), -1); @@ -1056,47 +1056,47 @@ public class StrBuilderTest { StrBuilder sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 0, -1); assertEquals("aaxaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 2, -1); assertEquals("-xaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 3, -1); assertEquals("-xaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 4, -1); assertEquals("-xaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 5, -1); assertEquals("-x-aayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 6, -1); assertEquals("-x-aayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 7, -1); assertEquals("-x--yaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 8, -1); assertEquals("-x--yaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 9, -1); assertEquals("-x--yaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, -1); assertEquals("-x--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 1000, -1); assertEquals("-x--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); try { sb.replace(StrMatcher.stringMatcher("aa"), "-", 2, 1, -1); @@ -1110,27 +1110,27 @@ public class StrBuilderTest { StrBuilder sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, -1); assertEquals("-x--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, 0); assertEquals("aaxaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, 1); assertEquals("-xaaaayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, 2); assertEquals("-x-aayaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, 3); assertEquals("-x--yaa", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, 4); assertEquals("-x--y-", sb.toString()); - + sb = new StrBuilder("aaxaaaayaa"); sb.replace(StrMatcher.stringMatcher("aa"), "-", 0, 10, 5); assertEquals("-x--y-", sb.toString()); @@ -1141,7 +1141,7 @@ public class StrBuilderTest { public void testReverse() { final StrBuilder sb = new StrBuilder(); assertEquals("", sb.reverse().toString()); - + sb.clear().append(true); assertEquals("eurt", sb.reverse().toString()); assertEquals("true", sb.reverse().toString()); @@ -1152,19 +1152,19 @@ public class StrBuilderTest { public void testTrim() { final StrBuilder sb = new StrBuilder(); assertEquals("", sb.reverse().toString()); - + sb.clear().append(" \u0000 "); assertEquals("", sb.trim().toString()); - + sb.clear().append(" \u0000 a b c"); assertEquals("a b c", sb.trim().toString()); - + sb.clear().append("a b c \u0000 "); assertEquals("a b c", sb.trim().toString()); - + sb.clear().append(" \u0000 a b c \u0000 "); assertEquals("a b c", sb.trim().toString()); - + sb.clear().append("a b c"); assertEquals("a b c", sb.trim().toString()); } @@ -1209,25 +1209,25 @@ public class StrBuilderTest { sb.subSequence(-1, 5); fail(); } catch (final IndexOutOfBoundsException e) {} - + // End index is negative try { sb.subSequence(2, -1); fail(); } catch (final IndexOutOfBoundsException e) {} - + // End index greater than length() try { sb.subSequence(2, sb.length() + 1); fail(); } catch (final IndexOutOfBoundsException e) {} - + // Start index greater then end index try { sb.subSequence(3, 2); fail(); } catch (final IndexOutOfBoundsException e) {} - + // Normal cases assertEquals ("hello", sb.subSequence(0, 5)); assertEquals ("hello goodbye".subSequence(0, 6), sb.subSequence(0, 6)); @@ -1246,30 +1246,30 @@ public class StrBuilderTest { sb.substring(-1); fail (); } catch (final IndexOutOfBoundsException e) {} - + try { sb.substring(15); fail (); } catch (final IndexOutOfBoundsException e) {} - + } - + @Test public void testSubstringIntInt() { final StrBuilder sb = new StrBuilder ("hello goodbye"); assertEquals ("hello", sb.substring(0, 5)); assertEquals ("hello goodbye".substring(0, 6), sb.substring(0, 6)); - + assertEquals ("goodbye", sb.substring(6, 13)); assertEquals ("hello goodbye".substring(6,13), sb.substring(6, 13)); - + assertEquals ("goodbye", sb.substring(6, 20)); - + try { sb.substring(-1, 5); fail(); } catch (final IndexOutOfBoundsException e) {} - + try { sb.substring(15, 20); fail(); @@ -1346,7 +1346,7 @@ public class StrBuilderTest { public void testIndexOf_char() { final StrBuilder sb = new StrBuilder("abab"); assertEquals(0, sb.indexOf('a')); - + // should work like String#indexOf assertEquals("abab".indexOf('a'), sb.indexOf('a')); @@ -1381,14 +1381,14 @@ public class StrBuilderTest { @Test public void testLastIndexOf_char() { final StrBuilder sb = new StrBuilder("abab"); - + assertEquals (2, sb.lastIndexOf('a')); //should work like String#lastIndexOf assertEquals ("abab".lastIndexOf('a'), sb.lastIndexOf('a')); - + assertEquals(3, sb.lastIndexOf('b')); assertEquals ("abab".lastIndexOf('b'), sb.lastIndexOf('b')); - + assertEquals (-1, sb.lastIndexOf('z')); } @@ -1416,23 +1416,23 @@ public class StrBuilderTest { @Test public void testIndexOf_String() { final StrBuilder sb = new StrBuilder("abab"); - + assertEquals(0, sb.indexOf("a")); //should work like String#indexOf assertEquals("abab".indexOf("a"), sb.indexOf("a")); - + assertEquals(0, sb.indexOf("ab")); //should work like String#indexOf assertEquals("abab".indexOf("ab"), sb.indexOf("ab")); - + assertEquals(1, sb.indexOf("b")); assertEquals("abab".indexOf("b"), sb.indexOf("b")); - + assertEquals(1, sb.indexOf("ba")); assertEquals("abab".indexOf("ba"), sb.indexOf("ba")); - + assertEquals(-1, sb.indexOf("z")); - + assertEquals(-1, sb.indexOf((String) null)); } @@ -1446,53 +1446,53 @@ public class StrBuilderTest { assertEquals(-1, sb.indexOf("a", 3)); assertEquals(-1, sb.indexOf("a", 4)); assertEquals(-1, sb.indexOf("a", 5)); - + assertEquals(-1, sb.indexOf("abcdef", 0)); assertEquals(0, sb.indexOf("", 0)); assertEquals(1, sb.indexOf("", 1)); - + //should work like String#indexOf assertEquals ("abab".indexOf("a", 1), sb.indexOf("a", 1)); - + assertEquals(2, sb.indexOf("ab", 1)); //should work like String#indexOf assertEquals("abab".indexOf("ab", 1), sb.indexOf("ab", 1)); - + assertEquals(3, sb.indexOf("b", 2)); assertEquals("abab".indexOf("b", 2), sb.indexOf("b", 2)); - + assertEquals(1, sb.indexOf("ba", 1)); assertEquals("abab".indexOf("ba", 2), sb.indexOf("ba", 2)); - + assertEquals(-1, sb.indexOf("z", 2)); - + sb = new StrBuilder("xyzabc"); assertEquals(2, sb.indexOf("za", 0)); assertEquals(-1, sb.indexOf("za", 3)); - + assertEquals(-1, sb.indexOf((String) null, 2)); } @Test public void testLastIndexOf_String() { final StrBuilder sb = new StrBuilder("abab"); - + assertEquals(2, sb.lastIndexOf("a")); //should work like String#lastIndexOf assertEquals("abab".lastIndexOf("a"), sb.lastIndexOf("a")); - + assertEquals(2, sb.lastIndexOf("ab")); //should work like String#lastIndexOf assertEquals("abab".lastIndexOf("ab"), sb.lastIndexOf("ab")); - + assertEquals(3, sb.lastIndexOf("b")); assertEquals("abab".lastIndexOf("b"), sb.lastIndexOf("b")); - + assertEquals(1, sb.lastIndexOf("ba")); assertEquals("abab".lastIndexOf("ba"), sb.lastIndexOf("ba")); - + assertEquals(-1, sb.lastIndexOf("z")); - + assertEquals(-1, sb.lastIndexOf((String) null)); } @@ -1506,30 +1506,30 @@ public class StrBuilderTest { assertEquals(2, sb.lastIndexOf("a", 3)); assertEquals(2, sb.lastIndexOf("a", 4)); assertEquals(2, sb.lastIndexOf("a", 5)); - + assertEquals(-1, sb.lastIndexOf("abcdef", 3)); assertEquals("abab".lastIndexOf("", 3), sb.lastIndexOf("", 3)); assertEquals("abab".lastIndexOf("", 1), sb.lastIndexOf("", 1)); - + //should work like String#lastIndexOf assertEquals("abab".lastIndexOf("a", 1), sb.lastIndexOf("a", 1)); - + assertEquals(0, sb.lastIndexOf("ab", 1)); //should work like String#lastIndexOf assertEquals("abab".lastIndexOf("ab", 1), sb.lastIndexOf("ab", 1)); - + assertEquals(1, sb.lastIndexOf("b", 2)); assertEquals("abab".lastIndexOf("b", 2), sb.lastIndexOf("b", 2)); - + assertEquals(1, sb.lastIndexOf("ba", 2)); assertEquals("abab".lastIndexOf("ba", 2), sb.lastIndexOf("ba", 2)); - + assertEquals(-1, sb.lastIndexOf("z", 2)); - + sb = new StrBuilder("xyzabc"); assertEquals(2, sb.lastIndexOf("za", sb.length())); assertEquals(-1, sb.lastIndexOf("za", 1)); - + assertEquals(-1, sb.lastIndexOf((String) null, 2)); } @@ -1539,7 +1539,7 @@ public class StrBuilderTest { final StrBuilder sb = new StrBuilder(); assertEquals(-1, sb.indexOf((StrMatcher) null)); assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('a'))); - + sb.append("ab bd"); assertEquals(0, sb.indexOf(StrMatcher.charMatcher('a'))); assertEquals(1, sb.indexOf(StrMatcher.charMatcher('b'))); @@ -1547,7 +1547,7 @@ public class StrBuilderTest { assertEquals(4, sb.indexOf(StrMatcher.charMatcher('d'))); assertEquals(-1, sb.indexOf(StrMatcher.noneMatcher())); assertEquals(-1, sb.indexOf((StrMatcher) null)); - + sb.append(" A1 junction"); assertEquals(6, sb.indexOf(A_NUMBER_MATCHER)); } @@ -1558,13 +1558,13 @@ public class StrBuilderTest { assertEquals(-1, sb.indexOf((StrMatcher) null, 2)); assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('a'), 2)); assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('a'), 0)); - + sb.append("ab bd"); assertEquals(0, sb.indexOf(StrMatcher.charMatcher('a'), -2)); assertEquals(0, sb.indexOf(StrMatcher.charMatcher('a'), 0)); assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('a'), 2)); assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('a'), 20)); - + assertEquals(1, sb.indexOf(StrMatcher.charMatcher('b'), -1)); assertEquals(1, sb.indexOf(StrMatcher.charMatcher('b'), 0)); assertEquals(1, sb.indexOf(StrMatcher.charMatcher('b'), 1)); @@ -1573,16 +1573,16 @@ public class StrBuilderTest { assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('b'), 4)); assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('b'), 5)); assertEquals(-1, sb.indexOf(StrMatcher.charMatcher('b'), 6)); - + assertEquals(2, sb.indexOf(StrMatcher.spaceMatcher(), -2)); assertEquals(2, sb.indexOf(StrMatcher.spaceMatcher(), 0)); assertEquals(2, sb.indexOf(StrMatcher.spaceMatcher(), 2)); assertEquals(-1, sb.indexOf(StrMatcher.spaceMatcher(), 4)); assertEquals(-1, sb.indexOf(StrMatcher.spaceMatcher(), 20)); - + assertEquals(-1, sb.indexOf(StrMatcher.noneMatcher(), 0)); assertEquals(-1, sb.indexOf((StrMatcher) null, 0)); - + sb.append(" A1 junction with A2"); assertEquals(6, sb.indexOf(A_NUMBER_MATCHER, 5)); assertEquals(6, sb.indexOf(A_NUMBER_MATCHER, 6)); @@ -1597,7 +1597,7 @@ public class StrBuilderTest { final StrBuilder sb = new StrBuilder(); assertEquals(-1, sb.lastIndexOf((StrMatcher) null)); assertEquals(-1, sb.lastIndexOf(StrMatcher.charMatcher('a'))); - + sb.append("ab bd"); assertEquals(0, sb.lastIndexOf(StrMatcher.charMatcher('a'))); assertEquals(3, sb.lastIndexOf(StrMatcher.charMatcher('b'))); @@ -1605,7 +1605,7 @@ public class StrBuilderTest { assertEquals(4, sb.lastIndexOf(StrMatcher.charMatcher('d'))); assertEquals(-1, sb.lastIndexOf(StrMatcher.noneMatcher())); assertEquals(-1, sb.lastIndexOf((StrMatcher) null)); - + sb.append(" A1 junction"); assertEquals(6, sb.lastIndexOf(A_NUMBER_MATCHER)); } @@ -1617,13 +1617,13 @@ public class StrBuilderTest { assertEquals(-1, sb.lastIndexOf(StrMatcher.charMatcher('a'), 2)); assertEquals(-1, sb.lastIndexOf(StrMatcher.charMatcher('a'), 0)); assertEquals(-1, sb.lastIndexOf(StrMatcher.charMatcher('a'), -1)); - + sb.append("ab bd"); assertEquals(-1, sb.lastIndexOf(StrMatcher.charMatcher('a'), -2)); assertEquals(0, sb.lastIndexOf(StrMatcher.charMatcher('a'), 0)); assertEquals(0, sb.lastIndexOf(StrMatcher.charMatcher('a'), 2)); assertEquals(0, sb.lastIndexOf(StrMatcher.charMatcher('a'), 20)); - + assertEquals(-1, sb.lastIndexOf(StrMatcher.charMatcher('b'), -1)); assertEquals(-1, sb.lastIndexOf(StrMatcher.charMatcher('b'), 0)); assertEquals(1, sb.lastIndexOf(StrMatcher.charMatcher('b'), 1)); @@ -1632,16 +1632,16 @@ public class StrBuilderTest { assertEquals(3, sb.lastIndexOf(StrMatcher.charMatcher('b'), 4)); assertEquals(3, sb.lastIndexOf(StrMatcher.charMatcher('b'), 5)); assertEquals(3, sb.lastIndexOf(StrMatcher.charMatcher('b'), 6)); - + assertEquals(-1, sb.lastIndexOf(StrMatcher.spaceMatcher(), -2)); assertEquals(-1, sb.lastIndexOf(StrMatcher.spaceMatcher(), 0)); assertEquals(2, sb.lastIndexOf(StrMatcher.spaceMatcher(), 2)); assertEquals(2, sb.lastIndexOf(StrMatcher.spaceMatcher(), 4)); assertEquals(2, sb.lastIndexOf(StrMatcher.spaceMatcher(), 20)); - + assertEquals(-1, sb.lastIndexOf(StrMatcher.noneMatcher(), 0)); assertEquals(-1, sb.lastIndexOf((StrMatcher) null, 0)); - + sb.append(" A1 junction with A2"); assertEquals(-1, sb.lastIndexOf(A_NUMBER_MATCHER, 5)); assertEquals(-1, sb.lastIndexOf(A_NUMBER_MATCHER, 6)); // A matches, 1 is outside bounds @@ -1671,13 +1671,13 @@ public class StrBuilderTest { final StrBuilder b = new StrBuilder(); b.append("a b "); final StrTokenizer t = b.asTokenizer(); - + final String[] tokens1 = t.getTokenArray(); assertEquals(2, tokens1.length); assertEquals("a", tokens1[0]); assertEquals("b", tokens1[1]); assertEquals(2, t.size()); - + b.append("c d "); final String[] tokens2 = t.getTokenArray(); assertEquals(2, tokens2.length); @@ -1686,7 +1686,7 @@ public class StrBuilderTest { assertEquals(2, t.size()); assertEquals("a", t.next()); assertEquals("b", t.next()); - + t.reset(); final String[] tokens3 = t.getTokenArray(); assertEquals(4, tokens3.length); @@ -1699,7 +1699,7 @@ public class StrBuilderTest { assertEquals("b", t.next()); assertEquals("c", t.next()); assertEquals("d", t.next()); - + assertEquals("a b c d ", t.getContent()); } @@ -1712,12 +1712,12 @@ public class StrBuilderTest { final char[] buf = new char[40]; assertEquals(9, reader.read(buf)); assertEquals("some text", new String(buf, 0, 9)); - + assertEquals(-1, reader.read()); assertFalse(reader.ready()); assertEquals(0, reader.skip(2)); assertEquals(0, reader.skip(-1)); - + assertTrue(reader.markSupported()); reader = sb.asReader(); assertEquals('s', reader.read()); @@ -1734,11 +1734,11 @@ public class StrBuilderTest { assertEquals('e', array[2]); assertEquals(2, reader.skip(2)); assertEquals(' ', reader.read()); - + assertTrue(reader.ready()); reader.close(); assertTrue(reader.ready()); - + reader = sb.asReader(); array = new char[3]; try { @@ -1761,15 +1761,15 @@ public class StrBuilderTest { reader.read(array, Integer.MAX_VALUE, Integer.MAX_VALUE); fail(); } catch (final IndexOutOfBoundsException ex) {} - + assertEquals(0, reader.read(array, 0, 0)); assertEquals(0, array[0]); assertEquals(0, array[1]); assertEquals(0, array[2]); - + reader.skip(9); assertEquals(-1, reader.read(array, 0, 1)); - + reader.reset(); array = new char[30]; assertEquals(9, reader.read(array, 0, 30)); @@ -1780,31 +1780,31 @@ public class StrBuilderTest { public void testAsWriter() throws Exception { final StrBuilder sb = new StrBuilder("base"); final Writer writer = sb.asWriter(); - + writer.write('l'); assertEquals("basel", sb.toString()); - + writer.write(new char[] {'i', 'n'}); assertEquals("baselin", sb.toString()); - + writer.write(new char[] {'n', 'e', 'r'}, 1, 2); assertEquals("baseliner", sb.toString()); - + writer.write(" rout"); assertEquals("baseliner rout", sb.toString()); - + writer.write("ping that server", 1, 3); assertEquals("baseliner routing", sb.toString()); - + writer.flush(); // no effect assertEquals("baseliner routing", sb.toString()); - + writer.close(); // no effect assertEquals("baseliner routing", sb.toString()); - + writer.write(" hi"); // works after close assertEquals("baseliner routing hi", sb.toString()); - + sb.setLength(4); // mix and match writer.write('d'); assertEquals("based", sb.toString()); @@ -1818,18 +1818,18 @@ public class StrBuilderTest { assertTrue(sb1.equalsIgnoreCase(sb1)); assertTrue(sb1.equalsIgnoreCase(sb2)); assertTrue(sb2.equalsIgnoreCase(sb2)); - + sb1.append("abc"); assertFalse(sb1.equalsIgnoreCase(sb2)); - + sb2.append("ABC"); assertTrue(sb1.equalsIgnoreCase(sb2)); - + sb2.clear().append("abc"); assertTrue(sb1.equalsIgnoreCase(sb2)); assertTrue(sb1.equalsIgnoreCase(sb1)); assertTrue(sb2.equalsIgnoreCase(sb2)); - + sb2.clear().append("aBc"); assertTrue(sb1.equalsIgnoreCase(sb2)); } @@ -1843,19 +1843,19 @@ public class StrBuilderTest { assertTrue(sb1.equals(sb1)); assertTrue(sb2.equals(sb2)); assertTrue(sb1.equals((Object) sb2)); - + sb1.append("abc"); assertFalse(sb1.equals(sb2)); assertFalse(sb1.equals((Object) sb2)); - + sb2.append("ABC"); assertFalse(sb1.equals(sb2)); assertFalse(sb1.equals((Object) sb2)); - + sb2.clear().append("abc"); assertTrue(sb1.equals(sb2)); assertTrue(sb1.equals((Object) sb2)); - + assertFalse(sb1.equals(Integer.valueOf(1))); assertFalse(sb1.equals("abc")); } @@ -1875,7 +1875,7 @@ public class StrBuilderTest { final int hc1b = sb.hashCode(); assertEquals(0, hc1a); assertEquals(hc1a, hc1b); - + sb.append("abc"); final int hc2a = sb.hashCode(); final int hc2b = sb.hashCode(); @@ -1895,7 +1895,7 @@ public class StrBuilderTest { public void testToStringBuffer() { final StrBuilder sb = new StrBuilder(); assertEquals(new StringBuffer().toString(), sb.toStringBuffer().toString()); - + sb.append("junit"); assertEquals(new StringBuffer("junit").toString(), sb.toStringBuffer().toString()); } @@ -1905,7 +1905,7 @@ public class StrBuilderTest { public void testToStringBuilder() { final StrBuilder sb = new StrBuilder(); assertEquals(new StringBuilder().toString(), sb.toStringBuilder().toString()); - + sb.append("junit"); assertEquals(new StringBuilder("junit").toString(), sb.toStringBuilder().toString()); } @@ -1915,7 +1915,7 @@ public class StrBuilderTest { public void testLang294() { final StrBuilder sb = new StrBuilder("\n%BLAH%\nDo more stuff\neven more stuff\n%BLAH%\n"); sb.deleteAll("\n%BLAH%"); - assertEquals("\nDo more stuff\neven more stuff\n", sb.toString()); + assertEquals("\nDo more stuff\neven more stuff\n", sb.toString()); } @Test http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java b/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java index 1b286eb..c26f22e 100644 --- a/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java +++ b/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java b/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java index d9afde2..7325b7a 100644 --- a/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java +++ b/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -506,7 +506,7 @@ public class StrTokenizerTest { final StrTokenizer tok = new StrTokenizer(input); final String[] array = tok.getTokenArray(); final List<?> list = tok.getTokenList(); - + assertEquals(Arrays.asList(array), list); assertEquals(3, list.size()); } @@ -555,7 +555,7 @@ public class StrTokenizerTest { tok = new StrTokenizer(input.toCharArray()); assertEquals(input, tok.getContent()); - + tok = new StrTokenizer(); assertEquals(null, tok.getContent()); } @@ -623,7 +623,7 @@ public class StrTokenizerTest { assertEquals("b", tokenizer.nextToken()); assertEquals("a", clonedTokenizer.nextToken()); } - + // ----------------------------------------------------------------------- @Test public void testConstructor_String() { @@ -631,10 +631,10 @@ public class StrTokenizerTest { assertEquals("a", tok.next()); assertEquals("b", tok.next()); assertFalse(tok.hasNext()); - + tok = new StrTokenizer(""); assertFalse(tok.hasNext()); - + tok = new StrTokenizer((String) null); assertFalse(tok.hasNext()); } @@ -647,10 +647,10 @@ public class StrTokenizerTest { assertEquals("a", tok.next()); assertEquals("b", tok.next()); assertFalse(tok.hasNext()); - + tok = new StrTokenizer("", ' '); assertFalse(tok.hasNext()); - + tok = new StrTokenizer((String) null, ' '); assertFalse(tok.hasNext()); } @@ -664,10 +664,10 @@ public class StrTokenizerTest { assertEquals("a", tok.next()); assertEquals("b", tok.next()); assertFalse(tok.hasNext()); - + tok = new StrTokenizer("", ' ', '"'); assertFalse(tok.hasNext()); - + tok = new StrTokenizer((String) null, ' ', '"'); assertFalse(tok.hasNext()); } @@ -679,10 +679,10 @@ public class StrTokenizerTest { assertEquals("a", tok.next()); assertEquals("b", tok.next()); assertFalse(tok.hasNext()); - + tok = new StrTokenizer(new char[0]); assertFalse(tok.hasNext()); - + tok = new StrTokenizer((char[]) null); assertFalse(tok.hasNext()); } @@ -695,10 +695,10 @@ public class StrTokenizerTest { assertEquals("a", tok.next()); assertEquals("b", tok.next()); assertFalse(tok.hasNext()); - + tok = new StrTokenizer(new char[0], ' '); assertFalse(tok.hasNext()); - + tok = new StrTokenizer((char[]) null, ' '); assertFalse(tok.hasNext()); } @@ -712,10 +712,10 @@ public class StrTokenizerTest { assertEquals("a", tok.next()); assertEquals("b", tok.next()); assertFalse(tok.hasNext()); - + tok = new StrTokenizer(new char[0], ' ', '"'); assertFalse(tok.hasNext()); - + tok = new StrTokenizer((char[]) null, ' ', '"'); assertFalse(tok.hasNext()); } @@ -728,7 +728,7 @@ public class StrTokenizerTest { assertEquals("b", tok.next()); assertEquals("c", tok.next()); assertFalse(tok.hasNext()); - + tok.reset(); assertEquals("a", tok.next()); assertEquals("b", tok.next()); @@ -744,7 +744,7 @@ public class StrTokenizerTest { assertEquals("d", tok.next()); assertEquals("e", tok.next()); assertFalse(tok.hasNext()); - + tok.reset((String) null); assertFalse(tok.hasNext()); } @@ -753,12 +753,12 @@ public class StrTokenizerTest { @Test public void testReset_charArray() { final StrTokenizer tok = new StrTokenizer("x x x"); - + final char[] array = new char[] {'a', 'b', 'c'}; tok.reset(array); assertEquals("abc", tok.next()); assertFalse(tok.hasNext()); - + tok.reset((char[]) null); assertFalse(tok.hasNext()); } @@ -810,7 +810,7 @@ public class StrTokenizerTest { fail(); } catch (final NoSuchElementException ex) {} assertTrue(tkn.hasNext()); - + assertEquals("a", tkn.next()); try { tkn.remove(); @@ -826,15 +826,15 @@ public class StrTokenizerTest { } catch (final UnsupportedOperationException ex) {} assertTrue(tkn.hasPrevious()); assertTrue(tkn.hasNext()); - + assertEquals("b", tkn.next()); assertTrue(tkn.hasPrevious()); assertTrue(tkn.hasNext()); - + assertEquals("c", tkn.next()); assertTrue(tkn.hasPrevious()); assertFalse(tkn.hasNext()); - + try { tkn.next(); fail(); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1da8ccdb/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java b/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java index 370e754..32cf99a 100644 --- a/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,32 +42,32 @@ public class WordUtilsTest { assertTrue(Modifier.isPublic(WordUtils.class.getModifiers())); assertFalse(Modifier.isFinal(WordUtils.class.getModifiers())); } - + //----------------------------------------------------------------------- @Test public void testWrap_StringInt() { assertEquals(null, WordUtils.wrap(null, 20)); assertEquals(null, WordUtils.wrap(null, -1)); - + assertEquals("", WordUtils.wrap("", 20)); assertEquals("", WordUtils.wrap("", -1)); - + // normal final String systemNewLine = System.lineSeparator(); String input = "Here is one line of text that is going to be wrapped after 20 columns."; - String expected = "Here is one line of" + systemNewLine + "text that is going" + String expected = "Here is one line of" + systemNewLine + "text that is going" + systemNewLine + "to be wrapped after" + systemNewLine + "20 columns."; assertEquals(expected, WordUtils.wrap(input, 20)); - + // long word at end input = "Click here to jump to the commons website - http://commons.apache.org";; - expected = "Click here to jump" + systemNewLine + "to the commons" + systemNewLine + expected = "Click here to jump" + systemNewLine + "to the commons" + systemNewLine + "website -" + systemNewLine + "http://commons.apache.org";; assertEquals(expected, WordUtils.wrap(input, 20)); - + // long word in middle input = "Click here, http://commons.apache.org, to jump to the commons website"; - expected = "Click here," + systemNewLine + "http://commons.apache.org,"; + systemNewLine + expected = "Click here," + systemNewLine + "http://commons.apache.org,"; + systemNewLine + "to jump to the" + systemNewLine + "commons website"; assertEquals(expected, WordUtils.wrap(input, 20)); @@ -77,7 +77,7 @@ public class WordUtilsTest { expected = "word1 " + systemNewLine + "word2 " + systemNewLine + "word3"; assertEquals(expected, WordUtils.wrap(input, 7)); } - + @Test public void testWrap_StringIntStringBoolean() { assertEquals(null, WordUtils.wrap(null, 20, "\n", false)); @@ -86,14 +86,14 @@ public class WordUtilsTest { assertEquals(null, WordUtils.wrap(null, 20, null, false)); assertEquals(null, WordUtils.wrap(null, -1, null, true)); assertEquals(null, WordUtils.wrap(null, -1, null, false)); - + assertEquals("", WordUtils.wrap("", 20, "\n", false)); assertEquals("", WordUtils.wrap("", 20, "\n", true)); assertEquals("", WordUtils.wrap("", 20, null, false)); assertEquals("", WordUtils.wrap("", 20, null, true)); assertEquals("", WordUtils.wrap("", -1, null, false)); assertEquals("", WordUtils.wrap("", -1, null, true)); - + // normal String input = "Here is one line of text that is going to be wrapped after 20 columns."; String expected = "Here is one line of\ntext that is going\nto be wrapped after\n20 columns."; @@ -117,7 +117,7 @@ public class WordUtilsTest { // system newline char final String systemNewLine = System.lineSeparator(); input = "Here is one line of text that is going to be wrapped after 20 columns."; - expected = "Here is one line of" + systemNewLine + "text that is going" + systemNewLine + expected = "Here is one line of" + systemNewLine + "text that is going" + systemNewLine + "to be wrapped after" + systemNewLine + "20 columns."; assertEquals(expected, WordUtils.wrap(input, 20, null, false)); assertEquals(expected, WordUtils.wrap(input, 20, null, true)); @@ -127,26 +127,26 @@ public class WordUtilsTest { expected = "Here: is one line\nof text that is \ngoing to be \nwrapped after 20 \ncolumns."; assertEquals(expected, WordUtils.wrap(input, 20, "\n", false)); assertEquals(expected, WordUtils.wrap(input, 20, "\n", true)); - + // with tab input = "Here is\tone line of text that is going to be wrapped after 20 columns."; expected = "Here is\tone line of\ntext that is going\nto be wrapped after\n20 columns."; assertEquals(expected, WordUtils.wrap(input, 20, "\n", false)); assertEquals(expected, WordUtils.wrap(input, 20, "\n", true)); - + // with tab at wrapColumn input = "Here is one line of\ttext that is going to be wrapped after 20 columns."; expected = "Here is one line\nof\ttext that is\ngoing to be wrapped\nafter 20 columns."; assertEquals(expected, WordUtils.wrap(input, 20, "\n", false)); assertEquals(expected, WordUtils.wrap(input, 20, "\n", true)); - + // difference because of long word input = "Click here to jump to the commons website - http://commons.apache.org";; expected = "Click here to jump\nto the commons\nwebsite -\nhttp://commons.apache.org";; assertEquals(expected, WordUtils.wrap(input, 20, "\n", false)); expected = "Click here to jump\nto the commons\nwebsite -\nhttp://commons.apach\ne.org";; assertEquals(expected, WordUtils.wrap(input, 20, "\n", true)); - + // difference because of long word in middle input = "Click here, http://commons.apache.org, to jump to the commons website"; expected = "Click here,\nhttp://commons.apache.org,\nto jump to the\ncommons website"; @@ -187,7 +187,7 @@ public class WordUtilsTest { assertEquals(null, WordUtils.capitalize(null)); assertEquals("", WordUtils.capitalize("")); assertEquals(" ", WordUtils.capitalize(" ")); - + assertEquals("I", WordUtils.capitalize("I") ); assertEquals("I", WordUtils.capitalize("i") ); assertEquals("I Am Here 123", WordUtils.capitalize("i am here 123") ); @@ -195,13 +195,13 @@ public class WordUtilsTest { assertEquals("I Am HERE 123", WordUtils.capitalize("i am HERE 123") ); assertEquals("I AM HERE 123", WordUtils.capitalize("I AM HERE 123") ); } - + @Test public void testCapitalizeWithDelimiters_String() { assertEquals(null, WordUtils.capitalize(null, null)); assertEquals("", WordUtils.capitalize("", new char[0])); assertEquals(" ", WordUtils.capitalize(" ", new char[0])); - + char[] chars = new char[] { '-', '+', ' ', '@' }; assertEquals("I", WordUtils.capitalize("I", chars) ); assertEquals("I", WordUtils.capitalize("i", chars) ); @@ -219,7 +219,7 @@ public class WordUtilsTest { assertEquals(null, WordUtils.capitalizeFully(null)); assertEquals("", WordUtils.capitalizeFully("")); assertEquals(" ", WordUtils.capitalizeFully(" ")); - + assertEquals("I", WordUtils.capitalizeFully("I") ); assertEquals("I", WordUtils.capitalizeFully("i") ); assertEquals("I Am Here 123", WordUtils.capitalizeFully("i am here 123") ); @@ -227,13 +227,13 @@ public class WordUtilsTest { assertEquals("I Am Here 123", WordUtils.capitalizeFully("i am HERE 123") ); assertEquals("I Am Here 123", WordUtils.capitalizeFully("I AM HERE 123") ); } - + @Test public void testCapitalizeFullyWithDelimiters_String() { assertEquals(null, WordUtils.capitalizeFully(null, null)); assertEquals("", WordUtils.capitalizeFully("", new char[0])); assertEquals(" ", WordUtils.capitalizeFully(" ", new char[0])); - + char[] chars = new char[] { '-', '+', ' ', '@' }; assertEquals("I", WordUtils.capitalizeFully("I", chars) ); assertEquals("I", WordUtils.capitalizeFully("i", chars) ); @@ -271,7 +271,7 @@ public class WordUtilsTest { assertEquals(null, WordUtils.uncapitalize(null)); assertEquals("", WordUtils.uncapitalize("")); assertEquals(" ", WordUtils.uncapitalize(" ")); - + assertEquals("i", WordUtils.uncapitalize("I") ); assertEquals("i", WordUtils.uncapitalize("i") ); assertEquals("i am here 123", WordUtils.uncapitalize("i am here 123") ); @@ -279,13 +279,13 @@ public class WordUtilsTest { assertEquals("i am hERE 123", WordUtils.uncapitalize("i am HERE 123") ); assertEquals("i aM hERE 123", WordUtils.uncapitalize("I AM HERE 123") ); } - + @Test public void testUncapitalizeWithDelimiters_String() { assertEquals(null, WordUtils.uncapitalize(null, null)); assertEquals("", WordUtils.uncapitalize("", new char[0])); assertEquals(" ", WordUtils.uncapitalize(" ", new char[0])); - + char[] chars = new char[] { '-', '+', ' ', '@' }; assertEquals("i", WordUtils.uncapitalize("I", chars) ); assertEquals("i", WordUtils.uncapitalize("i", chars) ); @@ -330,7 +330,7 @@ public class WordUtilsTest { assertEquals("BJ.L", WordUtils.initials(" Ben John . Lee", array)); assertEquals("KO", WordUtils.initials("Kay O'Murphy", array)); assertEquals("iah1", WordUtils.initials("i am here 123", array)); - + array = new char[0]; assertEquals(null, WordUtils.initials(null, array)); assertEquals("", WordUtils.initials("", array)); @@ -344,7 +344,7 @@ public class WordUtilsTest { assertEquals("", WordUtils.initials(" Ben John . Lee", array)); assertEquals("", WordUtils.initials("Kay O'Murphy", array)); assertEquals("", WordUtils.initials("i am here 123", array)); - + array = " ".toCharArray(); assertEquals(null, WordUtils.initials(null, array)); assertEquals("", WordUtils.initials("", array)); @@ -358,7 +358,7 @@ public class WordUtilsTest { assertEquals("BJ.L", WordUtils.initials(" Ben John . Lee", array)); assertEquals("KO", WordUtils.initials("Kay O'Murphy", array)); assertEquals("iah1", WordUtils.initials("i am here 123", array)); - + array = " .".toCharArray(); assertEquals(null, WordUtils.initials(null, array)); assertEquals("", WordUtils.initials("", array)); @@ -371,7 +371,7 @@ public class WordUtilsTest { assertEquals("BJL", WordUtils.initials(" Ben John . Lee", array)); assertEquals("KO", WordUtils.initials("Kay O'Murphy", array)); assertEquals("iah1", WordUtils.initials("i am here 123", array)); - + array = " .'".toCharArray(); assertEquals(null, WordUtils.initials(null, array)); assertEquals("", WordUtils.initials("", array)); @@ -384,7 +384,7 @@ public class WordUtilsTest { assertEquals("BJL", WordUtils.initials(" Ben John . Lee", array)); assertEquals("KOM", WordUtils.initials("Kay O'Murphy", array)); assertEquals("iah1", WordUtils.initials("i am here 123", array)); - + array = "SIJo1".toCharArray(); assertEquals(null, WordUtils.initials(null, array)); assertEquals("", WordUtils.initials("", array)); @@ -405,7 +405,7 @@ public class WordUtilsTest { assertEquals(null, WordUtils.swapCase(null)); assertEquals("", WordUtils.swapCase("")); assertEquals(" ", WordUtils.swapCase(" ")); - + assertEquals("i", WordUtils.swapCase("I") ); assertEquals("I", WordUtils.swapCase("i") ); assertEquals("I AM HERE 123", WordUtils.swapCase("i am here 123") ); @@ -417,7 +417,7 @@ public class WordUtilsTest { final String expect = "tHIS sTRING CONTAINS A tITLEcASE CHARACTER: \u01C9"; assertEquals(expect, WordUtils.swapCase(test)); } - + @Test public void testLANG1292() throws Exception { // Prior to fix, this was throwing StringIndexOutOfBoundsException
