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

Improve test assertions

Browse Source 
Change-Id: I5c5a76ca0e1db699dbb9f3fd381e050fc7256d27
This commit is contained in:
Stephan Bergmann
2013-10-23 22:54:08 +02:00
parent fe5fa933e2
commit 52a7238aed
1 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
test/source/sheet/xsheetannotations.cxx
View File

@@ -38,21 +38,30 @@ void XSheetAnnotations::testInsertNew()
//uno::Reference< container::XIndexAccess > xAnnotationsIndexAfter (aSheetAnnotations, UNO_QUERY_THROW); //uno::Reference< container::XIndexAccess > xAnnotationsIndexAfter (aSheetAnnotations, UNO_QUERY_THROW);
sal_Int32 nAfter = xAnnotationsIndex->getCount(); sal_Int32 nAfter = xAnnotationsIndex->getCount();
CPPUNIT_ASSERT_MESSAGE("Annotations index not updated", nAfter == nBefore + 1); CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Annotations index not updated", nBefore + 1, nAfter);
// is the position ok ? // is the position ok ?
uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW); uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW);
table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition(); table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition();
CPPUNIT_ASSERT_MESSAGE("Insert Annotation - Wrong SHEET reference position", xResultCellAddress.Sheet == xTargetCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE(
CPPUNIT_ASSERT_MESSAGE("Insert Annotation - Wrong COLUMN reference position", xResultCellAddress.Column == xTargetCellAddress.Column); "Insert Annotation - Wrong SHEET reference position",
CPPUNIT_ASSERT_MESSAGE("Insert Annotation - Wrong ROW reference position", xResultCellAddress.Row == xTargetCellAddress.Row); xTargetCellAddress.Sheet, xResultCellAddress.Sheet);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Insert Annotation - Wrong COLUMN reference position",
xTargetCellAddress.Column, xResultCellAddress.Column);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Insert Annotation - Wrong ROW reference position",
xTargetCellAddress.Row, xResultCellAddress.Row);
// is the string ok ? // is the string ok ?
uno::Reference< text::XTextRange > aTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); uno::Reference< text::XTextRange > aTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW);
OUString aString = aTextSheetAnnotation->getString(); OUString aString = aTextSheetAnnotation->getString();
CPPUNIT_ASSERT_MESSAGE("Insert Annotation - Wrong string", aString == "an inserted annotation"); CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Insert Annotation - Wrong string", OUString("an inserted annotation"),
aString);
} }
@@ -83,29 +92,45 @@ void XSheetAnnotations::testRemoveByIndex()
uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW); uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW);
table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition(); table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition();
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong SHEET reference position", xResultCellAddress.Sheet == xOtherCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE(
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong COLUMN reference position", xResultCellAddress.Column == xOtherCellAddress.Column); "Remove Annotation - Wrong SHEET reference position",
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong ROW reference position", xResultCellAddress.Row == xOtherCellAddress.Row); xOtherCellAddress.Sheet, xResultCellAddress.Sheet);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Remove Annotation - Wrong COLUMN reference position",
xOtherCellAddress.Column, xResultCellAddress.Column);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Remove Annotation - Wrong ROW reference position",
xOtherCellAddress.Row, xResultCellAddress.Row);
// is the string ok ? // is the string ok ?
uno::Reference< text::XTextRange > aLastTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); uno::Reference< text::XTextRange > aLastTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW);
OUString aLastString = aLastTextSheetAnnotation->getString(); OUString aLastString = aLastTextSheetAnnotation->getString();
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong string", aLastString == "an inserted annotation 3"); CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Remove Annotation - Wrong string",
OUString("an inserted annotation 3"), aLastString);
// the previous should be xTargetCellAddress // the previous should be xTargetCellAddress
uno::Reference< sheet::XSheetAnnotation > aPreviousSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-2), UNO_QUERY_THROW); uno::Reference< sheet::XSheetAnnotation > aPreviousSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-2), UNO_QUERY_THROW);
table::CellAddress xPreviousCellAddress = aPreviousSheetAnnotation->getPosition(); table::CellAddress xPreviousCellAddress = aPreviousSheetAnnotation->getPosition();
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong SHEET reference position", xPreviousCellAddress.Sheet == xTargetCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE(
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong COLUMN reference position", xPreviousCellAddress.Column == xTargetCellAddress.Column); "Remove Annotation - Wrong SHEET reference position",
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong ROW reference position", xPreviousCellAddress.Row == xTargetCellAddress.Row); xTargetCellAddress.Sheet, xPreviousCellAddress.Sheet);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Remove Annotation - Wrong COLUMN reference position",
xTargetCellAddress.Column, xPreviousCellAddress.Column);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Remove Annotation - Wrong ROW reference position",
xTargetCellAddress.Row, xPreviousCellAddress.Row);
// is the string ok ? // is the string ok ?
uno::Reference< text::XTextRange > aPreviousTextSheetAnnotation(aPreviousSheetAnnotation, UNO_QUERY_THROW); uno::Reference< text::XTextRange > aPreviousTextSheetAnnotation(aPreviousSheetAnnotation, UNO_QUERY_THROW);
OUString aPreviousString = aPreviousTextSheetAnnotation->getString(); OUString aPreviousString = aPreviousTextSheetAnnotation->getString();
CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong string", aPreviousString == "an inserted annotation 1"); CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Remove Annotation - Wrong string",
OUString("an inserted annotation 1"), aPreviousString);
} }