diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-10-21 17:12:24 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-10-21 21:23:37 +0200 |
| commit | 89c732913d6155db48c74dd7c2c0325468048aa5 (patch) | |
| tree | 5a64c95d4c4be805e4873e0d4a91f327c64ae85a /sccomp | |
| parent | 09dfee8a1cf7698a637f647f48750cf8d5722b7c (diff) | |
test: merge CalcUnoApiTest and UnoApiTest into one
Change-Id: I24ec4c2c1c6d83865ef78a6460cde68cef84fdb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141638
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/qa/unit/SwarmSolverTest.cxx | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/sccomp/qa/unit/SwarmSolverTest.cxx b/sccomp/qa/unit/SwarmSolverTest.cxx index 9121f3f54257..2dfbda8f61d7 100644 --- a/sccomp/qa/unit/SwarmSolverTest.cxx +++ b/sccomp/qa/unit/SwarmSolverTest.cxx @@ -14,13 +14,13 @@ #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <test/calc_unoapi_test.hxx> +#include <test/unoapi_test.hxx> using namespace css; namespace { -class SwarmSolverTest : public CalcUnoApiTest +class SwarmSolverTest : public UnoApiTest { void testUnconstrained(); void testVariableBounded(); @@ -30,12 +30,10 @@ class SwarmSolverTest : public CalcUnoApiTest public: SwarmSolverTest() - : CalcUnoApiTest("sccomp/qa/unit/data") + : UnoApiTest("sccomp/qa/unit/data") { } - virtual void tearDown() override; - CPPUNIT_TEST_SUITE(SwarmSolverTest); CPPUNIT_TEST(testUnconstrained); CPPUNIT_TEST(testVariableBounded); @@ -45,16 +43,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -void SwarmSolverTest::tearDown() -{ - if (mxComponent.is()) - closeDocument(mxComponent); -} - void SwarmSolverTest::testUnconstrained() { - CPPUNIT_ASSERT(!mxComponent.is()); - OUString aFileURL; createFileURL(u"Simple.ods", aFileURL); mxComponent = loadFromDesktop(aFileURL); @@ -100,8 +90,6 @@ void SwarmSolverTest::testUnconstrained() void SwarmSolverTest::testVariableBounded() { - CPPUNIT_ASSERT(!mxComponent.is()); - OUString aFileURL; createFileURL(u"Simple.ods", aFileURL); mxComponent = loadFromDesktop(aFileURL); @@ -149,8 +137,6 @@ void SwarmSolverTest::testVariableBounded() void SwarmSolverTest::testVariableConstrained() { - CPPUNIT_ASSERT(!mxComponent.is()); - OUString aFileURL; createFileURL(u"Simple.ods", aFileURL); mxComponent = loadFromDesktop(aFileURL); @@ -201,8 +187,6 @@ void SwarmSolverTest::testVariableConstrained() void SwarmSolverTest::testTwoVariables() { - CPPUNIT_ASSERT(!mxComponent.is()); - OUString aFileURL; createFileURL(u"TwoVariables.ods", aFileURL); mxComponent = loadFromDesktop(aFileURL); @@ -257,8 +241,6 @@ void SwarmSolverTest::testTwoVariables() void SwarmSolverTest::testMultipleVariables() { - CPPUNIT_ASSERT(!mxComponent.is()); - OUString aFileURL; createFileURL(u"MultiVariable.ods", aFileURL); mxComponent = loadFromDesktop(aFileURL); |