From f5765d9f621bdc8fd0e1ac5eec1dcab9ae5b5d06 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Sat, 2 Sep 2017 07:46:53 +0000 Subject: Improve sc/ UNO API unit tests Improve sc/ UNO API unit tests by adding a CPPUNIT_ASSERT with NUMBER_OF_TESTS in setUp(). Makes it easier to spot a mismatch between actual and expected number of tests (you get a cppunit message instead of a crash without an explanation). Change-Id: I7621d8afde3bebbf94cfc3923ad2c12e249ed4c2 Reviewed-on: https://gerrit.libreoffice.org/41829 Tested-by: Jenkins Reviewed-by: Jens Carl --- sc/qa/extras/scannotationobj.cxx | 1 + sc/qa/extras/scannotationshapeobj.cxx | 3 ++- sc/qa/extras/scannotationsobj.cxx | 1 + sc/qa/extras/scarealinkobj.cxx | 1 + sc/qa/extras/sccellobj.cxx | 1 + sc/qa/extras/scdatapilotfieldobj.cxx | 1 + sc/qa/extras/scdatapilottableobj.cxx | 1 + sc/qa/extras/sceditfieldobj-cell.cxx | 1 + sc/qa/extras/sceditfieldobj-header.cxx | 1 + sc/qa/extras/scmodelobj.cxx | 1 + sc/qa/extras/scnamedrangeobj.cxx | 1 + sc/qa/extras/scnamedrangesobj.cxx | 1 + sc/qa/extras/scoutlineobj.cxx | 1 + sc/qa/extras/scstyleloaderobj.cxx | 1 + sc/qa/extras/sctabviewobj.cxx | 1 + sc/qa/extras/scviewpaneobj.cxx | 1 + 16 files changed, 17 insertions(+), 1 deletion(-) diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index 1120974d71b4..fd2bcfd4430d 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -107,6 +107,7 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init() void ScAnnontationObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx index 6b18077e86c0..805fe1f940a4 100644 --- a/sc/qa/extras/scannotationshapeobj.cxx +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -58,7 +58,8 @@ ScAnnotationShapeObj::ScAnnotationShapeObj() void ScAnnotationShapeObj::setUp() { - ++nTest; + nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index 8c3a097999a0..f4cb9c853fd7 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -83,6 +83,7 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init() void ScAnnontationsObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx index cad49d556e5d..c84d0964dbb9 100644 --- a/sc/qa/extras/scarealinkobj.cxx +++ b/sc/qa/extras/scarealinkobj.cxx @@ -91,6 +91,7 @@ uno::Reference< uno::XInterface > ScAreaLinkObj::init() void ScAreaLinkObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx index c50fd3e2ebc4..6d0f90c1f732 100644 --- a/sc/qa/extras/sccellobj.cxx +++ b/sc/qa/extras/sccellobj.cxx @@ -74,6 +74,7 @@ uno::Reference< uno::XInterface > ScCellObj::init() void ScCellObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index 58849d88cf6d..903839dd55fa 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -88,6 +88,7 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() void ScDataPilotFieldObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 8ce6d6be9028..beaaeae7f4a1 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -142,6 +142,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() void ScDataPilotTableObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index 6258b8a95173..0d469969cb7f 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -78,6 +78,7 @@ ScEditFieldObj_Cell::ScEditFieldObj_Cell() void ScEditFieldObj_Cell::setUp() { ++nTest; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx index 4a5cb25fb1e1..a1ae16e86eb8 100644 --- a/sc/qa/extras/sceditfieldobj-header.cxx +++ b/sc/qa/extras/sceditfieldobj-header.cxx @@ -74,6 +74,7 @@ ScEditFieldObj_Header::ScEditFieldObj_Header() void ScEditFieldObj_Header::setUp() { ++nTest; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index 9a2666f8cdfc..f81c49bfef45 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -58,6 +58,7 @@ uno::Reference< uno::XInterface > ScModelObj::init() void ScModelObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); UnoApiTest::setUp(); } diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index f46428cd8d74..0ed8fee62830 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -95,6 +95,7 @@ uno::Reference< uno::XInterface > ScNamedRangeObj::init() void ScNamedRangeObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index e041f69230ca..15e02cfd066d 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -73,6 +73,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) void ScNamedRangesObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index 9d1b511bc362..2b32e62a9788 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -73,6 +73,7 @@ uno::Reference< uno::XInterface > ScOutlineObj::init() void ScOutlineObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scstyleloaderobj.cxx b/sc/qa/extras/scstyleloaderobj.cxx index 1a1f819cccae..e9a2a2170c29 100644 --- a/sc/qa/extras/scstyleloaderobj.cxx +++ b/sc/qa/extras/scstyleloaderobj.cxx @@ -101,6 +101,7 @@ OUString ScStyleLoaderObj::getTestURL(){ void ScStyleLoaderObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/sctabviewobj.cxx b/sc/qa/extras/sctabviewobj.cxx index 6badea0619b8..a3614e63a4e4 100644 --- a/sc/qa/extras/sctabviewobj.cxx +++ b/sc/qa/extras/sctabviewobj.cxx @@ -72,6 +72,7 @@ uno::Reference< uno::XInterface > ScTabViewObj::init() void ScTabViewObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } diff --git a/sc/qa/extras/scviewpaneobj.cxx b/sc/qa/extras/scviewpaneobj.cxx index c95373fe1ec1..02ceb63824e0 100644 --- a/sc/qa/extras/scviewpaneobj.cxx +++ b/sc/qa/extras/scviewpaneobj.cxx @@ -74,6 +74,7 @@ uno::Reference< uno::XInterface > ScViewPaneObj::init() void ScViewPaneObj::setUp() { nTest++; + CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); } -- cgit