X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fjp%2Fsfjp%2Fmikutoga%2Fbin%2Fparser%2FTextDecoderTest.java;fp=src%2Ftest%2Fjava%2Fjp%2Fsourceforge%2Fmikutoga%2Fparser%2FTextDecoderTest.java;h=e315fedfb6f7486f8313c24b32e74d958182a8cc;hp=6a22e156475fcd58033971d402ddc652b2493a3d;hb=2afbea9380c472bb23e76a29bd366cad1cb0465c;hpb=9bea9f0d9a2cd86cda19baf0690c3fda87cbf64d

diff --git a/src/test/java/jp/sourceforge/mikutoga/parser/TextDecoderTest.java b/src/test/java/jp/sfjp/mikutoga/bin/parser/TextDecoderTest.java
similarity index 90%
rename from src/test/java/jp/sourceforge/mikutoga/parser/TextDecoderTest.java
rename to src/test/java/jp/sfjp/mikutoga/bin/parser/TextDecoderTest.java
index 6a22e15..e315fed 100644
--- a/src/test/java/jp/sourceforge/mikutoga/parser/TextDecoderTest.java
+++ b/src/test/java/jp/sfjp/mikutoga/bin/parser/TextDecoderTest.java
@@ -1,8 +1,10 @@
 /*
  */
 
-package jp.sourceforge.mikutoga.parser;
+package jp.sfjp.mikutoga.bin.parser;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
@@ -91,15 +93,6 @@ public class TextDecoderTest {
     }
 
     /**
-     * Test of prepareBuffer method, of class TextDecoder.
-     */
-    @Test
-    public void testPrepareBuffer() {
-        System.out.println("prepareBuffer");
-        return;
-    }
-
-    /**
      * Test of setChopMode, getChopMode method, of class TextDecoder.
      * @throws Exception
      */
@@ -138,9 +131,11 @@ public class TextDecoderTest {
         assertDecoded("41:00:42", "A", decoder);
         assertDecoded("00:41:42", "", decoder);
         assertDecoded("41:00:88", "A", decoder);
+        assertDecoded("", "", decoder);
 
         decoder.setZeroChopMode(false);
         assertDecoded("41:00:42", "A\u0000B", decoder);
+        assertDecoded("", "", decoder);
 
         return;
     }
@@ -278,19 +273,25 @@ public class TextDecoderTest {
                                 TextDecoder decoder)
             throws Exception{
         byte[] bdata = byteArray(bin);
-        assertDecoded(bin, desired, decoder, bdata.length);
+        ByteBuffer bBuf = ByteBuffer.wrap(bdata);
+        assertDecoded(bBuf, desired, decoder);
         return;
     }
 
     public void assertDecoded(String bin, String desired,
                                 TextDecoder decoder, int len)
             throws Exception{
-        byte[] bdata;
-
-        bdata = byteArray(bin);
+        byte[] bdata = byteArray(bin);
+        ByteBuffer bBuf = ByteBuffer.wrap(bdata, 0, len);
+        assertDecoded(bBuf, desired, decoder);
+        return;
+    }
 
+    public void assertDecoded(ByteBuffer bBuf, String desired,
+                                TextDecoder decoder)
+            throws Exception{
         String result;
-        result = decoder.decode(0, bdata, 0, len);
+        result = decoder.decode(bBuf);
 
         assertEquals(desired, result);
 
@@ -300,14 +301,13 @@ public class TextDecoderTest {
     public void assertFormatError(String bin,
                                     TextDecoder decoder, int len)
             throws Exception{
-        byte[] bdata;
-
-        bdata = byteArray(bin);
+        byte[] bdata = byteArray(bin);
+        ByteBuffer bBuf = ByteBuffer.wrap(bdata, 0, len);
 
         try{
-            decoder.decode(0, bdata, 0, len);
+            decoder.decode(bBuf);
             fail();
-        }catch(MmdFormatException e){
+        }catch(CharacterCodingException e){
             // OK
         }