Skip to content

C
core
Kaydet (Commit) 09e071fd authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

tools: Use appropriate OUString functions on string constants 

Change-Id: Idbca92ee8d38fe5839ec0aeb8ee02af3e326549d
üst a349a476
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
tools/qa/cppunit/test_urlobj.cxx
Dosyayı görüntüle @ 09e071fd
...@@ -58,9 +58,8 @@ namespace tools_urlobj ...@@ -58,9 +58,8 @@ namespace tools_urlobj
{ {
INetURLObject aUrl( OUString( "file://10.10.1.1/sampledir/sample.file" ) ); INetURLObject aUrl( OUString( "file://10.10.1.1/sampledir/sample.file" ) );
#ifdef LINUX #ifdef LINUX
CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
equalsAscii == "smb://10.10.1.1/sampledir/sample.file" );
( "smb://10.10.1.1/sampledir/sample.file" ) );
CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB );
#endif #endif
#ifdef WIN #ifdef WIN
...@@ -86,8 +85,8 @@ namespace tools_urlobj ...@@ -86,8 +85,8 @@ namespace tools_urlobj
setFSysPath( OUString( "\\\\137.65.170.24\\c$\\Img0001.jpg" ), setFSysPath( OUString( "\\\\137.65.170.24\\c$\\Img0001.jpg" ),
INetURLObject::FSYS_DETECT ); INetURLObject::FSYS_DETECT );
#ifdef LINUX #ifdef LINUX
CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
equalsAscii( "smb://137.65.170.24/c$/Img0001.jpg" ) ); == "smb://137.65.170.24/c$/Img0001.jpg" );
CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB );
#endif #endif
#ifdef WIN #ifdef WIN
...@@ -112,8 +111,8 @@ namespace tools_urlobj ...@@ -112,8 +111,8 @@ namespace tools_urlobj
setFSysPath( OUString( "\\\\hive-winxp-x86\\pmladek\\test2.odt" ), setFSysPath( OUString( "\\\\hive-winxp-x86\\pmladek\\test2.odt" ),
INetURLObject::FSYS_DETECT ); INetURLObject::FSYS_DETECT );
#ifdef LINUX #ifdef LINUX
CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
equalsAscii( "smb://hive-winxp-x86/pmladek/test2.odt" ) ); == "smb://hive-winxp-x86/pmladek/test2.odt" );
CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB );
#endif #endif
#ifdef WIN #ifdef WIN
...@@ -131,8 +130,8 @@ namespace tools_urlobj ...@@ -131,8 +130,8 @@ namespace tools_urlobj
{ {
INetURLObject aUrl( OUString( "smb://10.10.1.1/sampledir/sample.file" ) ); INetURLObject aUrl( OUString( "smb://10.10.1.1/sampledir/sample.file" ) );
#ifdef LINUX #ifdef LINUX
CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
equalsAscii( "smb://10.10.1.1/sampledir/sample.file" ) ); == "smb://10.10.1.1/sampledir/sample.file" );
CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB );
#endif #endif
#ifdef WIN #ifdef WIN
...@@ -155,8 +154,8 @@ namespace tools_urlobj ...@@ -155,8 +154,8 @@ namespace tools_urlobj
aUrl.setFSysPath( OUString( "//137.65.170.24/c$/Img0001.jpg" ), aUrl.setFSysPath( OUString( "//137.65.170.24/c$/Img0001.jpg" ),
INetURLObject::FSYS_DETECT ); INetURLObject::FSYS_DETECT );
#ifdef LINUX #ifdef LINUX
CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
equalsAscii( "smb://137.65.170.24/c$/Img0001.jpg" ) ); == "smb://137.65.170.24/c$/Img0001.jpg" );
CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB );
#endif #endif
#ifdef WIN #ifdef WIN
...@@ -180,8 +179,8 @@ namespace tools_urlobj ...@@ -180,8 +179,8 @@ namespace tools_urlobj
aUrl.setFSysPath( OUString( "//hive-winxp-x86/pmladek/test2.odt" ), aUrl.setFSysPath( OUString( "//hive-winxp-x86/pmladek/test2.odt" ),
INetURLObject::FSYS_DETECT ); INetURLObject::FSYS_DETECT );
#ifdef LINUX #ifdef LINUX
CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE )
equalsAscii( "smb://hive-winxp-x86/pmladek/test2.odt" ) ); == "smb://hive-winxp-x86/pmladek/test2.odt" );
CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INET_PROT_SMB );
#endif #endif
#ifdef WIN #ifdef WIN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment