summaryrefslogtreecommitdiff
path: root/sal/qa/rtl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/qa/rtl')
-rw-r--r--sal/qa/rtl/alloc/rtl_alloc.cxx12
-rw-r--r--sal/qa/rtl/cipher/rtl_cipher.cxx45
-rw-r--r--sal/qa/rtl/crc32/rtl_crc32.cxx5
-rw-r--r--sal/qa/rtl/digest/rtl_digest.cxx5
-rw-r--r--sal/qa/rtl/doublelock/rtl_doublelocking.cxx3
-rw-r--r--sal/qa/rtl/locale/rtl_locale.cxx33
-rw-r--r--sal/qa/rtl/logfile/rtl_logfile.cxx9
-rw-r--r--sal/qa/rtl/math/rtl_math.cxx5
-rw-r--r--sal/qa/rtl/math/test-rtl-math.cxx4
-rw-r--r--sal/qa/rtl/math/test_rtl_math.cxx4
-rw-r--r--sal/qa/rtl/ostring/rtl_OString2.cxx8
-rw-r--r--sal/qa/rtl/ostring/rtl_str.cxx5
-rw-r--r--sal/qa/rtl/ostring/rtl_string.cxx5
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx4
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx4
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx4
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx4
-rw-r--r--sal/qa/rtl/random/rtl_random.cxx5
-rw-r--r--sal/qa/rtl/strings/test_ostring_stringliterals.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_compare.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_convert.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_endswith.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_noadditional.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_stringliterals.cxx4
-rw-r--r--sal/qa/rtl/strings/test_strings_replace.cxx5
25 files changed, 62 insertions, 131 deletions
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"