diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-30 12:01:13 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-30 12:01:13 +0100 |
commit | 5aee8e8cf48cf6c5fe5a4065554e96597e39e73d (patch) | |
tree | 2ea40f951c8d6b58cce52d788806bf40b212e93c /sal | |
parent | 28ac8ece849b3fc15b7a9fe7f7efd6a1e1b1c64c (diff) |
Various loplugin clean up
Change-Id: I94279c923624021c2420e893aac1aea5b9a802f9
Diffstat (limited to 'sal')
-rw-r--r-- | sal/qa/osl/pipe/osl_Pipe.cxx | 117 |
1 files changed, 48 insertions, 69 deletions
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 169ed3e36839..2ef7e69a1449 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -45,27 +45,6 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; -// helper functions - -/** print Boolean value. - */ -inline void printBool( sal_Bool bOk ) -{ - printf("#printBool# " ); - ( sal_True == bOk ) ? printf("YES!\n" ): printf("NO!\n" ); -} - -/** print a UNI_CODE String. - */ -inline void printUString( const ::rtl::OUString & str ) -{ - rtl::OString aString; - - printf("#printUString_u# " ); - aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ); - printf("%s\n", aString.getStr( ) ); -} - /** print last error of pipe system. */ inline void printPipeError( ::osl::Pipe aPipe ) @@ -141,13 +120,13 @@ namespace osl_Pipe class ctors : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; - void setUp( ) + void setUp( ) override { } - void tearDown( ) + void tearDown( ) override { } @@ -157,7 +136,7 @@ namespace osl_Pipe bRes = aPipe.is( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with no parameter, yet no case to test.", - sal_False == bRes ); + !bRes ); } void ctors_name_option( ) @@ -169,7 +148,7 @@ namespace osl_Pipe bRes = aPipe.is( ) && aAssignPipe.is( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with name and option.", - sal_True == bRes ); + bRes ); } void ctors_name_option_security( ) @@ -181,7 +160,7 @@ namespace osl_Pipe bRes = aSecurityPipe.is( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with name, option and security, the test of security is not implemented yet.", - sal_True == bRes ); + bRes ); } void ctors_copy( ) @@ -194,7 +173,7 @@ namespace osl_Pipe bRes = aCopyPipe.is( ) && aCopyPipe == aPipe; CPPUNIT_ASSERT_MESSAGE( "#test comment#: test copy constructor.", - sal_True == bRes ); + bRes ); } /** tester comment: @@ -219,7 +198,7 @@ namespace osl_Pipe ///bRes1 = aNoAcquirePipe.is( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with no acquire of handle, only validation test, do not know how to test no acquire.", - sal_True == bRes ); + bRes ); } void ctors_acquire( ) @@ -234,7 +213,7 @@ namespace osl_Pipe bRes1 = aAcquirePipe1.is( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with no acquire of handle.only validation test, do not know how to test no acquire.", - sal_True == bRes && sal_False == bRes1 ); + bRes && !bRes1 ); } CPPUNIT_TEST_SUITE( ctors ); @@ -257,14 +236,14 @@ namespace osl_Pipe { ::osl::Pipe aPipe; - CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), check if the pipe is a valid one.", sal_False == aPipe.is( ) ); + CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), check if the pipe is a valid one.", !aPipe.is( ) ); } void is_002( ) { ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE ); - CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), a normal pipe creation.", sal_True == aPipe.is( ) ); + CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), a normal pipe creation.", aPipe.is( ) ); } void is_003( ) @@ -272,14 +251,14 @@ namespace osl_Pipe ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE ); aPipe.clear( ); - CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid case.", sal_False == aPipe.is( ) ); + CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid case.", !aPipe.is( ) ); } void is_004( ) { ::osl::Pipe aPipe( NULL ); - CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid constructor.", sal_False == aPipe.is( ) ); + CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid constructor.", !aPipe.is( ) ); } CPPUNIT_TEST_SUITE( is ); @@ -299,7 +278,7 @@ namespace osl_Pipe class create : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; /** tester comment: @@ -316,7 +295,7 @@ namespace osl_Pipe aPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation.", - sal_True == bRes && sal_False == bRes1); + bRes && !bRes1); } void create_named_security_002( ) @@ -328,7 +307,7 @@ namespace osl_Pipe aPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation and open.", - sal_True == bRes && sal_True == bRes1); + bRes && bRes1); } void create_named_001( ) @@ -339,18 +318,18 @@ namespace osl_Pipe aPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation.", - sal_True == bRes && sal_False == bRes1); + bRes && !bRes1); } void create_named_002( ) { ::osl::Pipe aPipe, aPipe1; bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE ); - bRes1 = aPipe1.create( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN ); + bRes1 = aPipe1.create( test::uniquePipeName(aTestPipeName) ); aPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation and open.", - sal_True == bRes && sal_True == bRes1); + bRes && bRes1); } void create_named_003( ) @@ -360,7 +339,7 @@ namespace osl_Pipe aPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test default option is open.", - sal_False == bRes ); + !bRes ); } CPPUNIT_TEST_SUITE( create ); @@ -378,7 +357,7 @@ namespace osl_Pipe class clear : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void clear_001( ) { @@ -388,7 +367,7 @@ namespace osl_Pipe bRes = aPipe.is( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test clear.", - sal_False == bRes ); + !bRes ); } CPPUNIT_TEST_SUITE( clear ); @@ -403,7 +382,7 @@ namespace osl_Pipe class assign : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void assign_ref( ) { @@ -416,7 +395,7 @@ namespace osl_Pipe aPipe1.close( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test assign with reference.", - sal_True == bRes && sal_True == bRes1 ); + bRes && bRes1 ); } void assign_handle( ) @@ -430,7 +409,7 @@ namespace osl_Pipe aPipe1.close( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test assign with handle.", - sal_True == bRes && sal_True == bRes1 ); + bRes && bRes1 ); } CPPUNIT_TEST_SUITE( assign ); @@ -450,7 +429,7 @@ namespace osl_Pipe class isEqual : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void isEqual_001( ) { @@ -460,7 +439,7 @@ namespace osl_Pipe aPipe.close( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test isEqual(), compare its self.", - sal_True == bRes ); + bRes ); } void isEqual_002( ) @@ -478,7 +457,7 @@ namespace osl_Pipe aPipe2.close( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test isEqual(),create one copy instance, and compare.", - sal_True == bRes && sal_False == bRes1 ); + bRes && !bRes1 ); } CPPUNIT_TEST_SUITE( isEqual ); @@ -493,7 +472,7 @@ namespace osl_Pipe class close : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void close_001( ) { @@ -505,7 +484,7 @@ namespace osl_Pipe bRes1 = aPipe.is( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: difference between close and clear.", - sal_True == bRes && sal_False == bRes1); + bRes && !bRes1); } void close_002( ) @@ -535,7 +514,7 @@ namespace osl_Pipe class getError : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void getError_001( ) { @@ -573,7 +552,7 @@ namespace osl_Pipe class getHandle : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void getHandle_001( ) { @@ -582,7 +561,7 @@ namespace osl_Pipe aPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: one pipe should equal to its handle.", - sal_True == bRes ); + bRes ); } void getHandle_002( ) @@ -594,7 +573,7 @@ namespace osl_Pipe aPipe1.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: one pipe derived from another pipe's handle.", - sal_True == bRes ); + bRes ); } CPPUNIT_TEST_SUITE( getHandle ); @@ -629,7 +608,7 @@ namespace osl_StreamPipe class ctors : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void ctors_none( ) { @@ -646,7 +625,7 @@ namespace osl_StreamPipe aStreamPipe1.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with no parameter, before and after assign.", - sal_False == bRes && sal_True == bRes1 ); + !bRes && bRes1 ); } void ctors_handle( ) @@ -660,7 +639,7 @@ namespace osl_StreamPipe aStreamPipe1.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with other's handle.", - sal_True == bRes ); + bRes ); } void ctors_copy( ) @@ -674,7 +653,7 @@ namespace osl_StreamPipe aStreamPipe1.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test copy constructor.", - sal_True == bRes ); + bRes ); } void ctors_name_option( ) @@ -688,7 +667,7 @@ namespace osl_StreamPipe aStreamPipe1.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with name and option.", - sal_True == bRes ); + bRes ); } void ctors_name_option_security( ) @@ -701,7 +680,7 @@ namespace osl_StreamPipe aSecurityPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with name, option and security, the test of security is not implemented yet.", - sal_True == bRes ); + bRes ); } /** tester comment: @@ -725,7 +704,7 @@ namespace osl_StreamPipe aPipe.clear( ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with no acquire of handle, only validation test, do not know how to test no acquire.", - sal_True == bRes ); + bRes ); } CPPUNIT_TEST_SUITE( ctors ); @@ -764,15 +743,15 @@ namespace osl_StreamPipe sal_Char buf[256]; Pipe_DataSink_Thread( ) { } - ~Pipe_DataSink_Thread( ) + virtual ~Pipe_DataSink_Thread( ) { } protected: - void SAL_CALL run( ) + void SAL_CALL run( ) override { printf("open pipe\n"); ::osl::StreamPipe aSenderPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN ); // test::uniquePipeName(aTestPipeName) is a string = "TestPipe" - if ( aSenderPipe.is() == sal_False ) + if ( !aSenderPipe.is() ) { printf("pipe open failed! \n"); } @@ -809,17 +788,17 @@ namespace osl_StreamPipe printf("create pipe\n"); aListenPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE ); } - ~Pipe_DataSource_Thread( ) + virtual ~Pipe_DataSource_Thread( ) { aListenPipe.close(); } protected: - void SAL_CALL run( ) + void SAL_CALL run( ) override { //create pipe. sal_Int32 nChars; printf("listen\n"); - if ( aListenPipe.is() == sal_False ) + if ( !aListenPipe.is() ) { printf("pipe create failed! \n"); } @@ -858,7 +837,7 @@ namespace osl_StreamPipe class recv : public CppUnit::TestFixture { public: - sal_Bool bRes, bRes1; + bool bRes, bRes1; void recv_001( ) { |