summaryrefslogtreecommitdiff
path: root/sal/qa/rtl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/qa/rtl')
-rw-r--r--sal/qa/rtl/oustring/rtl_OUString2.cxx60
-rw-r--r--sal/qa/rtl/uri/rtl_Uri.cxx159
-rw-r--r--sal/qa/rtl/uuid/rtl_Uuid.cxx31
3 files changed, 1 insertions, 249 deletions
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 0628d504d9c7..849c5215dd16 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -31,48 +31,9 @@
#include "stringhelper.hxx"
#include "valueequal.hxx"
-inline void printOUString( ::rtl::OUString const & _suStr )
-{
- rtl::OString aString;
-
- printf( "OUString: " );
- aString = ::rtl::OUStringToOString( _suStr, RTL_TEXTENCODING_ASCII_US );
- printf( "'%s'\n", aString.getStr( ) );
-}
-
namespace rtl_OUString
{
- class ctors_rtl_uString : public CppUnit::TestFixture
- {
-
- public:
- /// test of OUString(rtl_uString*)
- void ctors_001()
- {
- rtl::OUString *pStr = new rtl::OUString( "a String" );
-
- rtl::OUString aStrToTest(pStr->pData);
- delete pStr;
-
- // maybe here should we do something with current memory
- char* pBuffer = (char*) malloc(2 * 8);
- memset(pBuffer, 0, 2 * 8);
- free(pBuffer);
-
- bool bResult = aStrToTest == "a String";
- CPPUNIT_ASSERT_MESSAGE("String must not be empty", bResult);
- }
-
- // 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.
-
- CPPUNIT_TEST_SUITE(ctors_rtl_uString);
- CPPUNIT_TEST(ctors_001);
- CPPUNIT_TEST_SUITE_END();
- };
-
class number : public CppUnit::TestFixture
{
void number_float_test_impl(float _nValue)
@@ -306,25 +267,6 @@ sal_Int16 SAL_CALL checkPrecisionSize()
return i;
}
- class testPrecision
- {
- public:
- testPrecision()
- {
- sal_Int16 nPrecision;
- nPrecision = checkPrecisionSize<float>();
- printf("precision of float: %d sizeof()=%" SAL_PRI_SIZET "d\n", nPrecision, sizeof(float));
-
- nPrecision = checkPrecisionSize<double>();
- printf("precision of double: %d sizeof()=%" SAL_PRI_SIZET "d\n", nPrecision, sizeof(double));
-
- nPrecision = checkPrecisionSize<long double>();
- printf("precision of long double: %d sizeof()=%" SAL_PRI_SIZET "d\n", nPrecision, sizeof(long double));
-
- }
-
- };
-
class toInt: public CppUnit::TestFixture {
public:
void test() {
@@ -1191,7 +1133,7 @@ class convertFromString: public CppUnit::TestFixture {
public:
void test();
- CPPUNIT_TEST_SUITE(createFromCodePoints);
+ CPPUNIT_TEST_SUITE(convertFromString);
CPPUNIT_TEST(test);
CPPUNIT_TEST_SUITE_END();
};
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 7465215a1d7b..016bb2ca4620 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -34,12 +34,6 @@ namespace Stringtest
{
rtl::OUString m_aStr;
public:
- rtl::OUString fromUTF8(rtl::OString const& _suStr)
- {
- rtl::OUString suStr = rtl::OStringToOUString(_suStr, RTL_TEXTENCODING_UTF8);
- return suStr;
- }
-
rtl::OString convertToOString(rtl::OUString const& _suStr)
{
return rtl::OUStringToOString(_suStr, osl_getThreadTextEncoding()/*RTL_TEXTENCODING_ASCII_US*/);
@@ -51,40 +45,6 @@ namespace Stringtest
printf("%s\n", sStr.getStr());
}
- void toUTF8_mech(rtl::OUString const& _suStr, rtl_UriEncodeMechanism _eMechanism)
- {
- rtl::OUString suStr;
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassNone, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassUric, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassUricNoSlash, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassRelSegment, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassRegName, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassUserinfo, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassPchar, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- suStr = rtl::Uri::encode(_suStr, rtl_UriCharClassUnoParamValue, _eMechanism, RTL_TEXTENCODING_UTF8);
- showContent(suStr);
- }
-
- void toUTF8(rtl::OUString const& _suStr)
- {
- printf("rtl_UriEncodeIgnoreEscapes \n");
- toUTF8_mech(_suStr, rtl_UriEncodeIgnoreEscapes);
- printf("\n");
- printf("# rtl_UriEncodeKeepEscapes\n");
- toUTF8_mech(_suStr, rtl_UriEncodeKeepEscapes);
- printf("\n");
- printf("# rtl_UriEncodeCheckEscapes\n");
- toUTF8_mech(_suStr, rtl_UriEncodeCheckEscapes);
- printf("\n");
- }
-
void test_FromUTF8_001()
{
// string --> ustring
@@ -109,127 +69,8 @@ namespace Stringtest
// suStr should be equal to suStr2
}
- // "%C3%84qypten";
- // testshl2 ../../../unxlngi4.pro/lib/libConvert.so "-onlyerrors"
- // # Type: 'Directory' file name '%E6%89%8B%E6%9C%BA%E5%8F%B7%E7%A0%81'
- // # Type: 'Directory' file name '%E6%9C%AA%E5%91%BD%E5%90%8Dzhgb18030'
- // # Type: 'Regular file' file name '%E5%B7%A5%E4%BD%9C'
- // # Type: 'Regular file' file name '%E4%BA%8C%E6%89%8B%E6%88%BF%E4%B9%B0%E5%8D%96%E5%90%88%E5%90%8C%E8%8D%89%E7%A8%BF.doc'
- // ls
- rtl::OString getFileTypeName(osl::FileStatus const& _aStatus)
- {
- rtl::OString sType;
- if (_aStatus.isValid(osl_FileStatus_Mask_Type))
- {
- osl::FileStatus::Type aType = _aStatus.getFileType();
- if (aType == osl::FileStatus::Directory)
- {
- sType = "Directory";
- }
- else if (aType == osl::FileStatus::Regular)
- {
- sType = "Regular file";
- }
- else if (aType == osl::FileStatus::Volume)
- {
- sType = "Volume";
- }
- else if (aType == osl::FileStatus::Fifo)
- {
- sType = "Fifo";
- }
- else if (aType == osl::FileStatus::Socket)
- {
- sType = "Socket";
- }
- else if (aType == osl::FileStatus::Link)
- {
- sType = "Link";
- }
- else if (aType == osl::FileStatus::Special)
- {
- sType = "Special";
- }
- else if (aType == osl::FileStatus::Unknown)
- {
- sType = "Unknown";
- }
- else
- {
- sType = "Not handled yet";
- }
- }
- else
- {
- sType = "ERROR: osl_FileStatus_Mask_Type not set for FileStatus!";
- }
- return sType;
- }
-
- void test_UTF8_files()
- {
-#ifdef UNX
- rtl::OUString suDirURL(rtl::OUString("file:///tmp/atestdir"));
-#else /* Windows */
- rtl::OUString suDirURL(rtl::OUString("file:///c:/temp/atestdir"));
-#endif
- osl::Directory aDir(suDirURL);
- aDir.open();
- if (aDir.isOpen())
- {
- osl::DirectoryItem aItem;
- osl::FileStatus aStatus(osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Attributes | osl_FileStatus_Mask_Type);
- while (aDir.getNextItem(aItem) == ::osl::FileBase::E_None)
- {
- if (osl::FileBase::E_None == aItem.getFileStatus(aStatus) &&
- aStatus.isValid(osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Attributes))
- {
- rtl::OString sType = getFileTypeName(aStatus);
-
- rtl::OUString suFilename = aStatus.getFileName();
- // rtl::OUString suFullFileURL;
-
- rtl::OUString suStrUTF8 = rtl::Uri::encode(suFilename, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
- rtl::OString sStrUTF8 = convertToOString(suStrUTF8);
- printf("Type: '%s' file name '%s'\n", sType.getStr(), sStrUTF8.getStr());
- }
- }
- aDir.close();
- }
- else
- {
- rtl::OString sStr;
- sStr = rtl::OUStringToOString(suDirURL, osl_getThreadTextEncoding());
- printf("can't open dir:'%s'\n", sStr.getStr());
- }
- }
-
- void test_FromUTF8()
- {
- rtl::OString sStr("h%C3%A4llo");
- rtl::OUString suStr = rtl::OStringToOUString(sStr, osl_getThreadTextEncoding());
-
-// rtl_UriEncodeIgnoreEscapes,
-// rtl_UriEncodeKeepEscapes,
-// rtl_UriEncodeCheckEscapes,
-// rtl::OUString suStr2 = rtl::Uri::encode(suStr, rtl_UriCharClassRegName, rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8);
- rtl::OUString suStr_UriDecodeNone = rtl::Uri::decode(suStr, rtl_UriDecodeNone, RTL_TEXTENCODING_UTF8);
- showContent(suStr_UriDecodeNone);
- toUTF8(suStr_UriDecodeNone);
-
- rtl::OUString suStr_UriDecodeToIuri = rtl::Uri::decode(suStr, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
- showContent(suStr_UriDecodeToIuri);
- toUTF8(suStr_UriDecodeToIuri);
-
- rtl::OUString suStr_UriDecodeWithCharset = rtl::Uri::decode(suStr, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8);
- showContent(suStr_UriDecodeWithCharset);
- toUTF8(suStr_UriDecodeWithCharset);
- }
-
CPPUNIT_TEST_SUITE( Convert );
CPPUNIT_TEST( test_FromUTF8_001 );
-// CPPUNIT_TEST( test_UTF8_files );
-// CPPUNIT_TEST( test_FromUTF8 );
CPPUNIT_TEST_SUITE_END( );
};
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 56c3e41e8f4c..d20c38a67ad9 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -35,40 +35,9 @@
#include <time.h>
#endif
-#define t_print printf
-
using ::rtl::OUString;
using ::rtl::OUStringToOString;
using ::rtl::OString;
-/** print a UNI_CODE String. And also print some comments of the string.
-*/
-inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
-{
- t_print("#%s #printUString_u# ", msg );
- rtl::OString aString;
- aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
- t_print("%s\n", (char *)aString.getStr( ) );
-}
-
-/************************************************************************
- * For diagnostics( from sal/test/testuuid.cxx )
- ************************************************************************/
-
-void printUuid( sal_uInt8 *pNode )
-{
- for( sal_Int32 i1 = 0 ; i1 < 4 ; i1++ )
- {
- for( sal_Int32 i2 = 0 ; i2 < 4 ; i2++ )
- {
- printf( "%02x" , pNode[i1*4 +i2] );
- }
- if( i1 == 3 )
- break;
- printf( "-" );
- }
-
- printf( "\n# " );
-}
namespace rtl_Uuid
{