Refactor encoding tests.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1075426 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/test/org/apache/commons/codec/StringEncoderAbstractTest.java

@@ -28,54 +28,70 @@
  */
 public abstract class StringEncoderAbstractTest extends TestCase {
 
-    protected StringEncoder stringEncoder = createEncoder();
+    protected StringEncoder stringEncoder = this.createStringEncoder();
 
     public StringEncoderAbstractTest(String name) {
         super(name);
     }
 
-    protected abstract StringEncoder createEncoder();
+    public void checkEncoding(String expected, String source) throws EncoderException {
+        Assert.assertEquals("Source: " + source, expected, this.getStringEncoder().encode(source));
+    }
 
-    // ------------------------------------------------------------------------
+    protected void checkEncodings(String[][] data) throws EncoderException {
+        for (int i = 0; i < data.length; i++) {
+            this.checkEncoding(data[i][1], data[i][0]);
+        }
+    }
+
+    protected void checkEncodingVariations(String expected, String data[]) throws EncoderException {
+        for (int i = 0; i < data.length; i++) {
+            this.checkEncoding(expected, data[i]);
+        }
+    }
+
+    protected abstract StringEncoder createStringEncoder();
+
+    public StringEncoder getStringEncoder() {
+        return this.stringEncoder;
+    }
 
     public void testEncodeEmpty() throws Exception {
-        Encoder encoder = createEncoder();
+        Encoder encoder = this.getStringEncoder();
         encoder.encode("");
         encoder.encode(" ");
         encoder.encode("\t");
-    }        
+    }
 
     public void testEncodeNull() throws Exception {
-        StringEncoder encoder = createEncoder();
-        
+        StringEncoder encoder = this.getStringEncoder();
         try {
             encoder.encode(null);
         } catch (EncoderException ee) {
             // An exception should be thrown
         }
-    }        
+    }
 
     public void testEncodeWithInvalidObject() throws Exception {
 
         boolean exceptionThrown = false;
         try {
-            StringEncoder encoder = createEncoder();
-            encoder.encode( new Float( 3.4 ) );
+            StringEncoder encoder = this.getStringEncoder();
+            encoder.encode(new Float(3.4));
         } catch (Exception e) {
             exceptionThrown = true;
         }
 
-        assertTrue( "An exception was not thrown when we tried to encode " +
-                    "a Float object", exceptionThrown );
+        Assert.assertTrue("An exception was not thrown when we tried to encode " + "a Float object", exceptionThrown);
     }
 
     public void testLocaleIndependence() throws Exception {
-        StringEncoder encoder = createEncoder();
+        StringEncoder encoder = this.getStringEncoder();
 
-        String[] data = { "I", "i", };
+        String[] data = {"I", "i",};
 
         Locale orig = Locale.getDefault();
-        Locale[] locales = { Locale.ENGLISH, new Locale("tr"), Locale.getDefault() };
+        Locale[] locales = {Locale.ENGLISH, new Locale("tr"), Locale.getDefault()};
 
         try {
             for (int i = 0; i < data.length; i++) {
@@ -89,9 +105,9 @@ public void testLocaleIndependence() throws Exception {
                         try {
                             cur = encoder.encode(data[i]);
                         } catch (Exception e) {
-                            fail(Locale.getDefault().toString() + ": " + e.getMessage());
+                            Assert.fail(Locale.getDefault().toString() + ": " + e.getMessage());
                         }
-                        assertEquals(Locale.getDefault().toString() + ": ", ref, cur);
+                        Assert.assertEquals(Locale.getDefault().toString() + ": ", ref, cur);
                     }
                 }
             }
@@ -100,20 +116,4 @@ public void testLocaleIndependence() throws Exception {
         }
     }
 
-    protected void checkEncodings(String[][] data) throws EncoderException {
-        for (int i = 0; i < data.length; i++) {
-            this.checkEncoding(data[i][1], data[i][0]);
-        }
-    }
-
-    protected void checkEncodingVariations(String expected, String data[]) throws EncoderException {
-        for (int i = 0; i < data.length; i++) {
-            this.checkEncoding(expected, data[i]);
-        }
-    }
-
-    public void checkEncoding(String expected, String source) throws EncoderException {
-        Assert.assertEquals("Source: " + source, expected, this.stringEncoder.encode(source));
-    }
-
 }

src/test/org/apache/commons/codec/language/CaverphoneTest.java

@@ -31,7 +31,7 @@ public CaverphoneTest(String name) {
         super(name);
     }
 
-    protected StringEncoder createEncoder() {
+    protected StringEncoder createStringEncoder() {
         return new Caverphone();
     }
 

src/test/org/apache/commons/codec/language/ColognePhoneticTest.java

@@ -28,7 +28,7 @@ public ColognePhoneticTest(String name) {
         super(name);
     }
 
-    protected StringEncoder createEncoder() {
+    protected StringEncoder createStringEncoder() {
         return new ColognePhonetic();
     }
 
@@ -125,7 +125,7 @@ public void testIsEncodeEquals() {
             {"ganz", "Gänse"},
             {"Miyagi", "Miyako"}};
         for (int i = 0; i < data.length; i++) {
-            ((ColognePhonetic) this.stringEncoder).isEncodeEqual(data[i][1], data[i][0]);
+            ((ColognePhonetic) this.getStringEncoder()).isEncodeEqual(data[i][1], data[i][0]);
         }
     }