ICU-6955 Fix TestConversion test in ICU4J to increment target only if there is an overflow. add more code coverage test case for MBCS.

X-SVN-Rev: 26161

icu4c/source/test/testdata/conversion.txt

@@ -894,6 +894,20 @@ conversion:table(nofallback) {
           :intvector{ 14 },
           :int{1}, :int{0}, "", "0", :bin{""}
         }
+        {
+          "*test1bmp",
+          :bin{ 060a05 },
+          "\u0066\ufffd\u0065",
+          :intvector{ 0, 2, 2 },
+          :int{0}, :int{1}, "", "?", :bin{""}
+        }
+        {
+          "*test1bmp",
+          :bin{ 060708 },
+          "\u0066",
+          :intvector{},
+          :int{1}, :int{0}, "invalid", ".", :bin{ 07 }
+        }
       }
     }
 

icu4j/main/shared/data/testdata.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7ce8b58d416e6eae38a86180bcf591949db964a24e6016b5e393713bb42355a
-size 773227
+oid sha256:04efcc4af72783c008a1ee271c726ced1a02587e3824631fedc1e4828b3e6dc2
+size 773324

icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java

@@ -702,7 +702,6 @@ public class TestConversion extends ModuleTest {
                     }
                 }
                 iStep += step;
-                oStep += step;
 
             }