mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blind wae fix for PPUNIT_ASSERT_EQUAL

Browse Source 
Change-Id: I0842e354fb766ebbbf2cff57a410a38fb8b8d3b1
This commit is contained in:
Noel Power
2013-02-11 13:58:33 +00:00
parent aa2450cb51
commit 0ee3d79b98
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
basic/qa/cppunit/test_nested_struct.cxx
View File

@@ -288,15 +288,16 @@ void Nested_Struct::testUnfixedVarAssignAlt()
bool bRes = aRet >>= aResult; bool bRes = aRet >>= aResult;
CPPUNIT_ASSERT_EQUAL(true, bRes ); CPPUNIT_ASSERT_EQUAL(true, bRes );
int result = aResult.getLength();
// should have 2 elements in a sequence returned // should have 2 elements in a sequence returned
CPPUNIT_ASSERT_EQUAL(2, aResult.getLength() ); CPPUNIT_ASSERT_EQUAL(2, result );
table::TableBorder aBorder; table::TableBorder aBorder;
aResult[0] >>= aBorder; aResult[0] >>= aBorder;
table::BorderLine aBorderLine; table::BorderLine aBorderLine;
aResult[1] >>= aBorderLine; aResult[1] >>= aBorderLine;
int result = aBorder.HorizontalLine.OuterLineWidth; result = aBorder.HorizontalLine.OuterLineWidth;
CPPUNIT_ASSERT_EQUAL(9, result ); CPPUNIT_ASSERT_EQUAL(9, result );
result = aBorderLine.OuterLineWidth; result = aBorderLine.OuterLineWidth;
CPPUNIT_ASSERT_EQUAL(4, result ); CPPUNIT_ASSERT_EQUAL(4, result );
@@ -341,15 +342,16 @@ void Nested_Struct::testFixedVarAssignAlt()
bool bRes = aRet >>= aResult; bool bRes = aRet >>= aResult;
CPPUNIT_ASSERT_EQUAL(true, bRes ); CPPUNIT_ASSERT_EQUAL(true, bRes );
int result = aResult.getLength();
// should have 2 elements in a sequence returned // should have 2 elements in a sequence returned
CPPUNIT_ASSERT_EQUAL(2, aResult.getLength() ); CPPUNIT_ASSERT_EQUAL(2, result );
table::TableBorder aBorder; table::TableBorder aBorder;
aResult[0] >>= aBorder; aResult[0] >>= aBorder;
table::BorderLine aBorderLine; table::BorderLine aBorderLine;
aResult[1] >>= aBorderLine; aResult[1] >>= aBorderLine;
int result = aBorder.HorizontalLine.OuterLineWidth; result = aBorder.HorizontalLine.OuterLineWidth;
CPPUNIT_ASSERT_EQUAL(9, result ); CPPUNIT_ASSERT_EQUAL(9, result );
result = aBorderLine.OuterLineWidth; result = aBorderLine.OuterLineWidth;
CPPUNIT_ASSERT_EQUAL(4, result ); CPPUNIT_ASSERT_EQUAL(4, result );
@@ -374,7 +376,8 @@ void Nested_Struct::testUnoAccess()
awt::WindowDescriptor aWinDesc; awt::WindowDescriptor aWinDesc;
aRet >>= 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 // Put the test suite in the registry