Update c- and java-decoder: (#536)

* speedup java decoder
   * avoid masking
   * avoid excessive fillBits
   * streamline uncompressed block processing
 * make java decoder more transpilation-friendly
 * avoid non-essential goto in c-decoder

1 files changed, 10 insertions, 2 deletions

diff --git a/java/org/brotli/dec/BitReaderTest.java b/java/org/brotli/dec/BitReaderTest.java
index 9577c62..bc76ce1 100755
--- a/java/org/brotli/dec/BitReaderTest.java
+++ b/java/org/brotli/dec/BitReaderTest.java
@@ -6,6 +6,8 @@
 
 package org.brotli.dec;
 
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayInputStream;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,11 +19,17 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class BitReaderTest {
 
-  @Test(expected = BrotliRuntimeException.class)
+  @Test
   public void testReadAfterEos() {
     BitReader reader = new BitReader();
     BitReader.init(reader, new ByteArrayInputStream(new byte[1]));
     BitReader.readBits(reader, 9);
-    BitReader.checkHealth(reader);
+    try {
+      BitReader.checkHealth(reader, false);
+    } catch (BrotliRuntimeException ex) {
+      // This exception is expected.
+      return;
+    }
+    fail("BrotliRuntimeException should have been thrown by BitReader.checkHealth");
   }
 }