diff options
author | Henrik Nord <[email protected]> | 2012-02-16 12:47:11 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2012-02-16 12:47:11 +0100 |
commit | 5620b434415d7c7d7060dbeff2c71d6bb96b91da (patch) | |
tree | 28d681356120a3a5fc8c4fba7c2e9b2acfd64718 /lib/jinterface/test | |
parent | ddfe258f12a7706f3aea4f20bf6fc46b839ab70c (diff) | |
parent | c826b7309e57e33b1209d5b6c0f15a0e26122729 (diff) | |
download | otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.gz otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.bz2 otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.zip |
Merge branch 'maint'
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
lib/stdlib/doc/src/binary.xml
Diffstat (limited to 'lib/jinterface/test')
-rw-r--r-- | lib/jinterface/test/nc_SUITE.erl | 7 | ||||
-rw-r--r-- | lib/jinterface/test/nc_SUITE_data/echo_server.java | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl index da54f5bf51..9c88400c2a 100644 --- a/lib/jinterface/test/nc_SUITE.erl +++ b/lib/jinterface/test/nc_SUITE.erl @@ -296,7 +296,8 @@ lists_roundtrip_2(Config) when is_list(Config) -> {[z,23|24],tail3}, {[z|25],tail3}, {"abc123",sub3atom}, - {"abc",sub3atom} + {"abc",sub3atom}, + {"abcdefg",codepointBug} ], Trans = fun ([_|T], tail) -> @@ -308,7 +309,9 @@ lists_roundtrip_2(Config) when is_list(Config) -> (L, tail3) when is_list(L) -> null; ([_,_,_|L], sub3atom) -> - list_to_atom(L) + list_to_atom(L); + (L, codepointBug) -> + L end, OutTrans = fun ({L,Twist}) -> diff --git a/lib/jinterface/test/nc_SUITE_data/echo_server.java b/lib/jinterface/test/nc_SUITE_data/echo_server.java index 0550e4beb1..5ecb5b72a7 100644 --- a/lib/jinterface/test/nc_SUITE_data/echo_server.java +++ b/lib/jinterface/test/nc_SUITE_data/echo_server.java @@ -202,6 +202,12 @@ public class echo_server { final OtpErlangAtom o = new OtpErlangAtom(s.stringValue() .substring(3)); return o; + } else if (atomValue.equals("codepointBug") + && i instanceof OtpErlangString) { + final OtpErlangString s = (OtpErlangString) i; + final String ss = s.stringValue().substring(3, 6); + final int[] cps = OtpErlangString.stringToCodePoints(ss); + return s; } else if (atomValue.equals("utf8")) { if (i instanceof OtpErlangString) { final OtpErlangString s = (OtpErlangString) i; |