[Libreoffice-commits] core.git: basic/qa

[Noel Power]

 basic/qa/cppunit/test_nested_struct.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 0ee3d79b98af3c249f47c77a0298a80f01300be5
Author: Noel Power <noel.power at suse.com>
Date:   Mon Feb 11 13:58:33 2013 +0000

    blind wae fix for PPUNIT_ASSERT_EQUAL
    
    Change-Id: I0842e354fb766ebbbf2cff57a410a38fb8b8d3b1

diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx
index 91978e3..c55f4b3 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -288,15 +288,16 @@ void Nested_Struct::testUnfixedVarAssignAlt()
     bool bRes = aRet >>= aResult;
     CPPUNIT_ASSERT_EQUAL(true, bRes );
 
+    int result = aResult.getLength();
     // should have 2 elements in a sequence returned
-    CPPUNIT_ASSERT_EQUAL(2, aResult.getLength() );
+    CPPUNIT_ASSERT_EQUAL(2, result );
 
     table::TableBorder aBorder;
     aResult[0] >>= aBorder;
 
     table::BorderLine aBorderLine;
     aResult[1] >>= aBorderLine;
-    int result = aBorder.HorizontalLine.OuterLineWidth;
+    result = aBorder.HorizontalLine.OuterLineWidth;
     CPPUNIT_ASSERT_EQUAL(9, result );
     result = aBorderLine.OuterLineWidth;
     CPPUNIT_ASSERT_EQUAL(4, result );
@@ -341,15 +342,16 @@ void Nested_Struct::testFixedVarAssignAlt()
     bool bRes = aRet >>= aResult;
     CPPUNIT_ASSERT_EQUAL(true, bRes );
 
+    int result = aResult.getLength();
     // should have 2 elements in a sequence returned
-    CPPUNIT_ASSERT_EQUAL(2, aResult.getLength() );
+    CPPUNIT_ASSERT_EQUAL(2, result );
 
     table::TableBorder aBorder;
     aResult[0] >>= aBorder;
 
     table::BorderLine aBorderLine;
     aResult[1] >>= aBorderLine;
-    int result = aBorder.HorizontalLine.OuterLineWidth;
+    result = aBorder.HorizontalLine.OuterLineWidth;
     CPPUNIT_ASSERT_EQUAL(9, result );
     result = aBorderLine.OuterLineWidth;
     CPPUNIT_ASSERT_EQUAL(4, result );
@@ -374,7 +376,8 @@ void Nested_Struct::testUnoAccess()
     awt::WindowDescriptor aWinDesc;
     aRet >>= aWinDesc;
 
-    CPPUNIT_ASSERT_EQUAL(200, aWinDesc.Bounds.X );
+    int result = aWinDesc.Bounds.X;
+    CPPUNIT_ASSERT_EQUAL(200, result );
 }
 
   // Put the test suite in the registry