diff options
146 files changed, 480 insertions, 912 deletions
diff --git a/basebmp/test/basebmp_cppunittester_all.cxx b/basebmp/test/basebmp_cppunittester_all.cxx index 076fe43a8e36..aecb816e4149 100644 --- a/basebmp/test/basebmp_cppunittester_all.cxx +++ b/basebmp/test/basebmp_cppunittester_all.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 2f262e5bbb0f..c3c2114c3b0f 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_basebmp #endif diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index e1e8872acb6c..a263bc7d76e7 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -28,9 +28,6 @@ // autogenerated file with codegen.pl -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 65109239e42b..89704dde7288 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index dd5ff85f44d9..748bea9eb7ef 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 3cddc4a7a166..f4c7dea2bfc4 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index 6e0297848c81..a05bfe81469b 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 8918a7a53e28..dbfbb5c2813c 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 0c6b6d4c5cb2..ca90ca13da42 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 12c920756f36..8919d26a2d53 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -26,15 +26,12 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_basegfx #endif -// autogenerated file with codegen.pl - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 66cbcb09c72d..2cb7aba75fc6 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// autogenerated file with codegen.pl - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" @@ -282,9 +277,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dsvgdimpex); + CPPUNIT_TEST_SUITE(b2dsvgdimpex); CPPUNIT_TEST(impex); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dsvgdimpex class b2drange : public CppUnit::TestFixture @@ -301,9 +296,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2drange); + CPPUNIT_TEST_SUITE(b2drange); CPPUNIT_TEST(check); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; class b2dpolyrange : public CppUnit::TestFixture @@ -334,9 +329,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dpolyrange); + CPPUNIT_TEST_SUITE(b2dpolyrange); CPPUNIT_TEST(check); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; class b2dhommatrix : public CppUnit::TestFixture @@ -703,7 +698,7 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dhommatrix); + CPPUNIT_TEST_SUITE(b2dhommatrix); CPPUNIT_TEST(equal); CPPUNIT_TEST(identity); CPPUNIT_TEST(scale); @@ -712,7 +707,7 @@ public: CPPUNIT_TEST(shear); CPPUNIT_TEST(multiply); CPPUNIT_TEST(decompose); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dhommatrix @@ -731,9 +726,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dpoint); + CPPUNIT_TEST_SUITE(b2dpoint); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dpoint @@ -797,9 +792,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dpolygon); + CPPUNIT_TEST_SUITE(b2dpolygon); CPPUNIT_TEST(testBasics); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dpolygon @@ -877,9 +872,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dpolygontools); + CPPUNIT_TEST_SUITE(b2dpolygontools); CPPUNIT_TEST(testIsRectangle); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dpolygontools @@ -895,9 +890,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dpolypolygon); + CPPUNIT_TEST_SUITE(b2dpolypolygon); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dpolypolygon class b1Xrange : public CppUnit::TestFixture @@ -960,9 +955,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b1Xrange); + CPPUNIT_TEST_SUITE(b1Xrange); CPPUNIT_TEST(check); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b1Xrange @@ -1019,9 +1014,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b1ibox); + CPPUNIT_TEST_SUITE(b1ibox); CPPUNIT_TEST(TestBox); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b1ibox @@ -1059,9 +1054,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2Xrange); + CPPUNIT_TEST_SUITE(b2Xrange); CPPUNIT_TEST(check); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2Xrange @@ -1092,9 +1087,9 @@ public: // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2ibox); + CPPUNIT_TEST_SUITE(b2ibox); CPPUNIT_TEST(TestBox); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2ibox @@ -1112,9 +1107,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b2dtuple); + CPPUNIT_TEST_SUITE(b2dtuple); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dtuple class bcolor : public CppUnit::TestFixture @@ -1274,11 +1269,11 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(bcolor); + CPPUNIT_TEST_SUITE(bcolor); CPPUNIT_TEST(hslTest); CPPUNIT_TEST(hsvTest); CPPUNIT_TEST(ciexyzTest); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b2dvector // ----------------------------------------------------------------------------- diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx index df9dfc129848..682a5314f12f 100644 --- a/basegfx/test/basegfx3d.cxx +++ b/basegfx/test/basegfx3d.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// autogenerated file with codegen.pl - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" @@ -61,9 +57,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b3dhommatrix); + CPPUNIT_TEST_SUITE(b3dhommatrix); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b3dhommatrix @@ -90,9 +86,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b3dpoint); + CPPUNIT_TEST_SUITE(b3dpoint); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b3dpoint @@ -117,9 +113,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b3drange); + CPPUNIT_TEST_SUITE(b3drange); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b3drange @@ -146,9 +142,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b3dtuple); + CPPUNIT_TEST_SUITE(b3dtuple); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b3dtuple @@ -173,9 +169,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(b3dvector); + CPPUNIT_TEST_SUITE(b3dvector); CPPUNIT_TEST(EmptyMethod); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class b3dvector // ----------------------------------------------------------------------------- diff --git a/basegfx/test/basegfx_cppunittester_all.cxx b/basegfx/test/basegfx_cppunittester_all.cxx index 7c6616bdab99..b5f89921fe02 100644 --- a/basegfx/test/basegfx_cppunittester_all.cxx +++ b/basegfx/test/basegfx_cppunittester_all.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx index 2735508b3238..64718241575b 100644 --- a/basegfx/test/basegfxtools.cxx +++ b/basegfx/test/basegfxtools.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// autogenerated file with codegen.pl - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index a886f6c67525..ecf9ec0caa3d 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// autogenerated file with codegen.pl - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index be039a99f571..4f3253e00eb7 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// autogenerated file with codegen.pl - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index a8da22f3cda2..3ff4afe7a8d9 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// autogenerated file with codegen.pl - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx index 9a9401f31bc1..f7b72758847f 100644 --- a/basic/qa/cppunit/test_append.cxx +++ b/basic/qa/cppunit/test_append.cxx @@ -6,9 +6,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basic/qa/cppunit/test_scanner.cxx b/basic/qa/cppunit/test_scanner.cxx index 0935f66a6fba..b773bfb419c4 100644 --- a/basic/qa/cppunit/test_scanner.cxx +++ b/basic/qa/cppunit/test_scanner.cxx @@ -6,9 +6,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/binaryurp/qa/binaryurp_cppunittester_all.cxx b/binaryurp/qa/binaryurp_cppunittester_all.cxx index ea56c67630fa..7dd11d78d502 100644 --- a/binaryurp/qa/binaryurp_cppunittester_all.cxx +++ b/binaryurp/qa/binaryurp_cppunittester_all.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/binaryurp/qa/test-cache.cxx b/binaryurp/qa/test-cache.cxx index c410b2f3b4da..3ef236af445d 100644 --- a/binaryurp/qa/test-cache.cxx +++ b/binaryurp/qa/test-cache.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_binaryurp_cache #endif +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx index 35fa84b4c67a..81a50a826e9d 100644 --- a/binaryurp/qa/test-unmarshal.cxx +++ b/binaryurp/qa/test-unmarshal.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_binaryurp_unmarshal #endif diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 96dcebd3c98f..5cc53249b2f8 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -#include "sal/precppunit.hxx" - #include <comphelper/string.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/i18n/CharType.hpp> diff --git a/comphelper/qa/weakbag/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx index c7004bf88105..f30c0acc75c8 100644 --- a/comphelper/qa/weakbag/test_weakbag.cxx +++ b/comphelper/qa/weakbag/test_weakbag.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XInterface.hpp" #include "comphelper/weakbag.hxx" diff --git a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx index f101e0785515..325e9f7f8cc1 100644 --- a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx +++ b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/plugin/TestPlugIn.h> CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/cppu/qa/cppu_cppunittester_all.cxx b/cppu/qa/cppu_cppunittester_all.cxx index a4988c75cf07..49f1756320cb 100644 --- a/cppu/qa/cppu_cppunittester_all.cxx +++ b/cppu/qa/cppu_cppunittester_all.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 6074dac7c574..f1e9c863540d 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #include "FILE.hpp" #include "lconv.hpp" diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index f8726b3ae70f..6c8aee0a6b48 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_any diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx index 72718315748b..81e8c6002f47 100644 --- a/cppu/qa/test_recursion.cxx +++ b/cppu/qa/test_recursion.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_recursion diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index d9ba9386d00e..12173c350985 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_reference diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 0a72cf979ea1..a7e545dcfea6 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_unotype diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index 7d40a8d1194c..7b2121d57286 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -26,8 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #include <string.h> #include <cppunit/TestFixture.h> diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index d483564e9c0c..a3fa06bdbb49 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -26,8 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_cppuhelper_propertysetmixin diff --git a/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx b/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx index 82a05401a24c..3904510652ad 100644 --- a/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx +++ b/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx b/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx index 44b913b84800..ca5a8ed74df2 100644 --- a/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx +++ b/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index d7ad8a641ea8..ea0ea97f978a 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx index c0e35ca6eee5..861433fb19eb 100644 --- a/cppuhelper/qa/weak/test_weak.cxx +++ b/cppuhelper/qa/weak/test_weak.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index ba5d22aac8ac..6a284e23bc41 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -26,10 +26,8 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstddef> +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx index 69adb1048162..96de7e7a55f1 100644 --- a/editeng/qa/items/borderline_test.cxx +++ b/editeng/qa/items/borderline_test.cxx @@ -27,9 +27,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index d02cb9303505..a43dcaa46332 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -26,9 +26,6 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "test/bootstrapfixture.hxx" #include <cppunit/TestFixture.h> diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx index 3551f8a5022b..7d5195075ba0 100644 --- a/extensions/qa/update/test_update.cxx +++ b/extensions/qa/update/test_update.cxx @@ -25,15 +25,7 @@ * instead of those above. */ -#include <sal/config.h> -#include <sal/precppunit.hxx> #include <test/bootstrapfixture.hxx> - -#include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> -#include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> - #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/deployment/UpdateInformationEntry.hpp> diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx index 6ad1d6379d64..a452ee412697 100644 --- a/filter/source/svg/test/parsertest.cxx +++ b/filter/source/svg/test/parsertest.cxx @@ -24,9 +24,8 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx index 1ebe1bba8172..e3054ae1a518 100644 --- a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx +++ b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index ffd590c0c05a..c191bbcce0b7 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -25,9 +25,6 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_i18npool_breakiterator #endif diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index 08c20296d179..02f601f9877b 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -25,9 +25,6 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cppuhelper/compbase1.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index d302052d98e9..ba261fa3c3f3 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx index 5d6e681c800f..9f163c278e73 100644 --- a/o3tl/qa/test-heap_ptr.cxx +++ b/o3tl/qa/test-heap_ptr.cxx @@ -17,21 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include <o3tl/heap_ptr.hxx> - - - using o3tl::heap_ptr; - class Help { public: diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx index 335c7da35d9b..ff0e49c05fa9 100644 --- a/o3tl/qa/test-range.cxx +++ b/o3tl/qa/test-range.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" @@ -28,14 +26,11 @@ #include <vector> #include <deque> - - using o3tl::range; using o3tl::make_range; using o3tl::range_of; using std::size_t; - class range_test : public CppUnit::TestFixture { public: diff --git a/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx index 93edd1976a17..1b7ca1c97197 100644 --- a/o3tl/qa/test-vector_pool.cxx +++ b/o3tl/qa/test-vector_pool.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/officecfg/qa/cppheader.cxx b/officecfg/qa/cppheader.cxx index 12042ca67ee0..941d3193c2d4 100644 --- a/officecfg/qa/cppheader.cxx +++ b/officecfg/qa/cppheader.cxx @@ -27,9 +27,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk index 00dc323a2b4e..c253de78510c 100644 --- a/sal/Package_inc.mk +++ b/sal/Package_inc.mk @@ -113,7 +113,6 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/sal/log.hxx,sal/log.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/macros.h,sal/macros.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/main.h,sal/main.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/mathconf.h,sal/mathconf.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/precppunit.hxx,sal/precppunit.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/saldllapi.h,sal/saldllapi.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/types.h,sal/types.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/detail/log.h,sal/detail/log.h)) diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 9ec61c1b9878..a5fe7007d4ad 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef WNT #include <windows.h> #endif @@ -37,6 +34,7 @@ #include <iostream> #include <limits> #include <string> +#include <sal/types.h> #include "cppunittester/protectorfactory.hxx" #include "osl/module.h" #include "osl/module.hxx" diff --git a/sal/inc/cppunittester/protectorfactory.hxx b/sal/inc/cppunittester/protectorfactory.hxx index e12afe7ed7b3..11eb0fb5ef1a 100644 --- a/sal/inc/cppunittester/protectorfactory.hxx +++ b/sal/inc/cppunittester/protectorfactory.hxx @@ -29,11 +29,7 @@ #ifndef INCLUDED_CPPUNITTESTER_PROTECTORFACTORY_HXX #define INCLUDED_CPPUNITTESTER_PROTECTORFACTORY_HXX -#include "sal/config.h" -#include "sal/precppunit.hxx" - -#include "sal/types.h" - +#include <sal/types.h> #include <cppunit/Protector.h> namespace cppunittester diff --git a/sal/inc/sal/precppunit.hxx b/sal/inc/sal/precppunit.hxx deleted file mode 100644 index 55b0bcce78a8..000000000000 --- a/sal/inc/sal/precppunit.hxx +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2011 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -#ifndef INCLUDED_SAL_PRECPPUNIT_HXX -#define INCLUDED_SAL_PRECPPUNIT_HXX - -#include "sal/config.h" -#include "sal/types.h" - -// Overwrite the way CppUnit test plug-ins export the test function, adapting it -// to OOo's symbol visibility framework: -#define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT - -//std::auto_ptr is deprecated in c++0x, but we're stuck with them in cppunit -//So push and pop -Wdeprecated-declarations for gcc -#define SAL_CPPUNIT_TEST_SUITE(X) \ -SAL_WNODEPRECATED_DECLARATIONS_PUSH \ -CPPUNIT_TEST_SUITE(X) - -#define SAL_CPPUNIT_TEST_SUITE_END() \ -CPPUNIT_TEST_SUITE_END() \ -; \ -SAL_WNODEPRECATED_DECLARATIONS_POP \ -typedef int SalCppUnitDummyTypedefForSemiColonEnding__ \ - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx index 1ddfad74f060..9eef3b6930b7 100644 --- a/sal/qa/ByteSequence/ByteSequence.cxx +++ b/sal/qa/ByteSequence/ByteSequence.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 46b78144572d..05a457f86007 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <rtl/string.hxx> #include <rtl_String_Const.h> #include <rtl_String_Utils.hxx> @@ -165,7 +163,7 @@ namespace rtl_OStringBuffer ); } - SAL_CPPUNIT_TEST_SUITE(ctors); + CPPUNIT_TEST_SUITE(ctors); CPPUNIT_TEST(ctor_001); CPPUNIT_TEST(ctor_002); CPPUNIT_TEST(ctor_003); @@ -173,7 +171,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST(ctor_004); CPPUNIT_TEST(ctor_005); CPPUNIT_TEST(ctor_006); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -323,7 +321,7 @@ namespace rtl_OStringBuffer ); } - SAL_CPPUNIT_TEST_SUITE(makeStringAndClear); + CPPUNIT_TEST_SUITE(makeStringAndClear); CPPUNIT_TEST(makeStringAndClear_001); CPPUNIT_TEST(makeStringAndClear_002); CPPUNIT_TEST(makeStringAndClear_003); @@ -332,7 +330,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST(makeStringAndClear_006); CPPUNIT_TEST(makeStringAndClear_007); CPPUNIT_TEST(makeStringAndClear_008); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; @@ -376,9 +374,9 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT(sb.toString().isEmpty()); } - SAL_CPPUNIT_TEST_SUITE(remove); + CPPUNIT_TEST_SUITE(remove); CPPUNIT_TEST(remove_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; @@ -503,7 +501,7 @@ namespace rtl_OStringBuffer ); } - SAL_CPPUNIT_TEST_SUITE( getLength ); + CPPUNIT_TEST_SUITE( getLength ); CPPUNIT_TEST( getLength_001 ); CPPUNIT_TEST( getLength_002 ); CPPUNIT_TEST( getLength_003 ); @@ -512,7 +510,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( getLength_006 ); CPPUNIT_TEST( getLength_007 ); CPPUNIT_TEST( getLength_008 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -684,7 +682,7 @@ namespace rtl_OStringBuffer ); } - SAL_CPPUNIT_TEST_SUITE( getCapacity ); + CPPUNIT_TEST_SUITE( getCapacity ); CPPUNIT_TEST( getCapacity_001 ); CPPUNIT_TEST( getCapacity_002 ); CPPUNIT_TEST( getCapacity_003 ); @@ -697,7 +695,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( getCapacity_011 ); CPPUNIT_TEST( getCapacity_012 ); CPPUNIT_TEST( getCapacity_013 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -959,7 +957,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( ensureCapacity ); + CPPUNIT_TEST_SUITE( ensureCapacity ); CPPUNIT_TEST( ensureCapacity_001 ); CPPUNIT_TEST( ensureCapacity_002 ); CPPUNIT_TEST( ensureCapacity_003 ); @@ -976,7 +974,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( ensureCapacity_020 ); CPPUNIT_TEST( ensureCapacity_021 ); CPPUNIT_TEST( ensureCapacity_022 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -1443,7 +1441,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( setLength ); + CPPUNIT_TEST_SUITE( setLength ); CPPUNIT_TEST( setLength_001 ); CPPUNIT_TEST( setLength_002 ); CPPUNIT_TEST( setLength_003 ); @@ -1466,7 +1464,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( setLength_020 ); CPPUNIT_TEST( setLength_021 ); CPPUNIT_TEST( setLength_022 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -1509,10 +1507,10 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( csuc ); + CPPUNIT_TEST_SUITE( csuc ); CPPUNIT_TEST( csuc_001 ); CPPUNIT_TEST( csuc_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -1555,10 +1553,10 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( getStr ); + CPPUNIT_TEST_SUITE( getStr ); CPPUNIT_TEST( getStr_001 ); CPPUNIT_TEST( getStr_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -1964,7 +1962,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_001 ); + CPPUNIT_TEST_SUITE( append_001 ); CPPUNIT_TEST( append_001_001 ); CPPUNIT_TEST( append_001_002 ); CPPUNIT_TEST( append_001_003 ); @@ -1989,7 +1987,7 @@ namespace rtl_OStringBuffer #ifdef WITH_CORE CPPUNIT_TEST( append_001_021 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -2353,7 +2351,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_002 ); + CPPUNIT_TEST_SUITE( append_002 ); CPPUNIT_TEST( append_002_001 ); CPPUNIT_TEST( append_002_002 ); CPPUNIT_TEST( append_002_003 ); @@ -2377,7 +2375,7 @@ namespace rtl_OStringBuffer #ifdef WITH_CORE CPPUNIT_TEST( append_002_021 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- @@ -2742,7 +2740,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_003 ); + CPPUNIT_TEST_SUITE( append_003 ); CPPUNIT_TEST( append_003_001 ); CPPUNIT_TEST( append_003_002 ); CPPUNIT_TEST( append_003_003 ); @@ -2763,7 +2761,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_003_022 ); CPPUNIT_TEST( append_003_023 ); CPPUNIT_TEST( append_003_024 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //----------------------------------------------------------------------------- @@ -2982,7 +2980,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_004 ); + CPPUNIT_TEST_SUITE( append_004 ); CPPUNIT_TEST( append_004_001 ); CPPUNIT_TEST( append_004_002 ); CPPUNIT_TEST( append_004_003 ); @@ -2997,7 +2995,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_004_011 ); CPPUNIT_TEST( append_004_012 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append(sal_Char c) @@ -3217,7 +3215,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_005 ); + CPPUNIT_TEST_SUITE( append_005 ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); @@ -3232,7 +3230,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_011 ); CPPUNIT_TEST( append_012 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; class append_006_Int32 : public CppUnit::TestFixture @@ -5156,7 +5154,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_006_Int32 ); + CPPUNIT_TEST_SUITE( append_006_Int32 ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); CPPUNIT_TEST( append_004 ); CPPUNIT_TEST( append_005 ); CPPUNIT_TEST( append_006 ); @@ -5207,7 +5205,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_095 ); CPPUNIT_TEST( append_096 ); CPPUNIT_TEST( append_097 ); CPPUNIT_TEST( append_098 ); CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( sal_Int32 i, sal_Int16 radix=2 ) @@ -6192,7 +6190,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_006_Int32_Bounderies ); + CPPUNIT_TEST_SUITE( append_006_Int32_Bounderies ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); CPPUNIT_TEST( append_004 ); CPPUNIT_TEST( append_005 ); CPPUNIT_TEST( append_006 ); @@ -6218,7 +6216,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_045 ); CPPUNIT_TEST( append_046 ); CPPUNIT_TEST( append_047 ); CPPUNIT_TEST( append_048 ); CPPUNIT_TEST( append_049 ); CPPUNIT_TEST( append_050 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( sal_Int32 i, sal_Int16 radix=2 ) @@ -8228,7 +8226,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_006_Int32_Negative ); + CPPUNIT_TEST_SUITE( append_006_Int32_Negative ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); CPPUNIT_TEST( append_004 ); CPPUNIT_TEST( append_005 ); CPPUNIT_TEST( append_006 ); @@ -8279,7 +8277,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_095 ); CPPUNIT_TEST( append_096 ); CPPUNIT_TEST( append_097 ); CPPUNIT_TEST( append_098 ); CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( sal_Int32 i, sal_Int16 radix ) where radix = -5 @@ -8398,7 +8396,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_006_Int32_WrongRadix ); + CPPUNIT_TEST_SUITE( append_006_Int32_WrongRadix ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); @@ -8407,7 +8405,7 @@ namespace rtl_OStringBuffer #ifdef WITH_CORE CPPUNIT_TEST( append_006 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ class append_006_Int32_defaultParam : public CppUnit::TestFixture @@ -8942,7 +8940,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_006_Int32_defaultParam ); + CPPUNIT_TEST_SUITE( append_006_Int32_defaultParam ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); @@ -8975,7 +8973,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_029 ); CPPUNIT_TEST( append_030 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( sal_Int64 l, sal_Int16 radix=2 ) @@ -10905,7 +10903,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_007_Int64 ); + CPPUNIT_TEST_SUITE( append_007_Int64 ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); CPPUNIT_TEST( append_004 ); CPPUNIT_TEST( append_005 ); CPPUNIT_TEST( append_006 ); @@ -10956,7 +10954,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_095 ); CPPUNIT_TEST( append_096 ); CPPUNIT_TEST( append_097 ); CPPUNIT_TEST( append_098 ); CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( sal_Int64 i, sal_Int16 radix=2 ) @@ -11941,7 +11939,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_007_Int64_Bounderies ); + CPPUNIT_TEST_SUITE( append_007_Int64_Bounderies ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); CPPUNIT_TEST( append_004 ); CPPUNIT_TEST( append_005 ); CPPUNIT_TEST( append_006 ); @@ -11967,7 +11965,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_045 ); CPPUNIT_TEST( append_046 ); CPPUNIT_TEST( append_047 ); CPPUNIT_TEST( append_048 ); CPPUNIT_TEST( append_049 ); CPPUNIT_TEST( append_050 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( sal_Int64 i, sal_Int16 radix=2 ) @@ -13977,7 +13975,7 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_007_Int64_Negative ); + CPPUNIT_TEST_SUITE( append_007_Int64_Negative ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); CPPUNIT_TEST( append_004 ); CPPUNIT_TEST( append_005 ); CPPUNIT_TEST( append_006 ); @@ -14028,7 +14026,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_095 ); CPPUNIT_TEST( append_096 ); CPPUNIT_TEST( append_097 ); CPPUNIT_TEST( append_098 ); CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( sal_Int64 i, sal_Int16 radix ) where radix = -5 @@ -14147,7 +14145,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_007_Int64_WrongRadix ); + CPPUNIT_TEST_SUITE( append_007_Int64_WrongRadix ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); @@ -14156,7 +14154,7 @@ namespace rtl_OStringBuffer #ifdef WITH_CORE CPPUNIT_TEST( append_006 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ class append_007_Int64_defaultParam : public CppUnit::TestFixture @@ -14686,7 +14684,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_007_Int64_defaultParam ); + CPPUNIT_TEST_SUITE( append_007_Int64_defaultParam ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); @@ -14719,7 +14717,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_029 ); CPPUNIT_TEST( append_030 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( float f ) @@ -15440,7 +15438,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_008_float ); + CPPUNIT_TEST_SUITE( append_008_float ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); @@ -15473,7 +15471,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_029 ); CPPUNIT_TEST( append_030 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( float f ) for negative value @@ -16172,7 +16170,7 @@ namespace rtl_OStringBuffer } #endif - SAL_CPPUNIT_TEST_SUITE( append_008_Float_Negative ); + CPPUNIT_TEST_SUITE( append_008_Float_Negative ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_002 ); CPPUNIT_TEST( append_003 ); @@ -16205,7 +16203,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_029 ); CPPUNIT_TEST( append_030 ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ // testing the method append( double d ) @@ -16282,10 +16280,10 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_009_double ); + CPPUNIT_TEST_SUITE( append_009_double ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_035 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //------------------------------------------------------------------------ @@ -16344,10 +16342,10 @@ namespace rtl_OStringBuffer } - SAL_CPPUNIT_TEST_SUITE( append_009_Double_Negative ); + CPPUNIT_TEST_SUITE( append_009_Double_Negative ); CPPUNIT_TEST( append_001 ); CPPUNIT_TEST( append_035 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; } // namespace rtl_OStringBuffer diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx index fc8803e3f0c1..d677d2b1b4f2 100644 --- a/sal/qa/osl/condition/osl_Condition.cxx +++ b/sal/qa/osl/condition/osl_Condition.cxx @@ -136,10 +136,10 @@ namespace osl_Condition sal_True == bRes ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST( ctors_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class ctors @@ -181,10 +181,10 @@ namespace osl_Condition } - SAL_CPPUNIT_TEST_SUITE( set ); + CPPUNIT_TEST_SUITE( set ); CPPUNIT_TEST( set_001 ); CPPUNIT_TEST( set_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class set @@ -226,10 +226,10 @@ namespace osl_Condition ( sal_False == bRes && sal_True == bRes1 ) ); } - SAL_CPPUNIT_TEST_SUITE( reset ); + CPPUNIT_TEST_SUITE( reset ); CPPUNIT_TEST( reset_001 ); CPPUNIT_TEST( reset_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class reset @@ -294,10 +294,10 @@ namespace osl_Condition ( ::osl::Condition::result_ok == wRes1 ) ); } - SAL_CPPUNIT_TEST_SUITE( wait ); + CPPUNIT_TEST_SUITE( wait ); CPPUNIT_TEST( wait_001 ); CPPUNIT_TEST( wait_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class wait @@ -341,10 +341,10 @@ namespace osl_Condition ( sal_True == bRes && sal_False == bRes1 ) ); } - SAL_CPPUNIT_TEST_SUITE( check ); + CPPUNIT_TEST_SUITE( check ); CPPUNIT_TEST( check_001 ); CPPUNIT_TEST( check_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class check diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index e4c788723ac3..e000e7c415a0 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -29,9 +29,6 @@ #ifndef _OSL_CONDITION_CONST_H_ #define _OSL_CONDITION_CONST_H_ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 8e5fd668551f..dff2840fc80e 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_osl_File #endif @@ -715,7 +712,7 @@ namespace osl_FileBase void getAbsoluteFileURL_003(); void getAbsoluteFileURL_004(); - SAL_CPPUNIT_TEST_SUITE( getAbsoluteFileURL ); + CPPUNIT_TEST_SUITE( getAbsoluteFileURL ); CPPUNIT_TEST( getAbsoluteFileURL_001_1 ); CPPUNIT_TEST( getAbsoluteFileURL_001_2 ); CPPUNIT_TEST( getAbsoluteFileURL_001_3 ); @@ -727,7 +724,7 @@ namespace osl_FileBase CPPUNIT_TEST( getAbsoluteFileURL_002 ); CPPUNIT_TEST( getAbsoluteFileURL_003 ); CPPUNIT_TEST( getAbsoluteFileURL_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //class getAbsoluteFileURL @@ -894,7 +891,7 @@ namespace osl_FileBase void getFileURLFromSystemPath_004(); void getFileURLFromSystemPath_005(); - SAL_CPPUNIT_TEST_SUITE( SystemPath_FileURL ); + CPPUNIT_TEST_SUITE( SystemPath_FileURL ); CPPUNIT_TEST( getSystemPathFromFileURL_001_1 ); CPPUNIT_TEST( getSystemPathFromFileURL_001_2 ); CPPUNIT_TEST( getSystemPathFromFileURL_001_21 ); @@ -923,7 +920,7 @@ namespace osl_FileBase CPPUNIT_TEST( getFileURLFromSystemPath_003 ); CPPUNIT_TEST( getFileURLFromSystemPath_004 ); CPPUNIT_TEST( getFileURLFromSystemPath_005 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class SystemPath_FileURL @@ -1323,13 +1320,13 @@ namespace osl_FileBase ( sal_True == bOk ) ); } - SAL_CPPUNIT_TEST_SUITE( searchFileURL ); + CPPUNIT_TEST_SUITE( searchFileURL ); CPPUNIT_TEST( searchFileURL_001 ); CPPUNIT_TEST( searchFileURL_002 ); CPPUNIT_TEST( searchFileURL_003 ); CPPUNIT_TEST( searchFileURL_004 ); CPPUNIT_TEST( searchFileURL_005 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class searchFileURL @@ -1370,10 +1367,10 @@ namespace osl_FileBase checkDirectory( aUStr,osl_Check_Mode_WriteAccess ) ); } - SAL_CPPUNIT_TEST_SUITE( getTempDirURL ); + CPPUNIT_TEST_SUITE( getTempDirURL ); CPPUNIT_TEST( getTempDirURL_001 ); CPPUNIT_TEST( getTempDirURL_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getTempDirURL @@ -1471,12 +1468,12 @@ namespace osl_FileBase } - SAL_CPPUNIT_TEST_SUITE( createTempFile ); + CPPUNIT_TEST_SUITE( createTempFile ); CPPUNIT_TEST( createTempFile_001 ); CPPUNIT_TEST( createTempFile_002 ); CPPUNIT_TEST( createTempFile_003 ); CPPUNIT_TEST( createTempFile_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class createTempFile // ----------------------------------------------------------------------------- @@ -1583,11 +1580,11 @@ namespace osl_VolumeInfo sal_True == compareFileName( aUStr, aNullURL ) ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST( ctors_002 ); CPPUNIT_TEST( ctors_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class ctors @@ -1662,11 +1659,11 @@ namespace osl_VolumeInfo ( sal_True == bOk1 ) && ( sal_True == bOk2 ) ); } - SAL_CPPUNIT_TEST_SUITE( isValid ); + CPPUNIT_TEST_SUITE( isValid ); CPPUNIT_TEST( isValid_001 ); CPPUNIT_TEST( isValid_002 ); CPPUNIT_TEST( isValid_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class isValid //--------------------------------------------------------------------- @@ -1713,10 +1710,10 @@ namespace osl_VolumeInfo } #endif - SAL_CPPUNIT_TEST_SUITE( getRemoteFlag ); + CPPUNIT_TEST_SUITE( getRemoteFlag ); CPPUNIT_TEST( getRemoteFlag_001 ); CPPUNIT_TEST( getRemoteFlag_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getRemoteFlag //--------------------------------------------------------------------- @@ -1752,10 +1749,10 @@ namespace osl_VolumeInfo CPPUNIT_ASSERT_MESSAGE( "test for getRemoveableFlag function: get a volume device which is removable, not sure, here we use floppy disk, but it did not pass.", sal_True == bOk ); } - SAL_CPPUNIT_TEST_SUITE( getRemoveableFlag ); + CPPUNIT_TEST_SUITE( getRemoveableFlag ); CPPUNIT_TEST( getRemoveableFlag_001 ); CPPUNIT_TEST( getRemoveableFlag_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getRemoveableFlag @@ -1792,10 +1789,10 @@ namespace osl_VolumeInfo CPPUNIT_ASSERT_MESSAGE( "test for getCompactDiscFlag function: get a cdrom volume device flag, it did not pass.", ( sal_True == bOk ) ); } - SAL_CPPUNIT_TEST_SUITE( getCompactDiscFlag ); + CPPUNIT_TEST_SUITE( getCompactDiscFlag ); CPPUNIT_TEST( getCompactDiscFlag_001 ); CPPUNIT_TEST( getCompactDiscFlag_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getCompactDiscFlag @@ -1832,10 +1829,10 @@ namespace osl_VolumeInfo CPPUNIT_ASSERT_MESSAGE( "test for getFloppyDiskFlag function: get a floppy volume device flag, it did not pass.", ( sal_True == bOk ) ); } - SAL_CPPUNIT_TEST_SUITE( getFloppyDiskFlag ); + CPPUNIT_TEST_SUITE( getFloppyDiskFlag ); CPPUNIT_TEST( getFloppyDiskFlag_001 ); CPPUNIT_TEST( getFloppyDiskFlag_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFloppyDiskFlag @@ -1872,10 +1869,10 @@ namespace osl_VolumeInfo CPPUNIT_ASSERT_MESSAGE( "test for getFixedDiskFlag function: get a fixed disk volume device flag, it did not pass.", ( sal_True == bOk ) ); } - SAL_CPPUNIT_TEST_SUITE( getFixedDiskFlag ); + CPPUNIT_TEST_SUITE( getFixedDiskFlag ); CPPUNIT_TEST( getFixedDiskFlag_001 ); CPPUNIT_TEST( getFixedDiskFlag_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFixedDiskFlag //--------------------------------------------------------------------- @@ -1911,10 +1908,10 @@ namespace osl_VolumeInfo CPPUNIT_ASSERT_MESSAGE( "test for getRAMDiskFlag function: FIX ME, don't know how to get a RAM disk flag, perhaps Windows 98 boot disk can create a RAM disk, it did not pass in (UNX)(W32).", ( sal_True == bOk ) ); } - SAL_CPPUNIT_TEST_SUITE( getRAMDiskFlag ); + CPPUNIT_TEST_SUITE( getRAMDiskFlag ); CPPUNIT_TEST( getRAMDiskFlag_001 ); CPPUNIT_TEST( getRAMDiskFlag_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getRAMDiskFlag @@ -1992,11 +1989,11 @@ namespace osl_VolumeInfo } #endif - SAL_CPPUNIT_TEST_SUITE( getTotalSpace ); + CPPUNIT_TEST_SUITE( getTotalSpace ); CPPUNIT_TEST( getTotalSpace_001 ); CPPUNIT_TEST( getTotalSpace_002 ); CPPUNIT_TEST( getTotalSpace_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getTotalSpace //--------------------------------------------------------------------- @@ -2073,11 +2070,11 @@ namespace osl_VolumeInfo #endif - SAL_CPPUNIT_TEST_SUITE( getFreeSpace ); + CPPUNIT_TEST_SUITE( getFreeSpace ); CPPUNIT_TEST( getFreeSpace_001 ); CPPUNIT_TEST( getFreeSpace_002 ); CPPUNIT_TEST( getFreeSpace_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFreeSpace //--------------------------------------------------------------------- @@ -2155,11 +2152,11 @@ namespace osl_VolumeInfo #endif - SAL_CPPUNIT_TEST_SUITE( getUsedSpace ); + CPPUNIT_TEST_SUITE( getUsedSpace ); CPPUNIT_TEST( getUsedSpace_001 ); CPPUNIT_TEST( getUsedSpace_002 ); CPPUNIT_TEST( getUsedSpace_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getUsedSpace @@ -2215,10 +2212,10 @@ namespace osl_VolumeInfo } #endif - SAL_CPPUNIT_TEST_SUITE( getMaxNameLength ); + CPPUNIT_TEST_SUITE( getMaxNameLength ); CPPUNIT_TEST( getMaxNameLength_001 ); CPPUNIT_TEST( getMaxNameLength_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getMaxNameLength @@ -2268,10 +2265,10 @@ namespace osl_VolumeInfo #endif - SAL_CPPUNIT_TEST_SUITE( getMaxPathLength ); + CPPUNIT_TEST_SUITE( getMaxPathLength ); CPPUNIT_TEST( getMaxPathLength_001 ); CPPUNIT_TEST( getMaxPathLength_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getMaxPathLength @@ -2329,10 +2326,10 @@ namespace osl_VolumeInfo #endif - SAL_CPPUNIT_TEST_SUITE( getFileSystemName ); + CPPUNIT_TEST_SUITE( getFileSystemName ); CPPUNIT_TEST( getFileSystemName_001 ); CPPUNIT_TEST( getFileSystemName_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFileSystemName //--------------------------------------------------------------------- @@ -2359,9 +2356,9 @@ namespace osl_VolumeInfo ( sal_False == bOk ) ); } - SAL_CPPUNIT_TEST_SUITE( getDeviceHandle ); + CPPUNIT_TEST_SUITE( getDeviceHandle ); CPPUNIT_TEST( getDeviceHandle_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getDeviceHandle @@ -2455,10 +2452,10 @@ namespace osl_FileStatus sal_True == compareFileName( aUStr, aNullURL) ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST( ctors_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class ctors @@ -2656,12 +2653,12 @@ namespace osl_FileStatus } - SAL_CPPUNIT_TEST_SUITE( isValid ); + CPPUNIT_TEST_SUITE( isValid ); CPPUNIT_TEST( isValid_001 ); CPPUNIT_TEST( isValid_002 ); CPPUNIT_TEST( isValid_003 ); CPPUNIT_TEST( isValid_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class ctors @@ -2787,12 +2784,12 @@ namespace osl_FileStatus #endif } - SAL_CPPUNIT_TEST_SUITE( getFileType ); + CPPUNIT_TEST_SUITE( getFileType ); CPPUNIT_TEST( getFileType_001 ); CPPUNIT_TEST( getFileType_002 ); CPPUNIT_TEST( getFileType_003 ); CPPUNIT_TEST( getFileType_007 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFileType //--------------------------------------------------------------------- @@ -2916,12 +2913,12 @@ namespace osl_FileStatus } #endif - SAL_CPPUNIT_TEST_SUITE( getAttributes ); + CPPUNIT_TEST_SUITE( getAttributes ); CPPUNIT_TEST( getAttributes_001 ); CPPUNIT_TEST( getAttributes_002 ); CPPUNIT_TEST( getAttributes_003 ); CPPUNIT_TEST( getAttributes_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getAttributes //--------------------------------------------------------------------- @@ -2974,9 +2971,9 @@ namespace osl_FileStatus sal_True == bOK ); } - SAL_CPPUNIT_TEST_SUITE( getAccessTime ); + CPPUNIT_TEST_SUITE( getAccessTime ); CPPUNIT_TEST( getAccessTime_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getAccessTime //--------------------------------------------------------------------- @@ -3027,9 +3024,9 @@ namespace osl_FileStatus sal_True == bOK ); } - SAL_CPPUNIT_TEST_SUITE( getModifyTime ); + CPPUNIT_TEST_SUITE( getModifyTime ); CPPUNIT_TEST( getModifyTime_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getModifyTime @@ -3090,10 +3087,10 @@ namespace osl_FileStatus CPPUNIT_ASSERT_MESSAGE( "test for getFileSize function: file with size of TEST_FILE_SIZE, did not pass in (W32). ", TEST_FILE_SIZE == uFileSize ); } - SAL_CPPUNIT_TEST_SUITE( getFileSize ); + CPPUNIT_TEST_SUITE( getFileSize ); CPPUNIT_TEST( getFileSize_001 ); CPPUNIT_TEST( getFileSize_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFileSize //--------------------------------------------------------------------- @@ -3135,9 +3132,9 @@ namespace osl_FileStatus sal_True == compareFileName( aFileName, aTmpName2 ) ); } - SAL_CPPUNIT_TEST_SUITE( getFileName ); + CPPUNIT_TEST_SUITE( getFileName ); CPPUNIT_TEST( getFileName_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFileName //--------------------------------------------------------------------- @@ -3177,9 +3174,9 @@ namespace osl_FileStatus sal_True == compareFileName( aFileURL, aTmpName6 ) ); } - SAL_CPPUNIT_TEST_SUITE( getFileURL ); + CPPUNIT_TEST_SUITE( getFileURL ); CPPUNIT_TEST( getFileURL_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFileURL //--------------------------------------------------------------------- @@ -3247,9 +3244,9 @@ namespace osl_FileStatus } #endif - SAL_CPPUNIT_TEST_SUITE( getLinkTargetURL ); + CPPUNIT_TEST_SUITE( getLinkTargetURL ); CPPUNIT_TEST( getLinkTargetURL_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getLinkTargetURL // ----------------------------------------------------------------------------- @@ -3321,10 +3318,10 @@ namespace osl_File ( ::osl::FileBase::E_None == nError1 ) && ( ::osl::FileBase::E_None == nError2 ) ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST( ctors_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class ctors //--------------------------------------------------------------------- @@ -3438,14 +3435,14 @@ namespace osl_File ( 10 == nCount_read ) ); } - SAL_CPPUNIT_TEST_SUITE( open ); + CPPUNIT_TEST_SUITE( open ); CPPUNIT_TEST( open_001 ); CPPUNIT_TEST( open_002 ); CPPUNIT_TEST( open_003 ); CPPUNIT_TEST( open_004 ); CPPUNIT_TEST( open_005 ); CPPUNIT_TEST( open_006 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class open //--------------------------------------------------------------------- @@ -3502,10 +3499,10 @@ namespace osl_File ( ::osl::FileBase::E_None != nError3 ) ); } - SAL_CPPUNIT_TEST_SUITE( close ); + CPPUNIT_TEST_SUITE( close ); CPPUNIT_TEST( close_001 ); CPPUNIT_TEST( close_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class close @@ -3605,11 +3602,11 @@ namespace osl_File buffer_read[0] == pBuffer_Char[0] ); } - SAL_CPPUNIT_TEST_SUITE( setPos ); + CPPUNIT_TEST_SUITE( setPos ); CPPUNIT_TEST( setPos_001 ); CPPUNIT_TEST( setPos_002 ); CPPUNIT_TEST( setPos_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class setPos //--------------------------------------------------------------------- @@ -3671,9 +3668,9 @@ namespace osl_File 26 == nFilePointer ); } - SAL_CPPUNIT_TEST_SUITE( getPos ); + CPPUNIT_TEST_SUITE( getPos ); CPPUNIT_TEST( getPos_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getPos @@ -3764,10 +3761,10 @@ namespace osl_File CPPUNIT_ASSERT_MESSAGE( "test for isEndOfFile function: use isEndOfFile to move pointer step by step", sizeof( pBuffer_Char ) + 1 == nFilePointer ); } - SAL_CPPUNIT_TEST_SUITE( isEndOfFile ); + CPPUNIT_TEST_SUITE( isEndOfFile ); CPPUNIT_TEST( isEndOfFile_001 ); CPPUNIT_TEST( isEndOfFile_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class isEndOfFile @@ -3863,10 +3860,10 @@ namespace osl_File 10 == nFilePointer ); } - SAL_CPPUNIT_TEST_SUITE( setSize ); + CPPUNIT_TEST_SUITE( setSize ); CPPUNIT_TEST( setSize_001 ); CPPUNIT_TEST( setSize_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class setSize @@ -3952,10 +3949,10 @@ namespace osl_File ( 52 == nFilePointer ) && ( 26 == nCount_read ) && ( 0 == strncmp( buffer_read, &pBuffer_Char[26], 26 ) ) ); } - SAL_CPPUNIT_TEST_SUITE( read ); + CPPUNIT_TEST_SUITE( read ); CPPUNIT_TEST( read_001 ); CPPUNIT_TEST( read_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class read //--------------------------------------------------------------------- @@ -4012,9 +4009,9 @@ namespace osl_File ( 10 == nCount_write ) ); } - SAL_CPPUNIT_TEST_SUITE( write ); + CPPUNIT_TEST_SUITE( write ); CPPUNIT_TEST( write_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class write //--------------------------------------------------------------------- @@ -4120,13 +4117,13 @@ namespace osl_File CPPUNIT_ASSERT( aHash == rtl_str_hashCode( buffer ) ); } #endif - SAL_CPPUNIT_TEST_SUITE( readLine ); + CPPUNIT_TEST_SUITE( readLine ); CPPUNIT_TEST( readLine_001 ); CPPUNIT_TEST( readLine_002 ); #ifdef UNX CPPUNIT_TEST( readLine_android ); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class readLine //--------------------------------------------------------------------- @@ -4253,14 +4250,14 @@ namespace osl_File #endif } - SAL_CPPUNIT_TEST_SUITE( copy ); + CPPUNIT_TEST_SUITE( copy ); CPPUNIT_TEST( copy_001 ); CPPUNIT_TEST( copy_002 ); CPPUNIT_TEST( copy_003 ); CPPUNIT_TEST( copy_004 ); CPPUNIT_TEST( copy_005 ); CPPUNIT_TEST( copy_006 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class copy //--------------------------------------------------------------------- @@ -4410,7 +4407,7 @@ namespace osl_File ::osl::FileBase::E_None != nError1 ); } - SAL_CPPUNIT_TEST_SUITE( move ); + CPPUNIT_TEST_SUITE( move ); CPPUNIT_TEST( move_001 ); CPPUNIT_TEST( move_002 ); CPPUNIT_TEST( move_003 ); @@ -4420,7 +4417,7 @@ namespace osl_File CPPUNIT_TEST( move_007 ); // CPPUNIT_TEST( move_008 ); //CPPUNIT_TEST( move_009 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class move @@ -4500,12 +4497,12 @@ namespace osl_File ( ::osl::FileBase::E_ISDIR == nError1 ) || ( ::osl::FileBase::E_ACCES == nError1 )); } - SAL_CPPUNIT_TEST_SUITE( remove ); + CPPUNIT_TEST_SUITE( remove ); CPPUNIT_TEST( remove_001 ); CPPUNIT_TEST( remove_002 ); CPPUNIT_TEST( remove_003 ); CPPUNIT_TEST( remove_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class remove @@ -4593,10 +4590,10 @@ namespace osl_File #endif } - SAL_CPPUNIT_TEST_SUITE( setAttributes ); + CPPUNIT_TEST_SUITE( setAttributes ); CPPUNIT_TEST( setAttributes_001 ); CPPUNIT_TEST( setAttributes_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class setAttributes @@ -4682,9 +4679,9 @@ namespace osl_File free( pTV_modify ); } - SAL_CPPUNIT_TEST_SUITE( setTime ); + CPPUNIT_TEST_SUITE( setTime ); CPPUNIT_TEST( setTime_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class setTime //--------------------------------------------------------------------- @@ -4743,9 +4740,9 @@ namespace osl_File - SAL_CPPUNIT_TEST_SUITE( sync ); + CPPUNIT_TEST_SUITE( sync ); CPPUNIT_TEST( sync_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class setTime // ----------------------------------------------------------------------------- @@ -4812,9 +4809,9 @@ namespace osl_DirectoryItem ::osl::FileBase::E_None == nError1 ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class ctors //--------------------------------------------------------------------- @@ -4873,10 +4870,10 @@ namespace osl_DirectoryItem ( sal_True == compareFileName( rFileStatus.getFileName(), aTmpName2 ) ) ); } - SAL_CPPUNIT_TEST_SUITE( copy_assin_Ctors ); + CPPUNIT_TEST_SUITE( copy_assin_Ctors ); CPPUNIT_TEST( copy_assin_Ctors_001 ); CPPUNIT_TEST( copy_assin_Ctors_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class copy_assin_Ctors //--------------------------------------------------------------------- @@ -4921,10 +4918,10 @@ namespace osl_DirectoryItem ( sal_True == rItem.is() ) ); } - SAL_CPPUNIT_TEST_SUITE( is ); + CPPUNIT_TEST_SUITE( is ); CPPUNIT_TEST( is_001 ); CPPUNIT_TEST( is_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class is //--------------------------------------------------------------------- @@ -4986,11 +4983,11 @@ namespace osl_DirectoryItem FileBase::E_NOENT == nError1 ); } - SAL_CPPUNIT_TEST_SUITE( get ); + CPPUNIT_TEST_SUITE( get ); CPPUNIT_TEST( get_001 ); CPPUNIT_TEST( get_002 ); CPPUNIT_TEST( get_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class get //--------------------------------------------------------------------- @@ -5065,11 +5062,11 @@ namespace osl_DirectoryItem } - SAL_CPPUNIT_TEST_SUITE( getFileStatus ); + CPPUNIT_TEST_SUITE( getFileStatus ); CPPUNIT_TEST( getFileStatus_001 ); CPPUNIT_TEST( getFileStatus_002 ); CPPUNIT_TEST( getFileStatus_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getFileStatus @@ -5144,10 +5141,10 @@ namespace osl_Directory ( ::osl::FileBase::E_None == nError2 ) ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST( ctors_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class ctors //--------------------------------------------------------------------- @@ -5240,12 +5237,12 @@ namespace osl_Directory ( ::osl::FileBase::E_NOTDIR == nError1 ) || ( ::osl::FileBase::E_ACCES ) ); } - SAL_CPPUNIT_TEST_SUITE( open ); + CPPUNIT_TEST_SUITE( open ); CPPUNIT_TEST( open_001 ); CPPUNIT_TEST( open_002 ); CPPUNIT_TEST( open_003 ); CPPUNIT_TEST( open_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class open //--------------------------------------------------------------------- @@ -5299,10 +5296,10 @@ namespace osl_Directory !( sal_True == bOk ) ); } - SAL_CPPUNIT_TEST_SUITE( isOpen ); + CPPUNIT_TEST_SUITE( isOpen ); CPPUNIT_TEST( isOpen_001 ); CPPUNIT_TEST( isOpen_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class isOpen //--------------------------------------------------------------------- @@ -5355,10 +5352,10 @@ namespace osl_Directory } - SAL_CPPUNIT_TEST_SUITE( close ); + CPPUNIT_TEST_SUITE( close ); CPPUNIT_TEST( close_001 ); CPPUNIT_TEST( close_002 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class close //--------------------------------------------------------------------- @@ -5468,12 +5465,12 @@ namespace osl_Directory ( ::osl::FileBase::E_INVAL == nError1 ) ); } - SAL_CPPUNIT_TEST_SUITE( reset ); + CPPUNIT_TEST_SUITE( reset ); CPPUNIT_TEST( reset_001 ); CPPUNIT_TEST( reset_002 ); CPPUNIT_TEST( reset_003 ); CPPUNIT_TEST( reset_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class reset //--------------------------------------------------------------------- @@ -5639,12 +5636,12 @@ namespace osl_Directory #endif } - SAL_CPPUNIT_TEST_SUITE( getNextItem ); + CPPUNIT_TEST_SUITE( getNextItem ); CPPUNIT_TEST( getNextItem_001 ); CPPUNIT_TEST( getNextItem_002 ); CPPUNIT_TEST( getNextItem_003 ); CPPUNIT_TEST( getNextItem_004 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getNextItem //--------------------------------------------------------------------- @@ -5810,7 +5807,7 @@ namespace osl_Directory #endif } - SAL_CPPUNIT_TEST_SUITE( getVolumeInfo ); + CPPUNIT_TEST_SUITE( getVolumeInfo ); CPPUNIT_TEST( getVolumeInfo_001_1 ); CPPUNIT_TEST( getVolumeInfo_001_2 ); CPPUNIT_TEST( getVolumeInfo_001_3 ); @@ -5821,7 +5818,7 @@ namespace osl_Directory CPPUNIT_TEST( getVolumeInfo_001_8 ); CPPUNIT_TEST( getVolumeInfo_002 ); CPPUNIT_TEST( getVolumeInfo_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class getVolumeInfo @@ -5896,11 +5893,11 @@ namespace osl_Directory ( osl::FileBase::E_INVAL == nError1 ) ); } - SAL_CPPUNIT_TEST_SUITE( create ); + CPPUNIT_TEST_SUITE( create ); CPPUNIT_TEST( create_001 ); CPPUNIT_TEST( create_002 ); CPPUNIT_TEST( create_003 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class create //--------------------------------------------------------------------- @@ -5987,13 +5984,13 @@ namespace osl_Directory #endif } - SAL_CPPUNIT_TEST_SUITE( remove ); + CPPUNIT_TEST_SUITE( remove ); CPPUNIT_TEST( remove_001 ); CPPUNIT_TEST( remove_002 ); CPPUNIT_TEST( remove_003 ); CPPUNIT_TEST( remove_004 ); CPPUNIT_TEST( remove_005 ); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); };// class remove //######################################## @@ -6208,14 +6205,14 @@ namespace osl_Directory } #endif /* WNT */ - SAL_CPPUNIT_TEST_SUITE(createPath); + CPPUNIT_TEST_SUITE(createPath); CPPUNIT_TEST(with_relative_path); CPPUNIT_TEST(without_callback); CPPUNIT_TEST(with_callback); #ifdef WNT CPPUNIT_TEST(at_invalid_logical_drive); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class createPath diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index d8ab73a0e0d7..923fd4dc540d 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_old_test_file #endif diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 1e404059c95d..bd38cbeb539c 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -26,13 +26,11 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tcwf #endif +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx index c6853098250c..e346ebc7a2d1 100644 --- a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx +++ b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index 022e2e01b8c6..a0ab76d4166e 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -210,10 +210,10 @@ namespace osl_Module sal_True == bRes ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_none ); CPPUNIT_TEST( ctors_name_mode ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class ctors @@ -260,10 +260,10 @@ namespace osl_Module /* tester comments: another case is getFunctionSymbol_001*/ - SAL_CPPUNIT_TEST_SUITE( getUrlFromAddress ); + CPPUNIT_TEST_SUITE( getUrlFromAddress ); CPPUNIT_TEST( getUrlFromAddress_001 ); CPPUNIT_TEST( getUrlFromAddress_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getUrlFromAddress @@ -290,9 +290,9 @@ namespace osl_Module sal_True == bRes ); } - SAL_CPPUNIT_TEST_SUITE( load ); + CPPUNIT_TEST_SUITE( load ); CPPUNIT_TEST( load_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class load @@ -315,9 +315,9 @@ namespace osl_Module sal_True == bRes ); } - SAL_CPPUNIT_TEST_SUITE( unload ); + CPPUNIT_TEST_SUITE( unload ); CPPUNIT_TEST( unload_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class unload @@ -347,9 +347,9 @@ namespace osl_Module CPPUNIT_ASSERT_MESSAGE( "#test comment#: test if a module is a loaded module.", sal_False == bRes && sal_True == bRes1); } - SAL_CPPUNIT_TEST_SUITE( is ); + CPPUNIT_TEST_SUITE( is ); CPPUNIT_TEST( is_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class is @@ -377,9 +377,9 @@ namespace osl_Module #endif } - SAL_CPPUNIT_TEST_SUITE( getSymbol ); + CPPUNIT_TEST_SUITE( getSymbol ); CPPUNIT_TEST( getSymbol_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getSymbol @@ -427,10 +427,10 @@ namespace osl_Module #endif } - SAL_CPPUNIT_TEST_SUITE( optr_oslModule ); + CPPUNIT_TEST_SUITE( optr_oslModule ); CPPUNIT_TEST( optr_oslModule_001 ); CPPUNIT_TEST( optr_oslModule_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class optr_oslModule /** testing the methods: @@ -455,9 +455,9 @@ namespace osl_Module #endif } - SAL_CPPUNIT_TEST_SUITE( getFunctionSymbol ); + CPPUNIT_TEST_SUITE( getFunctionSymbol ); CPPUNIT_TEST( getFunctionSymbol_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getFunctionSymbol // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 599ee14b03d8..00de78d9d838 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -29,9 +29,6 @@ #ifndef _OSL_MODULE_CONST_H_ #define _OSL_MODULE_CONST_H_ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <sal/types.h> #include <rtl/ustring.hxx> #include <osl/module.hxx> diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index 745f35b84ee1..36c1091b63b7 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -29,9 +29,7 @@ //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" @@ -366,10 +364,10 @@ namespace osl_Mutex CPPUNIT_ASSERT_MESSAGE( "test Mutex ctor function: increase and decrease a number 3 times without interrupt.", bRes == sal_True ); } - SAL_CPPUNIT_TEST_SUITE( ctor ); + CPPUNIT_TEST_SUITE( ctor ); CPPUNIT_TEST( ctor_001 ); CPPUNIT_TEST( ctor_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class ctor @@ -423,10 +421,10 @@ namespace osl_Mutex } - SAL_CPPUNIT_TEST_SUITE( acquire ); + CPPUNIT_TEST_SUITE( acquire ); CPPUNIT_TEST( acquire_001 ); CPPUNIT_TEST( acquire_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class acquire @@ -463,9 +461,9 @@ namespace osl_Mutex bRes1 == sal_False && bRes2 == sal_True); } - SAL_CPPUNIT_TEST_SUITE(tryToAcquire); + CPPUNIT_TEST_SUITE(tryToAcquire); CPPUNIT_TEST(tryToAcquire_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class tryToAcquire /** Test of the osl::Mutex::release method @@ -505,10 +503,10 @@ namespace osl_Mutex { } - SAL_CPPUNIT_TEST_SUITE( release ); + CPPUNIT_TEST_SUITE( release ); CPPUNIT_TEST( release_001 ); CPPUNIT_TEST( release_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class release @@ -557,10 +555,10 @@ namespace osl_Mutex bRes == sal_True ); } - SAL_CPPUNIT_TEST_SUITE(getGlobalMutex); + CPPUNIT_TEST_SUITE(getGlobalMutex); CPPUNIT_TEST(getGlobalMutex_001); CPPUNIT_TEST(getGlobalMutex_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getGlobalMutex // ----------------------------------------------------------------------------- @@ -645,10 +643,10 @@ namespace osl_Guard bRes == sal_True); } - SAL_CPPUNIT_TEST_SUITE(ctor); + CPPUNIT_TEST_SUITE(ctor); CPPUNIT_TEST(ctor_001); CPPUNIT_TEST(ctor_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class ctor // ----------------------------------------------------------------------------- @@ -723,10 +721,10 @@ namespace osl_ClearableGuard bRes == sal_True ); } - SAL_CPPUNIT_TEST_SUITE(ctor); + CPPUNIT_TEST_SUITE(ctor); CPPUNIT_TEST(ctor_001); CPPUNIT_TEST(ctor_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class ctor class clear : public CppUnit::TestFixture @@ -786,10 +784,10 @@ namespace osl_ClearableGuard ( sal_True == bRes ) && ( sal_False == bRes1 ) ); } - SAL_CPPUNIT_TEST_SUITE( clear ); + CPPUNIT_TEST_SUITE( clear ); CPPUNIT_TEST( clear_001 ); CPPUNIT_TEST( clear_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class clear // ----------------------------------------------------------------------------- @@ -863,10 +861,10 @@ namespace osl_ResettableGuard } - SAL_CPPUNIT_TEST_SUITE(ctor); + CPPUNIT_TEST_SUITE(ctor); CPPUNIT_TEST(ctor_001); CPPUNIT_TEST(ctor_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class ctor class reset : public CppUnit::TestFixture @@ -910,12 +908,12 @@ namespace osl_ResettableGuard ( sal_False == bRes ) && ( sal_True == bRes1 ) ); } - SAL_CPPUNIT_TEST_SUITE(reset); + CPPUNIT_TEST_SUITE(reset); CPPUNIT_TEST(reset_001); #ifdef LINUX CPPUNIT_TEST(reset_002); #endif - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class reset // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 85982858c330..33780ddd31dc 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -30,9 +30,7 @@ // include files //------------------------------------------------------------------------ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" @@ -260,14 +258,14 @@ namespace osl_Pipe sal_True == bRes && sal_False == bRes1 ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_none ); CPPUNIT_TEST( ctors_name_option ); CPPUNIT_TEST( ctors_name_option_security ); CPPUNIT_TEST( ctors_copy ); CPPUNIT_TEST( ctors_no_acquire ); CPPUNIT_TEST( ctors_acquire ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class ctors @@ -306,12 +304,12 @@ namespace osl_Pipe CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid constructor.", sal_False == aPipe.is( ) ); } - SAL_CPPUNIT_TEST_SUITE( is ); + CPPUNIT_TEST_SUITE( is ); CPPUNIT_TEST( is_001 ); CPPUNIT_TEST( is_002 ); CPPUNIT_TEST( is_003 ); CPPUNIT_TEST( is_004 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class is @@ -388,13 +386,13 @@ namespace osl_Pipe sal_False == bRes ); } - SAL_CPPUNIT_TEST_SUITE( create ); + CPPUNIT_TEST_SUITE( create ); CPPUNIT_TEST( create_named_security_001 ); CPPUNIT_TEST( create_named_security_002 ); CPPUNIT_TEST( create_named_001 ); CPPUNIT_TEST( create_named_002 ); CPPUNIT_TEST( create_named_003 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class create @@ -417,9 +415,9 @@ namespace osl_Pipe sal_False == bRes ); } - SAL_CPPUNIT_TEST_SUITE( clear ); + CPPUNIT_TEST_SUITE( clear ); CPPUNIT_TEST( clear_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class clear @@ -460,10 +458,10 @@ namespace osl_Pipe sal_True == bRes && sal_True == bRes1 ); } - SAL_CPPUNIT_TEST_SUITE( assign ); + CPPUNIT_TEST_SUITE( assign ); CPPUNIT_TEST( assign_ref ); CPPUNIT_TEST( assign_handle ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class assign @@ -509,10 +507,10 @@ namespace osl_Pipe sal_True == bRes && sal_False == bRes1 ); } - SAL_CPPUNIT_TEST_SUITE( isEqual ); + CPPUNIT_TEST_SUITE( isEqual ); CPPUNIT_TEST( isEqual_001 ); CPPUNIT_TEST( isEqual_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class isEqual @@ -547,10 +545,10 @@ namespace osl_Pipe OSL_PIPE_FAIL == nRet ); } - SAL_CPPUNIT_TEST_SUITE( close ); + CPPUNIT_TEST_SUITE( close ); CPPUNIT_TEST( close_001 ); CPPUNIT_TEST( close_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class close @@ -591,10 +589,10 @@ namespace osl_Pipe nError != osl_Pipe_E_None ); } - SAL_CPPUNIT_TEST_SUITE( getError ); + CPPUNIT_TEST_SUITE( getError ); CPPUNIT_TEST( getError_001 ); CPPUNIT_TEST( getError_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getError @@ -628,10 +626,10 @@ namespace osl_Pipe sal_True == bRes ); } - SAL_CPPUNIT_TEST_SUITE( getHandle ); + CPPUNIT_TEST_SUITE( getHandle ); CPPUNIT_TEST( getHandle_001 ); CPPUNIT_TEST( getHandle_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getHandle @@ -763,14 +761,14 @@ namespace osl_StreamPipe sal_True == bRes ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_none ); CPPUNIT_TEST( ctors_handle ); CPPUNIT_TEST( ctors_copy ); CPPUNIT_TEST( ctors_name_option ); CPPUNIT_TEST( ctors_name_option_security ); CPPUNIT_TEST( ctors_no_acquire ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class ctors @@ -928,10 +926,10 @@ namespace osl_StreamPipe //no condition judgement here, if the case could finish excuting within 1 or 2 seconds, it passes. } - SAL_CPPUNIT_TEST_SUITE( recv ); + CPPUNIT_TEST_SUITE( recv ); CPPUNIT_TEST( recv_001 ); CPPUNIT_TEST( recv_002 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class recv // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 65b29432f510..f1262b31f248 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_Thread #endif @@ -567,10 +564,10 @@ namespace osl_Thread } - SAL_CPPUNIT_TEST_SUITE(create); + CPPUNIT_TEST_SUITE(create); CPPUNIT_TEST(create_001); CPPUNIT_TEST(create_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class create @@ -633,11 +630,11 @@ namespace osl_Thread ); } - SAL_CPPUNIT_TEST_SUITE(createSuspended); + CPPUNIT_TEST_SUITE(createSuspended); CPPUNIT_TEST(createSuspended_001); // LLA: Deadlocked!!! CPPUNIT_TEST(createSuspended_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class createSuspended /** when the count value equal to or more than 3, suspend the thread. @@ -743,11 +740,11 @@ namespace osl_Thread ); } - SAL_CPPUNIT_TEST_SUITE(suspend); + CPPUNIT_TEST_SUITE(suspend); CPPUNIT_TEST(suspend_001); // LLA: Deadlocked!!! // CPPUNIT_TEST(createSuspended_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class suspend /** Test of the osl::Thread::resume method @@ -829,10 +826,10 @@ namespace osl_Thread ); } - SAL_CPPUNIT_TEST_SUITE(resume); + CPPUNIT_TEST_SUITE(resume); CPPUNIT_TEST(resume_001); CPPUNIT_TEST(resume_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class resume /** Test of the osl::Thread::terminate method @@ -908,10 +905,10 @@ namespace osl_Thread nLaterValue > nValue ); } - SAL_CPPUNIT_TEST_SUITE(terminate); + CPPUNIT_TEST_SUITE(terminate); CPPUNIT_TEST(terminate_001); CPPUNIT_TEST(terminate_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class terminate /** Test of the osl::Thread::join method @@ -1000,10 +997,10 @@ namespace osl_Thread ); } - SAL_CPPUNIT_TEST_SUITE(join); + CPPUNIT_TEST_SUITE(join); CPPUNIT_TEST(join_001); CPPUNIT_TEST(join_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class join /** Test of the osl::Thread::isRunning method @@ -1071,10 +1068,10 @@ namespace osl_Thread } - SAL_CPPUNIT_TEST_SUITE(isRunning); + CPPUNIT_TEST_SUITE(isRunning); CPPUNIT_TEST(isRunning_001); CPPUNIT_TEST(isRunning_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class isRunning @@ -1522,7 +1519,7 @@ namespace osl_Thread } - SAL_CPPUNIT_TEST_SUITE(setPriority); + CPPUNIT_TEST_SUITE(setPriority); #ifndef SOLARIS CPPUNIT_TEST(setPriority_002); CPPUNIT_TEST(setPriority_003); @@ -1534,7 +1531,7 @@ namespace osl_Thread CPPUNIT_TEST(setPriority_001_3); CPPUNIT_TEST(setPriority_001_4); CPPUNIT_TEST(setPriority_001_5); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class setPriority /** Test of the osl::Thread::getPriority method @@ -1587,10 +1584,10 @@ namespace osl_Thread } - SAL_CPPUNIT_TEST_SUITE(getPriority); + CPPUNIT_TEST_SUITE(getPriority); CPPUNIT_TEST(getPriority_001); CPPUNIT_TEST(getPriority_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getPriority @@ -1617,10 +1614,10 @@ namespace osl_Thread } - SAL_CPPUNIT_TEST_SUITE(getIdentifier); + CPPUNIT_TEST_SUITE(getIdentifier); CPPUNIT_TEST(getIdentifier_001); CPPUNIT_TEST(getIdentifier_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getIdentifier /** Test of the osl::Thread::getCurrentIdentifier method @@ -1660,10 +1657,10 @@ namespace osl_Thread { } - SAL_CPPUNIT_TEST_SUITE(getCurrentIdentifier); + CPPUNIT_TEST_SUITE(getCurrentIdentifier); CPPUNIT_TEST(getCurrentIdentifier_001); //CPPUNIT_TEST(getCurrentIdentifier_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getCurrentIdentifier /** Test of the osl::Thread::wait method @@ -1727,9 +1724,9 @@ namespace osl_Thread } - SAL_CPPUNIT_TEST_SUITE(wait); + CPPUNIT_TEST_SUITE(wait); CPPUNIT_TEST(wait_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class wait /** osl::Thread::yield method: can not design good test scenario to test up to now @@ -1751,9 +1748,9 @@ namespace osl_Thread } - SAL_CPPUNIT_TEST_SUITE(yield); + CPPUNIT_TEST_SUITE(yield); CPPUNIT_TEST(yield_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class yield /** Test of the osl::Thread::schedule method @@ -1874,10 +1871,10 @@ namespace osl_Thread ); } - SAL_CPPUNIT_TEST_SUITE(schedule); + CPPUNIT_TEST_SUITE(schedule); CPPUNIT_TEST(schedule_001); CPPUNIT_TEST(schedule_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class schedule // ----------------------------------------------------------------------------- @@ -1994,9 +1991,9 @@ namespace osl_ThreadData } - SAL_CPPUNIT_TEST_SUITE(ctors); + CPPUNIT_TEST_SUITE(ctors); CPPUNIT_TEST(ctor_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class ctors @@ -2107,11 +2104,11 @@ namespace osl_ThreadData ); } - SAL_CPPUNIT_TEST_SUITE(setData); + CPPUNIT_TEST_SUITE(setData); CPPUNIT_TEST(setData_001); CPPUNIT_TEST(setData_002); CPPUNIT_TEST(setData_003); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class setData class getData : public CppUnit::TestFixture @@ -2191,10 +2188,10 @@ namespace osl_ThreadData } - SAL_CPPUNIT_TEST_SUITE(getData); + CPPUNIT_TEST_SUITE(getData); CPPUNIT_TEST(getData_001); CPPUNIT_TEST(getData_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getData // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 87bd664b8d38..3723c6af451c 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -26,13 +26,11 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_process #endif +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -302,12 +300,12 @@ public: osl_freeProcessHandle(process); } - SAL_CPPUNIT_TEST_SUITE(Test_osl_joinProcess); + CPPUNIT_TEST_SUITE(Test_osl_joinProcess); CPPUNIT_TEST(osl_joinProcessWithTimeout_timeout_failure); CPPUNIT_TEST(osl_joinProcessWithTimeout_without_timeout_failure); CPPUNIT_TEST(osl_joinProcessWithTimeout_infinite); CPPUNIT_TEST(osl_joinProcess); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //######################################################### @@ -738,7 +736,7 @@ public: osl_freeProcessHandle(process); } - SAL_CPPUNIT_TEST_SUITE(Test_osl_executeProcess); + CPPUNIT_TEST_SUITE(Test_osl_executeProcess); //TODO: Repair these under windows. #ifndef WNT CPPUNIT_TEST(osl_execProc_parent_equals_child_environment); @@ -747,7 +745,7 @@ public: CPPUNIT_TEST(osl_execProc_test_batch); ///TODO: Repair test (or tested function ;-) - test fails. // CPPUNIT_TEST(osl_execProc_exe_name_in_argument_list); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; //##################################### diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index 2e36b791c594..65bae6050577 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -26,13 +26,7 @@ * ************************************************************************/ -// LLA: -// this file is converted to use with testshl2 -// original was placed in sal/test/textenc.cxx - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 1c4f02979e04..2368de37be19 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - //------------------------------------------------------------------------ // header file //------------------------------------------------------------------------ @@ -92,9 +89,9 @@ namespace osl_Security aSec.getHandle( ) != NULL ); } - SAL_CPPUNIT_TEST_SUITE( ctors ); + CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class ctors @@ -129,7 +126,7 @@ namespace osl_Security } - SAL_CPPUNIT_TEST_SUITE( logonUser ); + CPPUNIT_TEST_SUITE( logonUser ); if ( !aStringForward.isEmpty() && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) == aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) /// if user name and passwd are forwarded { @@ -140,7 +137,7 @@ namespace osl_Security { CPPUNIT_TEST( logonUser_user_pwd_server ); } - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class logonUser @@ -169,9 +166,9 @@ namespace osl_Security CPPUNIT_ASSERT_MESSAGE( aMessage.getStr(), strUserID.equals(strID) && (bRes == sal_True)); } - SAL_CPPUNIT_TEST_SUITE( getUserIdent ); + CPPUNIT_TEST_SUITE( getUserIdent ); CPPUNIT_TEST( getUserIdent_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getUserIdent @@ -202,9 +199,9 @@ namespace osl_Security ( nPos >= 0 ) && ( sal_True == bRes ) ); } - SAL_CPPUNIT_TEST_SUITE( getUserName ); + CPPUNIT_TEST_SUITE( getUserName ); CPPUNIT_TEST( getUserName_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getUserName @@ -226,9 +223,9 @@ namespace osl_Security ( sal_True == bRes )); } - SAL_CPPUNIT_TEST_SUITE( getConfigDir ); + CPPUNIT_TEST_SUITE( getConfigDir ); CPPUNIT_TEST( getConfigDir_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getConfigDir /** testing the method: @@ -248,9 +245,9 @@ namespace osl_Security bRes == isAdmin ); } - SAL_CPPUNIT_TEST_SUITE( isAdministrator ); + CPPUNIT_TEST_SUITE( isAdministrator ); CPPUNIT_TEST( isAdministrator_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class isAdministrator /** testing the method: @@ -270,9 +267,9 @@ namespace osl_Security bRes == sal_True ); } - SAL_CPPUNIT_TEST_SUITE( getHandle ); + CPPUNIT_TEST_SUITE( getHandle ); CPPUNIT_TEST( getHandle_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class getHandle @@ -295,10 +292,10 @@ namespace osl_Security CPPUNIT_ASSERT_MESSAGE( "empty function.", sal_True ); } - SAL_CPPUNIT_TEST_SUITE( UserProfile ); + CPPUNIT_TEST_SUITE( UserProfile ); CPPUNIT_TEST( loadUserProfile ); CPPUNIT_TEST( unloadUserProfile ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class UserProfile class loginUserOnFileServer : public CppUnit::TestFixture @@ -318,9 +315,9 @@ namespace osl_Security CPPUNIT_ASSERT_MESSAGE( "empty function.", erg == osl_Security_E_UserUnknown ); } - SAL_CPPUNIT_TEST_SUITE( loginUserOnFileServer ); + CPPUNIT_TEST_SUITE( loginUserOnFileServer ); CPPUNIT_TEST( loginUserOnFileServer_001 ); - SAL_CPPUNIT_TEST_SUITE_END( ); + CPPUNIT_TEST_SUITE_END( ); }; // class loginUserOnFileServer // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 4eca51cef963..083cf9f5aea7 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -29,9 +29,6 @@ #ifndef _OSL_SECURITY_CONST_H_ #define _OSL_SECURITY_CONST_H_ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #if ( defined WNT ) // Windows #include <io.h> #endif diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx index 220b53a33b61..c6ebb2e7745d 100644 --- a/sal/qa/osl/setthreadname/test-setthreadname.cxx +++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx @@ -26,13 +26,11 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> +#include <sal/types.h> #include "boost/noncopyable.hpp" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index 2666b14b512d..aa95d5234240 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: @@ -59,6 +56,7 @@ // include files //------------------------------------------------------------------------ +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index 255013acc034..269452ea8651 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: @@ -59,6 +56,7 @@ // include files //------------------------------------------------------------------------ +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index b5979ebbd57e..ba0baa7ec860 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: @@ -55,6 +52,7 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 77a8515e9c4c..42c348393497 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: @@ -60,6 +57,7 @@ // include files //------------------------------------------------------------------------ +#include <sal/types.h> #include <osl_Socket_Const_orig.h> #include <cppunit/TestFixture.h> diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index ac3fcf5dc98b..1d96bce6e4cd 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: @@ -55,6 +52,7 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index daeae38b0dbf..05c8b2a8a0eb 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: @@ -55,6 +52,7 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx index 2ab647a131e1..e13dea7149f4 100644 --- a/sal/qa/osl/socket/osl_Socket_tests.cxx +++ b/sal/qa/osl/socket/osl_Socket_tests.cxx @@ -26,12 +26,10 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ +#include <sal/types.h> #include <osl_Socket_Const.h> #include <cppunit/TestFixture.h> diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index 876951bdf467..48142da69031 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform if you are not including ws2_32.lib in makefile.mk, the including format will be like this: @@ -55,6 +52,7 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 8f448e258d6e..a477f7ab247e 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "sockethelper.hxx" #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sal/qa/osl/thread/test_thread.cxx b/sal/qa/osl/thread/test_thread.cxx index 8d7b4b529909..c470e975bbfa 100644 --- a/sal/qa/osl/thread/test_thread.cxx +++ b/sal/qa/osl/thread/test_thread.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index e1c2b2aa074a..f0211556d596 100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -26,10 +26,8 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <rtl/alloc.h> +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -97,10 +95,10 @@ public: CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, nSize, 2) == true); } - SAL_CPPUNIT_TEST_SUITE(Memory); + CPPUNIT_TEST_SUITE(Memory); CPPUNIT_TEST(rtl_allocateMemory_001); CPPUNIT_TEST(rtl_reallocateMemory_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class test class ZeroMemory : public CppUnit::TestFixture @@ -140,9 +138,9 @@ public: CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3) == true); } - SAL_CPPUNIT_TEST_SUITE(ZeroMemory); + CPPUNIT_TEST_SUITE(ZeroMemory); CPPUNIT_TEST(rtl_allocateZeroMemory_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // ----------------------------------------------------------------------------- diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index a4d5bfb4c394..2b982e51e7f1 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -26,12 +26,9 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstring> +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -103,7 +100,7 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(create); + CPPUNIT_TEST_SUITE(create); CPPUNIT_TEST(create_001); CPPUNIT_TEST(create_002); CPPUNIT_TEST(create_003); @@ -112,7 +109,7 @@ public: CPPUNIT_TEST(create_006); CPPUNIT_TEST(create_007); CPPUNIT_TEST(create_008); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class create // ----------------------------------------------------------------------------- @@ -156,12 +153,12 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(createBF); + CPPUNIT_TEST_SUITE(createBF); CPPUNIT_TEST(createBF_001); CPPUNIT_TEST(createBF_002); CPPUNIT_TEST(createBF_003); CPPUNIT_TEST(createBF_004); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class createBF // ----------------------------------------------------------------------------- class decode : public CppUnit::TestFixture @@ -297,10 +294,10 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(decode); + CPPUNIT_TEST_SUITE(decode); CPPUNIT_TEST(decode_001); CPPUNIT_TEST(decode_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class decode // ----------------------------------------------------------------------------- class decodeBF : public CppUnit::TestFixture @@ -322,9 +319,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(decodeBF); + CPPUNIT_TEST_SUITE(decodeBF); CPPUNIT_TEST(decodeBF_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class decodeBF // ----------------------------------------------------------------------------- class destroy : public CppUnit::TestFixture @@ -349,9 +346,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(destroy); + CPPUNIT_TEST_SUITE(destroy); CPPUNIT_TEST(destroy_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class destroy // ----------------------------------------------------------------------------- class destroyBF : public CppUnit::TestFixture @@ -378,9 +375,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(destroyBF); + CPPUNIT_TEST_SUITE(destroyBF); CPPUNIT_TEST(destroyBF_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class destroyBF // ----------------------------------------------------------------------------- class encode : public CppUnit::TestFixture @@ -451,9 +448,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(encode); + CPPUNIT_TEST_SUITE(encode); CPPUNIT_TEST(encode_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class encode // ----------------------------------------------------------------------------- class encodeBF : public CppUnit::TestFixture @@ -475,9 +472,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(encodeBF); + CPPUNIT_TEST_SUITE(encodeBF); CPPUNIT_TEST(encodeBF_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class encodeBF // ----------------------------------------------------------------------------- class init : public CppUnit::TestFixture @@ -585,12 +582,12 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(init); + CPPUNIT_TEST_SUITE(init); CPPUNIT_TEST(init_001); CPPUNIT_TEST(init_002); CPPUNIT_TEST(init_003); CPPUNIT_TEST(init_004); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class init // ----------------------------------------------------------------------------- class initBF : public CppUnit::TestFixture @@ -614,9 +611,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(initBF); + CPPUNIT_TEST_SUITE(initBF); CPPUNIT_TEST(initBF_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class initBF // ----------------------------------------------------------------------------- diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index 22949cd2b463..590ebd92dee0 100644 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 7307d119d81a..a168d396cbac 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 646a22211639..dc642a96d04d 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 8d153b87ae1e..ae7bf2d6f17c 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <osl/thread.h> #include <rtl/locale.hxx> @@ -82,10 +79,10 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(getDefault); + CPPUNIT_TEST_SUITE(getDefault); CPPUNIT_TEST(getDefault_000); CPPUNIT_TEST(getDefault_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getDefault @@ -118,9 +115,9 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(setDefault); + CPPUNIT_TEST_SUITE(setDefault); CPPUNIT_TEST(setDefault_001); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class setDefault @@ -156,10 +153,10 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(getLanguage); + CPPUNIT_TEST_SUITE(getLanguage); CPPUNIT_TEST(getLanguage_001); CPPUNIT_TEST(getLanguage_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getLanguage @@ -195,10 +192,10 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(getCountry); + CPPUNIT_TEST_SUITE(getCountry); CPPUNIT_TEST(getCountry_001); CPPUNIT_TEST(getCountry_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getCountry @@ -234,10 +231,10 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(getVariant); + CPPUNIT_TEST_SUITE(getVariant); CPPUNIT_TEST(getVariant_001); CPPUNIT_TEST(getVariant_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class getVariant @@ -273,10 +270,10 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(hashCode); + CPPUNIT_TEST_SUITE(hashCode); CPPUNIT_TEST(hashCode_001); CPPUNIT_TEST(hashCode_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class hashCode @@ -319,10 +316,10 @@ public: // member functions of the current class, // because these macros are need by auto register mechanism. - SAL_CPPUNIT_TEST_SUITE(equals); + CPPUNIT_TEST_SUITE(equals); CPPUNIT_TEST(equals_001); CPPUNIT_TEST(equals_002); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; // class equals // ----------------------------------------------------------------------------- diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 0d539f3f0125..c2c4e238aba4 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -26,14 +26,6 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// LLA: -// this file is converted to use with testshl2 -// original was placed in sal/test/textenc.cxx - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -49,6 +41,7 @@ #include <tchar.h> #endif +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx index 32c65ba19900..38a7089b6613 100644 --- a/sal/qa/rtl/math/rtl_math.cxx +++ b/sal/qa/rtl/math/rtl_math.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef WIN32 // LLA: take a look into Microsofts math.h implementation, why this define is need #define _USE_MATH_DEFINES @@ -39,6 +35,7 @@ #include <rtl/math.h> #include <rtl/string.hxx> +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index cde5d3efa2f8..44a0c87e6e3a 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/qa/rtl/math/test_rtl_math.cxx b/sal/qa/rtl/math/test_rtl_math.cxx index 3848c01a115a..ed80ac8d5d35 100644 --- a/sal/qa/rtl/math/test_rtl_math.cxx +++ b/sal/qa/rtl/math/test_rtl_math.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx index 55491cbbbc64..2e9ff109a7bd 100644 --- a/sal/qa/rtl/ostring/rtl_OString2.cxx +++ b/sal/qa/rtl/ostring/rtl_OString2.cxx @@ -26,13 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - -// autogenerated file with codegen.pl -// There exist some more test code in sal/qa/rtl_strings/rtl_OString.cxx - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index f798e2719f67..13f0f9d0df4d 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index fcc46d4a6c6a..84313bd5963c 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx index 372bd4ebe013..58904f1b4f76 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx @@ -27,9 +27,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/TestAssert.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx index f101e0785515..325e9f7f8cc1 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/plugin/TestPlugIn.h> CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx index ae402bb0d911..3dbd6b9b2585 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/TestAssert.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx index 4dae52dce10e..a0632762a59d 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/TestAssert.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index add29b68c11f..ea96072afcfe 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -26,12 +26,9 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <algorithm> +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx index 3bed05ad97b0..0f06c3f35096 100644 --- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx @@ -33,9 +33,7 @@ bool rtl_string_unittest_invalid_conversion; bool rtl_string_unittest_const_literal_function; bool rtl_string_unittest_non_const_literal_function; -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include "rtl/string.h" diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx index aa271e447a2d..fe97845a81ba 100644 --- a/sal/qa/rtl/strings/test_oustring_compare.cxx +++ b/sal/qa/rtl/strings/test_oustring_compare.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include "rtl/string.h" diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx index ca86369993d6..b96685c29b02 100644 --- a/sal/qa/rtl/strings/test_oustring_convert.cxx +++ b/sal/qa/rtl/strings/test_oustring_convert.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include "rtl/strbuf.hxx" diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx index 63f2ff6d6fb5..0b565a5b9731 100644 --- a/sal/qa/rtl/strings/test_oustring_endswith.cxx +++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include "rtl/strbuf.hxx" diff --git a/sal/qa/rtl/strings/test_oustring_noadditional.cxx b/sal/qa/rtl/strings/test_oustring_noadditional.cxx index f101e0785515..325e9f7f8cc1 100644 --- a/sal/qa/rtl/strings/test_oustring_noadditional.cxx +++ b/sal/qa/rtl/strings/test_oustring_noadditional.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/plugin/TestPlugIn.h> CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx index 82e76ea14b70..84394b79a55f 100644 --- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx @@ -33,9 +33,7 @@ extern bool rtl_string_unittest_invalid_conversion; extern bool rtl_string_unittest_const_literal_function; extern bool rtl_string_unittest_non_const_literal_function; -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include "rtl/string.h" diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx b/sal/qa/rtl/strings/test_strings_replace.cxx index b2b54b581482..1e165e8d9159 100644 --- a/sal/qa/rtl/strings/test_strings_replace.cxx +++ b/sal/qa/rtl/strings/test_strings_replace.cxx @@ -26,12 +26,9 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <ostream> +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx index 38c6f92de437..a5f8b318c8e9 100644 --- a/sal/qa/sal/test_types.cxx +++ b/sal/qa/sal/test_types.cxx @@ -26,19 +26,15 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstddef> #include <stdio.h> // C99 snprintf not necessarily in <cstdio> #include <string.h> // wntmsci10 does not know <cstring> std::strcmp +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include "sal/types.h" - namespace { template< typename T > void testPrintf( diff --git a/sal/qa/static/sal_cppunittester_all.cxx b/sal/qa/static/sal_cppunittester_all.cxx index e6cfd5d2f652..35f9c4eed9ae 100644 --- a/sal/qa/static/sal_cppunittester_all.cxx +++ b/sal/qa/static/sal_cppunittester_all.cxx @@ -26,13 +26,11 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> #include <string> +#include <sal/types.h> #include "cppunittester/protectorfactory.hxx" #include "osl/module.h" #include "osl/module.hxx" diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx index 1e9e425f0a02..4aa46c79060c 100644 --- a/sal/workben/t_osl_getVolInfo.cxx +++ b/sal/workben/t_osl_getVolInfo.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/simpleheader.hxx> #include <osl/file.h> #include <rtl/ustring.hxx> diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx index 60914ee26ede..b716d9ccf97e 100644 --- a/sal/workben/t_osl_joinProcess.cxx +++ b/sal/workben/t_osl_joinProcess.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/simpleheader.hxx> #include <osl/process.h> #include <rtl/ustring.hxx> diff --git a/sax/qa/cppunit/sax_cppunittester_all.cxx b/sax/qa/cppunit/sax_cppunittester_all.cxx index 3e81161bbb3d..281ca9e1ccaa 100644 --- a/sax/qa/cppunit/sax_cppunittester_all.cxx +++ b/sax/qa/cppunit/sax_cppunittester_all.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index a8dad879555f..f39d29cc0346 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx index 196561344b61..b34e241d615f 100644 --- a/sd/qa/unit/uimpress.cxx +++ b/sd/qa/unit/uimpress.cxx @@ -26,9 +26,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 60a2c7e5c983..4be6541e7fc5 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - #define BASEGFX_STATICLIBRARY #ifdef SYSTEM_ZLIB diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index dcec3aed005f..5428eb8c52fb 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx index bd70ff307837..3b5e4567a412 100644 --- a/slideshow/test/slidetest.cxx +++ b/slideshow/test/slidetest.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index 5f3f3f0c5c85..270883f039c8 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx index 3473f0467079..dcac336bb54d 100644 --- a/slideshow/test/testview.cxx +++ b/slideshow/test/testview.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx index 2e88dddd83c6..b4eaefc604c2 100644 --- a/slideshow/test/views.cxx +++ b/slideshow/test/views.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index bc7e73a4a9aa..ab521c10f29d 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "boost/noncopyable.hpp" #include "com/sun/star/awt/AsyncCallback.hpp" #include "com/sun/star/awt/XCallback.hpp" diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index bc522be843b2..721b75132f81 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -112,6 +112,7 @@ $(call gb_LinkTarget_set_include,$(2),\ ) $(call gb_LinkTarget_add_defs,$(2), \ $(filter-out -I%,$(CPPUNIT_CFLAGS)) \ + -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' \ ) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index 4423133559e8..5e24fb04781c 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -26,9 +26,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> #include <cppunit/TestCase.h> diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index ba30ac62028b..bbea57bb0f26 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -27,9 +27,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index cfa1a28895cb..c3a643ef3a99 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/lang/XMultiComponentFactory.hpp" #include "com/sun/star/uno/Reference.hxx" diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index b46fed89d603..b051d1f58675 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -26,13 +26,11 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef WNT # undef ERROR #endif +#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 117c2db02d3c..07985fef2020 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cassert> #include <cstddef> diff --git a/svl/qa/unit/test_lngmisc.cxx b/svl/qa/unit/test_lngmisc.cxx index becce8988e4f..ab2f47093894 100644 --- a/svl/qa/unit/test_lngmisc.cxx +++ b/svl/qa/unit/test_lngmisc.cxx @@ -26,9 +26,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx index d9be7a284504..117c79a96623 100644 --- a/sw/qa/core/Test-BigPtrArray.cxx +++ b/sw/qa/core/Test-BigPtrArray.cxx @@ -26,8 +26,7 @@ * ************************************************************************/ -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" @@ -764,7 +763,7 @@ public: releaseBigPtrArrayContent(bparr); } - SAL_CPPUNIT_TEST_SUITE(BigPtrArrayUnittest); + CPPUNIT_TEST_SUITE(BigPtrArrayUnittest); CPPUNIT_TEST(test_ctor); CPPUNIT_TEST(test_insert_entries_at_front); CPPUNIT_TEST(test_insert_entries_in_the_middle); @@ -782,7 +781,7 @@ public: CPPUNIT_TEST(test_for_some1); CPPUNIT_TEST(test_for_some2); CPPUNIT_TEST(test_for_some3); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); }; const char* START = "START: "; @@ -847,7 +846,7 @@ public: void test_insert_at_front_1000000() { test_insert_at_front("1000000"); } - SAL_CPPUNIT_TEST_SUITE(BigPtrArrayPerformanceTest); + CPPUNIT_TEST_SUITE(BigPtrArrayPerformanceTest); CPPUNIT_TEST(test_insert_at_end_1000); CPPUNIT_TEST(test_insert_at_end_10000); CPPUNIT_TEST(test_insert_at_end_100000); @@ -856,7 +855,7 @@ public: CPPUNIT_TEST(test_insert_at_front_10000); CPPUNIT_TEST(test_insert_at_front_100000); CPPUNIT_TEST(test_insert_at_front_1000000); - SAL_CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE_END(); private: void test_insert_at_end(const char* numElements) diff --git a/test/inc/test/bootstrapfixture.hxx b/test/inc/test/bootstrapfixture.hxx index 3b9a40f515d0..feabafb2ea4c 100644 --- a/test/inc/test/bootstrapfixture.hxx +++ b/test/inc/test/bootstrapfixture.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include "sal/precppunit.hxx" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/tools/qa/cppunit/test_inetmime.cxx b/tools/qa/cppunit/test_inetmime.cxx index 4fd6e2b0c84e..eae81eb5844c 100644 --- a/tools/qa/cppunit/test_inetmime.cxx +++ b/tools/qa/cppunit/test_inetmime.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/tools/qa/cppunit/test_pathutils.cxx b/tools/qa/cppunit/test_pathutils.cxx index 19b9fcfbdfbf..0b0a92901c8f 100644 --- a/tools/qa/cppunit/test_pathutils.cxx +++ b/tools/qa/cppunit/test_pathutils.cxx @@ -26,11 +26,9 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cwchar> +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx index 6e750c93d543..0dc7a593c198 100644 --- a/tools/qa/cppunit/test_reversemap.cxx +++ b/tools/qa/cppunit/test_reversemap.cxx @@ -26,13 +26,11 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tools_reversemap #endif +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index cb7d5b24ff23..b0aeb030bb47 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -26,9 +26,7 @@ * instead of those above. */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index 0a3a714f2942..a80a77968114 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -28,9 +28,7 @@ #include <string> -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include "cppunit/TestFixture.h" #include <cppunit/extensions/HelperMacros.h> #include "tools/urlobj.hxx" diff --git a/tools/qa/cppunit/tools_cppunittester_all.cxx b/tools/qa/cppunit/tools_cppunittester_all.cxx index bf8c57dfb3db..65aa2b8e2dd5 100644 --- a/tools/qa/cppunit/tools_cppunittester_all.cxx +++ b/tools/qa/cppunit/tools_cppunittester_all.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <cstdlib> #include <iostream> #include <limits> diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx index 77ad2a2b574f..55bae2656ce3 100644 --- a/tools/test/tests.cxx +++ b/tools/test/tests.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/unotest/inc/unotest/bootstrapfixturebase.hxx b/unotest/inc/unotest/bootstrapfixturebase.hxx index 65899556910b..9ede450c568a 100644 --- a/unotest/inc/unotest/bootstrapfixturebase.hxx +++ b/unotest/inc/unotest/bootstrapfixturebase.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include "sal/precppunit.hxx" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx index d57708d2b0ab..989dd33cff27 100644 --- a/unotest/source/cpp/filters-test.cxx +++ b/unotest/source/cpp/filters-test.cxx @@ -32,7 +32,6 @@ #include <osl/thread.h> #include <rtl/cipher.h> -#include "sal/precppunit.hxx" #include "cppunit/TestAssert.h" namespace test { diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index 10be894561a8..5b026f908fe4 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -31,8 +31,6 @@ #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/document/MacroExecMode.hpp> -#include <sal/config.h> -#include "sal/precppunit.hxx" #include "cppunit/TestAssert.h" #include <rtl/ustrbuf.hxx> diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index d342a236c13c..96f9a8a6252f 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "com/sun/star/bridge/UnoUrlResolver.hpp" #include "com/sun/star/bridge/XUnoUrlResolver.hpp" #include "com/sun/star/connection/NoConnectException.hpp" diff --git a/unotest/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx index 4d2b09af131f..f7a67c0edb13 100644 --- a/unotest/source/cpp/uniquepipename.cxx +++ b/unotest/source/cpp/uniquepipename.cxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - +#include "sal/types.h" #include "cppunit/TestAssert.h" #include "osl/process.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "sal/types.h" #include "unotest/uniquepipename.hxx" namespace test { diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx index 82e3252e6941..f9163874badf 100644 --- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx +++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <limits> #include <string> #include <iostream> diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index eb57b91141f4..1ee70993437e 100644 --- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include <limits> #include <string> #include <iostream> diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx index 0b17f2ceb92b..74eaff99648e 100644 --- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx +++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx @@ -1,8 +1,4 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -// autogenerated file with codegen.pl - -#include "sal/config.h" -#include "sal/precppunit.hxx" #include <osl/process.h> #include <cppuhelper/bootstrap.hxx> diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx index 1b17f5161023..1150ea56f6d7 100644 --- a/xmlsecurity/qa/certext/SanCertExt.cxx +++ b/xmlsecurity/qa/certext/SanCertExt.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" -#include "sal/precppunit.hxx" - #include "test/officeconnection.hxx" #include <com/sun/star/security/XSanExtension.hpp> |