1 files changed, 67 insertions, 15 deletions

diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
index abb082e3fd24..cec2a2a4038d 100644
--- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
+++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
@@ -412,27 +412,67 @@ static bool performTest(XBridgeTest* xLBT)
         aSetData->Sequence[1] = new TestElement(); // empty struct
 
         xLBT->setValues(
-                aSetData->Bool, aSetData->Char, aSetData->Byte, aSetData->Short, aSetData->UShort,
-                aSetData->Long, aSetData->ULong, aSetData->Hyper, aSetData->UHyper, aSetData->Float, aSetData->Double,
-                aSetData->Enum, aSetData->String, aSetData->Interface, aSetData->Any, aSetData->Sequence, aSetData );
+                aSetData->Bool,
+                aSetData->Char,
+                aSetData->Byte,
+                aSetData->Short,
+                aSetData->UShort,
+                aSetData->Long,
+                aSetData->ULong,
+                aSetData->Hyper,
+                aSetData->UHyper,
+                aSetData->Float,
+                aSetData->Double,
+                aSetData->Enum,
+                aSetData->String,
+                aSetData->Interface,
+                aSetData->Any,
+                aSetData->Sequence,
+                aSetData );
 
         {
         TestDataElements* aRet = new TestDataElements();
         TestDataElements* aRet2 = new TestDataElements();
         xLBT->getValues(
-            & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short, & aRet->UShort,
-            & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper,
-            & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String,
-            & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 );
+            & aRet->Bool,
+            & aRet->Char,
+            & aRet->Byte,
+            & aRet->Short,
+            & aRet->UShort,
+            & aRet->Long,
+            & aRet->ULong,
+            & aRet->Hyper,
+            & aRet->UHyper,
+            & aRet->Float,
+            & aRet->Double,
+            & aRet->Enum,
+            & aRet->String,
+            & aRet->Interface,
+            & aRet->Any,
+            & aRet->Sequence,
+            & aRet2 );
 
         bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) , "getValues test") && bRet;
 
         // set last retrieved values
         TestDataElements* aSV2ret = xLBT->setValues2(
-            & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short, & aRet->UShort,
-            & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper, & aRet->Float,
-            & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any,
-            & aRet->Sequence, & aRet2 );
+            & aRet->Bool,
+            & aRet->Char,
+            & aRet->Byte,
+            & aRet->Short,
+            & aRet->UShort,
+            & aRet->Long,
+            & aRet->ULong,
+            & aRet->Hyper,
+            & aRet->UHyper,
+            & aRet->Float,
+            & aRet->Double,
+            & aRet->Enum,
+            & aRet->String,
+            & aRet->Interface,
+            & aRet->Any,
+            & aRet->Sequence,
+            & aRet2 );
 
         // check inout sequence order
         // => inout sequence parameter was switched by test objects
@@ -448,10 +488,22 @@ static bool performTest(XBridgeTest* xLBT)
         TestDataElements* aRet = new TestDataElements();
         TestDataElements* aRet2 = new TestDataElements();
         TestDataElements* aGVret = xLBT->getValues(
-            & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short,
-            & aRet->UShort, & aRet->Long, & aRet->ULong, & aRet->Hyper,
-            & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum,
-            & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence,
+            & aRet->Bool,
+            & aRet->Char,
+            & aRet->Byte,
+            & aRet->Short,
+            & aRet->UShort,
+            & aRet->Long,
+            & aRet->ULong,
+            & aRet->Hyper,
+            & aRet->UHyper,
+            & aRet->Float,
+            & aRet->Double,
+            & aRet->Enum,
+            & aRet->String,
+            & aRet->Interface,
+            & aRet->Any,
+            & aRet->Sequence,
             & aRet2 );
 
         bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) && compareData( aData, aGVret ), "getValues test" ) && bRet;