From 5da32e3a6583493a36c87bc02c8177a7740faaf7 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Mon, 28 Dec 2015 18:47:12 +0300 Subject: [PATCH] Fix base64 support --- classlib/src/main/java/org/teavm/classlib/impl/Base64.java | 2 +- .../test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java | 1 + .../org/teavm/classlib/java/lang/TestResourcesSupplier.java | 2 +- tests/src/test/resources/resources-for-test/9 | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tests/src/test/resources/resources-for-test/9 diff --git a/classlib/src/main/java/org/teavm/classlib/impl/Base64.java b/classlib/src/main/java/org/teavm/classlib/impl/Base64.java index 665469e87..0a00ae4d4 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/Base64.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/Base64.java @@ -55,7 +55,7 @@ public class Base64 { int triples = (outputSize / 3) * 3; i = 0; - for (j = 0; i < triples;) { + for (j = 0; j < triples;) { int a = decode(text.charAt(i++)); int b = decode(text.charAt(i++)); int c = decode(text.charAt(i++)); diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java index b20323ce1..dfef1c7fe 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java @@ -36,6 +36,7 @@ public class ClassLoaderTest { assertEquals("qwerty", loadResource("6")); assertEquals("qwertyu", loadResource("7")); assertEquals("qwertyui", loadResource("8")); + assertEquals("qwertyuiopasdfghjklzxcvbnm", loadResource("9")); } private static String loadResource(String name) { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/TestResourcesSupplier.java b/tests/src/test/java/org/teavm/classlib/java/lang/TestResourcesSupplier.java index 3540e9ff1..e12f58014 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/TestResourcesSupplier.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/TestResourcesSupplier.java @@ -25,7 +25,7 @@ import org.teavm.model.ListableClassReaderSource; public class TestResourcesSupplier implements ResourceSupplier { @Override public String[] supplyResources(ClassLoader classLoader, ListableClassReaderSource classSource) { - String[] result = { "1", "2", "3", "4", "5", "6", "7", "8" }; + String[] result = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; for (int i = 0; i < result.length; ++i) { result[i] = "resources-for-test/" + result[i]; } diff --git a/tests/src/test/resources/resources-for-test/9 b/tests/src/test/resources/resources-for-test/9 new file mode 100644 index 000000000..62d04801f --- /dev/null +++ b/tests/src/test/resources/resources-for-test/9 @@ -0,0 +1 @@ +qwertyuiopasdfghjklzxcvbnm