From 328e2263fb6e2415bafbc40a7d7309b66f65971a Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 27 Jun 2012 16:05:04 +0100 Subject: targetted re-work of cppunit pieces. --- sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 116 ++++++++++++++--------------- 1 file changed, 57 insertions(+), 59 deletions(-) (limited to 'sal/qa/OStringBuffer') 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 #include #include #include @@ -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 -- cgit