You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sebb <se...@gmail.com> on 2014/04/10 16:10:03 UTC
Re: svn commit: r1586283 - /commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
On 10 April 2014 13:38, <gg...@apache.org> wrote:
> Author: ggregory
> Date: Thu Apr 10 12:38:15 2014
> New Revision: 1586283
>
> URL: http://svn.apache.org/r1586283
> Log:
> Sort methods in AB order.
-0.9
This really messes up SVN history.
Makes it very difficult to use the annotation view.
+0
It also changes the test order on some JVMs (no bad thing as order
should not matter).
> Modified:
> commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
>
> Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java?rev=1586283&r1=1586282&r2=1586283&view=diff
> ==============================================================================
> --- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java (original)
> +++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java Thu Apr 10 12:38:15 2014
> @@ -1025,6 +1025,11 @@ public class DoubleMetaphoneTest extends
> assertEquals(expected, this.getStringEncoder().doubleMetaphone(source, true));
> }
>
> + @Override
> + protected DoubleMetaphone createStringEncoder() {
> + return new DoubleMetaphone();
> + }
> +
> public void doubleMetaphoneEqualTest(final String[][] pairs, final boolean useAlternate) {
> this.validateFixture(pairs);
> for (final String[] pair : pairs) {
> @@ -1050,9 +1055,9 @@ public class DoubleMetaphoneTest extends
> }
> }
>
> - @Override
> - protected DoubleMetaphone createStringEncoder() {
> - return new DoubleMetaphone();
> + @Test
> + public void testCCedilla() {
> + assertTrue(this.getStringEncoder().isDoubleMetaphoneEqual("\u00e7", "S")); // c-cedilla
> }
>
> @Test
> @@ -1104,27 +1109,6 @@ public class DoubleMetaphoneTest extends
> assertEquals(null, this.getStringEncoder().doubleMetaphone("\t\n\r "));
> }
>
> - /**
> - * Test setting maximum length
> - */
> - @Test
> - public void testSetMaxCodeLength() {
> - final String value = "jumped";
> -
> - final DoubleMetaphone doubleMetaphone = new DoubleMetaphone();
> -
> - // Sanity check of default settings
> - assertEquals("Default Max Code Length", 4, doubleMetaphone.getMaxCodeLen());
> - assertEquals("Default Primary", "JMPT", doubleMetaphone.doubleMetaphone(value, false));
> - assertEquals("Default Alternate", "AMPT", doubleMetaphone.doubleMetaphone(value, true));
> -
> - // Check setting Max Code Length
> - doubleMetaphone.setMaxCodeLen(3);
> - assertEquals("Set Max Code Length", 3, doubleMetaphone.getMaxCodeLen());
> - assertEquals("Max=3 Primary", "JMP", doubleMetaphone.doubleMetaphone(value, false));
> - assertEquals("Max=3 Alternate", "AMP", doubleMetaphone.doubleMetaphone(value, true));
> - }
> -
> @Test
> public void testIsDoubleMetaphoneEqualBasic() {
> final String[][] testFixture = new String[][] { { "Case", "case" }, {
> @@ -1217,13 +1201,29 @@ public class DoubleMetaphoneTest extends
> }
>
> @Test
> - public void testCCedilla() {
> - assertTrue(this.getStringEncoder().isDoubleMetaphoneEqual("\u00e7", "S")); // c-cedilla
> + public void testNTilde() {
> + assertTrue(this.getStringEncoder().isDoubleMetaphoneEqual("\u00f1", "N")); // n-tilde
> }
>
> + /**
> + * Test setting maximum length
> + */
> @Test
> - public void testNTilde() {
> - assertTrue(this.getStringEncoder().isDoubleMetaphoneEqual("\u00f1", "N")); // n-tilde
> + public void testSetMaxCodeLength() {
> + final String value = "jumped";
> +
> + final DoubleMetaphone doubleMetaphone = new DoubleMetaphone();
> +
> + // Sanity check of default settings
> + assertEquals("Default Max Code Length", 4, doubleMetaphone.getMaxCodeLen());
> + assertEquals("Default Primary", "JMPT", doubleMetaphone.doubleMetaphone(value, false));
> + assertEquals("Default Alternate", "AMPT", doubleMetaphone.doubleMetaphone(value, true));
> +
> + // Check setting Max Code Length
> + doubleMetaphone.setMaxCodeLen(3);
> + assertEquals("Set Max Code Length", 3, doubleMetaphone.getMaxCodeLen());
> + assertEquals("Max=3 Primary", "JMP", doubleMetaphone.doubleMetaphone(value, false));
> + assertEquals("Max=3 Alternate", "AMP", doubleMetaphone.doubleMetaphone(value, true));
> }
>
> public void validateFixture(final String[][] pairs) {
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org