diff options
| author | Erlang/OTP <[email protected]> | 2010-12-16 14:34:26 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-12-16 14:34:26 +0100 |
| commit | 73205a499c16781ecd064ec2446d502b3c0d01b6 (patch) | |
| tree | 260a1805f06a1ecef92d03d29853dbddb0bbd803 /lib/orber/test/orber_test_lib.erl | |
| parent | 99e34bba1a60b262e24496cc9288b549360c6377 (diff) | |
| parent | 98a66242abe688d852ec46f4298a364fc0124995 (diff) | |
| download | otp-73205a499c16781ecd064ec2446d502b3c0d01b6.tar.gz otp-73205a499c16781ecd064ec2446d502b3c0d01b6.tar.bz2 otp-73205a499c16781ecd064ec2446d502b3c0d01b6.zip | |
Merge branch 'nick/orber/recursive_types/OTP-8868' into maint-r14
* nick/orber/recursive_types/OTP-8868:
Support for recursive unions and structs. Break loop if recursive TypeCode.
Added basic tests for recursive uinions and structs.
Removed test code.
Added partial support for recursive IDL types.
Conflicts:
lib/ic/doc/src/notes.xml
lib/ic/vsn.mk
lib/orber/vsn.mk
Diffstat (limited to 'lib/orber/test/orber_test_lib.erl')
| -rw-r--r-- | lib/orber/test/orber_test_lib.erl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl index a694dc58c4..b95cf4b0ec 100644 --- a/lib/orber/test/orber_test_lib.erl +++ b/lib/orber/test/orber_test_lib.erl @@ -1280,6 +1280,22 @@ test_coding(Obj, Local) -> ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, orber_test_server: testing_iiop_server_marshal(Obj, "string")), + + RecS = #orber_test_server_rec_struct{chain = [#orber_test_server_rec_struct{chain = []}]}, + ?match(RecS, orber_test_server:testing_iiop_rec_struct(Obj, RecS)), + + RecU = #orber_test_server_rec_union{label = 'RecursiveType', + value = [#orber_test_server_rec_union{label = 'RecursiveType', + value = []}]}, + ?match(RecU, orber_test_server:testing_iiop_rec_union(Obj, RecU)), + +%% RecA1 = #any{typecode = unsupported, value = RecS}, +%% RecA2 = #any{typecode = unsupported, value = RecU}, +%% ?match(RecA1, +%% orber_test_server:testing_iiop_rec_any(Obj, RecA1)), +%% ?match(RecA2, +%% orber_test_server:testing_iiop_rec_any(Obj, RecA2)), + ok. %%--------------- Testing Post- & Pre-cond ------------------- |