summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-12-06 07:51:45 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-12-06 07:51:45 +0000
commit13d664e99b25b19192a71a0c5a1885e02121d923 (patch)
tree816e7277a6c2d9034299727f1eab1c99296bc8f1
parent07c1a3aa1932828dfd5e12347bcc1a9998e8abfd (diff)
downloadATCD-13d664e99b25b19192a71a0c5a1885e02121d923.tar.gz
Added test from Jeff
-rw-r--r--TAO/tests/IDL_Test/valuetype.idl43
1 files changed, 42 insertions, 1 deletions
diff --git a/TAO/tests/IDL_Test/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl
index de7d0f56ea3..3213f6f4b03 100644
--- a/TAO/tests/IDL_Test/valuetype.idl
+++ b/TAO/tests/IDL_Test/valuetype.idl
@@ -1,5 +1,5 @@
+//=============================================================================
-//=============================================================================
/**
* @file valuetype.idl
*
@@ -13,6 +13,7 @@
*
* @author Gary Duzan <gduzan@bbn.com> Jeff Parsons <j.parsons@vanderbilt.edu>
*/
+
//=============================================================================
@@ -23,6 +24,7 @@
// A valuetype factory can have exceptions, so the declaration must pull in
// an #include of SystemException.h.
+
valuetype MyValueType
{
public string my_string_value;
@@ -72,4 +74,43 @@ module X
typedef sequence<BXXX> BSeq;
};
+// The original problem with the construct below was probably the
+// union member, but other features from the original example IDL
+// have been left in just in case.
+module ModSelection
+{
+ module SelectionDefns
+ {
+ abstract valuetype Criterion
+ {
+ void setCriterionRequiredAttributes (inout string theSelectedAttrs);
+ boolean isValid (in wstring theTrackSelectionAttrs);
+ };
+
+ valuetype CriterionExpr : Criterion
+ {
+ struct RightCriterionInfos
+ {
+ long theCriterionId;
+ CriterionExpr theRightExpr;
+ };
+
+ union RightCriterionExpr switch (boolean)
+ {
+ case TRUE: string theRightCriterionInfos;
+ };
+
+ public Criterion theLeftCriterion;
+ public RightCriterionExpr theRightCriterionExpr;
+
+ factory createWithCriterionLink (in Criterion theLeftCriterion,
+ in string link,
+ in CriterionExpr theRightCriterion);
+
+ factory createWithSingleCriterion (in Criterion theSingleCriterion);
+ };
+ };
+};
+
#endif /* IDL_TEST_VALUETYPE_IDL */
+