Move character encoding logic out to common, try again to improve its handling of...

[zxing.git] / core / test / src / com / google / zxing / qrcode / decoder / DecodedBitStreamParserTestCase.java

diff --git a/core/test/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParserTestCase.java b/core/test/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParserTestCase.java
index 7d3dd89..eabb134 100644 (file)
--- a/core/test/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParserTestCase.java
+++ b/core/test/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParserTestCase.java
@@ -16,7 +16,6 @@
 
 package com.google.zxing.qrcode.decoder;
 
-import com.google.zxing.ReaderException;
 import com.google.zxing.common.BitSourceBuilder;
 import junit.framework.TestCase;
 
@@ -27,7 +26,7 @@ import junit.framework.TestCase;
  */
 public final class DecodedBitStreamParserTestCase extends TestCase {
 
-  public void testSimpleByteMode() throws ReaderException {
+  public void testSimpleByteMode() throws Exception {
     BitSourceBuilder builder = new BitSourceBuilder();
     builder.write(0x04, 4); // Byte mode
     builder.write(0x03, 8); // 3 bytes
@@ -35,23 +34,24 @@ public final class DecodedBitStreamParserTestCase extends TestCase {
     builder.write(0xF2, 8);
     builder.write(0xF3, 8);
     String result = DecodedBitStreamParser.decode(builder.toByteArray(),
-        Version.getVersionForNumber(1), null).getText();
+        Version.getVersionForNumber(1), null, null).getText();
     assertEquals("\u00f1\u00f2\u00f3", result);
   }
 
-  public void testSimpleSJIS() throws ReaderException {
+  public void testSimpleSJIS() throws Exception {
     BitSourceBuilder builder = new BitSourceBuilder();
     builder.write(0x04, 4); // Byte mode
-    builder.write(0x03, 8); // 3 bytes
+    builder.write(0x04, 8); // 4 bytes
     builder.write(0xA1, 8);
     builder.write(0xA2, 8);
     builder.write(0xA3, 8);
+    builder.write(0xD0, 8);
     String result = DecodedBitStreamParser.decode(builder.toByteArray(),
-        Version.getVersionForNumber(1), null).getText();
-    assertEquals("\uff61\uff62\uff63", result);
+        Version.getVersionForNumber(1), null, null).getText();
+    assertEquals("\uff61\uff62\uff63\uff90", result);
   }
 
-  public void testECI() throws ReaderException {
+  public void testECI() throws Exception {
     BitSourceBuilder builder = new BitSourceBuilder();
     builder.write(0x07, 4); // ECI mode
     builder.write(0x02, 8); // ECI 2 = CP437 encoding
@@ -61,7 +61,7 @@ public final class DecodedBitStreamParserTestCase extends TestCase {
     builder.write(0xA2, 8);
     builder.write(0xA3, 8);
     String result = DecodedBitStreamParser.decode(builder.toByteArray(),
-        Version.getVersionForNumber(1), null).getText();
+        Version.getVersionForNumber(1), null, null).getText();
     assertEquals("\u00ed\u00f3\u00fa", result);
   }