summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlabancap <labancap@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-02-22 04:32:52 +0000
committerlabancap <labancap@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-02-22 04:32:52 +0000
commit7446d81ff861d85676292217413cb6e00e604af7 (patch)
treedeb9e1d1fa83c6b5738ad3817b62149efd363eac
parenteb758b286f2bd7ad1ec15b49b8d8ecb164df53b4 (diff)
downloadATCD-7446d81ff861d85676292217413cb6e00e604af7.tar.gz
Added additional use case tests to dynsequence
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tests/DynAny_Test/da_tests.idl1
-rw-r--r--TAO/tests/DynAny_Test/test_dynsequence.cpp46
3 files changed, 55 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c1170e7a591..53d94dbfa8c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 22 04:24:41 UTC 2013 Phillip LaBanca <labancap@ociweb.com>
+
+ * tests/DynAny_Test/da_tests.idl:
+ * tests/DynAny_Test/test_dynsequence.cpp:
+
+ Added use case tests of narrowing DynSequence from a DynAny
+ containing a basic type sequence.
+
Thu Feb 21 23:45:22 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/ImplRepo/servers_list/server.cpp:
diff --git a/TAO/tests/DynAny_Test/da_tests.idl b/TAO/tests/DynAny_Test/da_tests.idl
index 680db6295dd..233fc00ea76 100644
--- a/TAO/tests/DynAny_Test/da_tests.idl
+++ b/TAO/tests/DynAny_Test/da_tests.idl
@@ -21,6 +21,7 @@ module DynAnyTests
typedef sequence<string<8> > test_seq;
typedef sequence<short> SeqShort;
+ typedef sequence<boolean> SeqBoolean;
const unsigned long DIM = 2;
typedef long test_array [DIM];
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 5282034114c..aa9652a0519 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -258,6 +258,52 @@ Test_DynSequence::run_test (void)
-1);
}
+ ACE_DEBUG ((
+ LM_DEBUG,
+ ACE_TEXT ("testing: constructor(%C)/create_dyn_any_from_type_code\n"),
+ "BooleanSeq"
+ ));
+
+ DynamicAny::DynAny_var da_bool =
+ dynany_factory->create_dyn_any_from_type_code (
+ DynAnyTests::_tc_SeqBoolean
+ );
+
+ DynamicAny::DynSequence_var ds_bool =
+ DynamicAny::DynSequence::_narrow (da_bool.in ());
+
+ if (CORBA::is_nil (ds_bool.in ()))
+ {
+ ACE_DEBUG ((
+ LM_DEBUG,
+ ACE_TEXT ("DynSequence::_narrow() returned nil\n")
+ ));
+ this->error_count_++;
+ }
+
+ ACE_DEBUG ((
+ LM_DEBUG,
+ ACE_TEXT ("testing: constructor(%C)/create_dyn_any_from_type_code\n"),
+ "ShortSeq"
+ ));
+
+ DynamicAny::DynAny_var da_short =
+ dynany_factory->create_dyn_any_from_type_code (
+ DynAnyTests::_tc_SeqShort
+ );
+
+ DynamicAny::DynSequence_var ds_short =
+ DynamicAny::DynSequence::_narrow (da_short.in ());
+
+ if (CORBA::is_nil (ds_short.in ()))
+ {
+ ACE_DEBUG ((
+ LM_DEBUG,
+ ACE_TEXT ("DynSequence::_narrow() returned nil\n")
+ ));
+ this->error_count_++;
+ }
+
ts[0] = CORBA::string_dup (data.m_string1);
CORBA::Any in_any2;
in_any2 <<= ts;