diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-02-14 11:52:20 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-02-14 11:52:20 +0100 |
| commit | 754d1e649f41f399d52c7b2d0eface0308d7d3b8 (patch) | |
| tree | 6a113851abd53db6c402b2cabebf252705fbd3e3 /lib/jinterface/test/jinterface_SUITE.erl | |
| parent | 9f698ad63586735de169fb514f22eea5164e173b (diff) | |
| parent | a2d09eb344a6ec0901aee103abf290a143f004ad (diff) | |
| download | otp-754d1e649f41f399d52c7b2d0eface0308d7d3b8.tar.gz otp-754d1e649f41f399d52c7b2d0eface0308d7d3b8.tar.bz2 otp-754d1e649f41f399d52c7b2d0eface0308d7d3b8.zip | |
Merge branch 'vlad/maps-jinterface/OTP-11703'
* vlad/maps-jinterface/OTP-11703:
jinterface: Fix jinterface_SUITE
jinterface: update user's guide with maps
jinterface: implement support for maps
Diffstat (limited to 'lib/jinterface/test/jinterface_SUITE.erl')
| -rw-r--r-- | lib/jinterface/test/jinterface_SUITE.erl | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl index de8d611efc..cb725164cd 100644 --- a/lib/jinterface/test/jinterface_SUITE.erl +++ b/lib/jinterface/test/jinterface_SUITE.erl @@ -37,7 +37,9 @@ erl_exit_with_reason_any_term/1, java_exit_with_reason_any_term/1, status_handler_localStatus/1, status_handler_remoteStatus/1, - status_handler_connAttempt/1]). + status_handler_connAttempt/1, + maps/1 + ]). -include_lib("common_test/include/ct.hrl"). -include("test_server_line.hrl"). @@ -103,7 +105,8 @@ fundamental() -> nodename, % Nodename.java register_and_whereis, % RegisterAndWhereis.java get_names, % GetNames.java - boolean_atom % BooleanAtom.java + boolean_atom, % BooleanAtom.java + maps % Maps.java ]. ping() -> @@ -675,6 +678,17 @@ status_handler_connAttempt(Config) when is_list(Config) -> "NodeStatusHandler", [erlang:get_cookie(),node(),?status_handler_connAttempt]). +%%%----------------------------------------------------------------- +maps(doc) -> + ["Maps.java: " + "Tests OtpErlangMap encoding, decoding, toString, get"]; +maps(suite) -> + []; +maps(Config) when is_list(Config) -> + ok = jitu:java(?config(java, Config), + ?config(data_dir, Config), + "Maps", + []). %%%----------------------------------------------------------------- %%% INTERNAL FUNCTIONS |