jruby · Aug 21, 2015 · Aug 21, 2015 · Aug 21, 2015
Showing with 43 additions and 2 deletions.

+8 −0 core/src/main/java/org/jruby/util/io/EncodingUtils.java

+1 −0 core/src/test/java/org/jruby/test/MainTestSuite.java

+32 −0 core/src/test/java/org/jruby/test/TestEncodingAPI.java

+1 −1 lib/pom.rb

+1 −1 lib/pom.xml
diff --git a/core/src/main/java/org/jruby/util/io/EncodingUtils.java b/core/src/main/java/org/jruby/util/io/EncodingUtils.java
@@ -1031,10 +1031,12 @@ public static RubyString strConvEncOpts(ThreadContext context, RubyString str, E
         EConvResult ret;
         int convertedOutput = 0;
 
+        // these are in the while clause in MRI
         destbytes = newStr.getUnsafeBytes();
         int dest = newStr.begin();
         dp.p = dest + convertedOutput;
         ret = ec.convert(sbytes, sp, start + len, destbytes, dp, dest + olen, 0);
+
         while (ret == EConvResult.DestinationBufferFull) {
             int convertedInput = sp.p - start;
             int rest = len - convertedInput;
@@ -1048,6 +1050,12 @@ public static RubyString strConvEncOpts(ThreadContext context, RubyString str, E
             }
             olen += rest < 2 ? 2 : rest;
             newStr.ensure(olen);
+
+            // these are the while clause in MRI
+            destbytes = newStr.getUnsafeBytes();
+            dest = newStr.begin();
+            dp.p = dest + convertedOutput;
+            ret = ec.convert(sbytes, sp, start + len, destbytes, dp, dest + olen, 0);
         }
         ec.close();
 

diff --git a/core/src/test/java/org/jruby/test/MainTestSuite.java b/core/src/test/java/org/jruby/test/MainTestSuite.java
@@ -92,6 +92,7 @@ public static Test suite() throws Throwable {
         suite.addTestSuite(ParameterizedWriterTest.class);
         suite.addTestSuite(TestRubyRational.class);
         suite.addTestSuite(TestRecursiveCheck.class);
+        suite.addTestSuite(TestEncodingAPI.class);
         // Disabled test due to difficulty of making WeakRef logic deterministic
 //        suite.addTestSuite(TestRegexpCache.class);
         return suite;

diff --git a/core/src/test/java/org/jruby/test/TestEncodingAPI.java b/core/src/test/java/org/jruby/test/TestEncodingAPI.java
@@ -0,0 +1,32 @@
+package org.jruby.test;
+
+import junit.framework.TestCase;
+import org.jcodings.specific.SJISEncoding;
+import org.jcodings.specific.UTF8Encoding;
+import org.jruby.CompatVersion;
+
+import org.jruby.Ruby;
+import org.jruby.RubyInstanceConfig;
+import org.jruby.RubyString;
+import org.jruby.util.io.EncodingUtils;
+
+public class TestEncodingAPI extends TestCase {
+    private Ruby runtime;
+
+    public TestEncodingAPI(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        runtime = Ruby.newInstance();
+    }
+
+    public void testStrConvEncThatGrows() throws Exception {
+        String javaStr = "--- こんにちは！";
+        RubyString rubyStr = RubyString.newString(runtime, javaStr);
+        rubyStr = EncodingUtils.strConvEnc(runtime.getCurrentContext(), rubyStr, rubyStr.getEncoding(), SJISEncoding.INSTANCE);
+        assertEquals(rubyStr.getEncoding(), SJISEncoding.INSTANCE);
+        rubyStr = EncodingUtils.strConvEnc(runtime.getCurrentContext(), rubyStr, SJISEncoding.INSTANCE, UTF8Encoding.INSTANCE);
+        assertEquals(rubyStr.getEncoding(), UTF8Encoding.INSTANCE);
+    }
+}
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -26,7 +26,7 @@ def version
    ImportedGem.new( 'minitest', 'minitest.version', true ),
    ImportedGem.new( 'test-unit', 'test-unit.version', true ),
    ImportedGem.new( 'power_assert', 'power_assert.version', true ),
-   ImportedGem.new( 'psych', '2.0.14', true ),
+   ImportedGem.new( 'psych', '2.0.15', true ),
    ImportedGem.new( 'json', 'json.version', true ),
    ImportedGem.new( 'jar-dependencies', '0.1.15', true )
   ]

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -125,7 +125,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>psych</artifactId>
-      <version>2.0.14</version>
+      <version>2.0.15</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>