mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic: fix loplugin:cppunitassertequals warnings

Browse Source 
Change-Id: I80c773f3127ebbce4b9b2a122a91a2e2ca4f505b
Reviewed-on: https://gerrit.libreoffice.org/27424
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-07-22 09:14:24 +02:00
parent 10b13ba41d
commit 4e6d0f6fe7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/qa/cppunit/test_append.cxx
View File

@@ -53,7 +53,7 @@ void EnableTest::testEnableRuntime()
myMacro.Compile(); myMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("testEnableRuntime fails with compile error",!myMacro.HasError() ); CPPUNIT_ASSERT_MESSAGE("testEnableRuntime fails with compile error",!myMacro.HasError() );
SbxVariableRef pNew = myMacro.Run(); SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT(pNew->GetInteger() == 3 ); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(3), pNew->GetInteger());
} }
void EnableTest::testDimEnable() void EnableTest::testDimEnable()

8
basic/qa/cppunit/test_nested_struct.cxx
View File

@@ -173,7 +173,7 @@ void Nested_Struct::testAssign1()
myMacro.Compile(); myMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("testAssign1 fails with compile error",!myMacro.HasError() ); CPPUNIT_ASSERT_MESSAGE("testAssign1 fails with compile error",!myMacro.HasError() );
SbxVariableRef pNew = myMacro.Run(); SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT(pNew->GetInteger() == 9 ); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(9), pNew->GetInteger());
} }
void Nested_Struct::testAssign1Alt() void Nested_Struct::testAssign1Alt()
@@ -196,7 +196,7 @@ void Nested_Struct::testOldAssign()
myMacro.Compile(); myMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("testOldAssign fails with compile error",!myMacro.HasError() ); CPPUNIT_ASSERT_MESSAGE("testOldAssign fails with compile error",!myMacro.HasError() );
SbxVariableRef pNew = myMacro.Run(); SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT(pNew->GetInteger() == 9 ); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(9), pNew->GetInteger());
} }
void Nested_Struct::testOldAssignAlt() void Nested_Struct::testOldAssignAlt()
@@ -220,7 +220,7 @@ void Nested_Struct::testUnfixedVarAssign()
CPPUNIT_ASSERT_MESSAGE("testUnfixedVarAssign fails with compile error",!myMacro.HasError() ); CPPUNIT_ASSERT_MESSAGE("testUnfixedVarAssign fails with compile error",!myMacro.HasError() );
// forces a broadcast // forces a broadcast
SbxVariableRef pNew = myMacro.Run(); SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT(pNew->GetInteger() == 13 ); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(13), pNew->GetInteger());
} }
void Nested_Struct::testUnfixedVarAssignAlt() void Nested_Struct::testUnfixedVarAssignAlt()
@@ -256,7 +256,7 @@ void Nested_Struct::testFixedVarAssign()
myMacro.Compile(); myMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("testFixedVarAssign fails with compile error",!myMacro.HasError() ); CPPUNIT_ASSERT_MESSAGE("testFixedVarAssign fails with compile error",!myMacro.HasError() );
SbxVariableRef pNew = myMacro.Run(); SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT(pNew->GetInteger() == 13 ); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(13), pNew->GetInteger());
} }
void Nested_Struct::testFixedVarAssignAlt() void Nested_Struct::testFixedVarAssignAlt()

2
basic/qa/cppunit/test_vba.cxx
View File

@@ -81,7 +81,7 @@ void VBATest::testMiscVBAFunctions()
fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() );
} }
CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn != nullptr ); CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn != nullptr );
CPPUNIT_ASSERT_MESSAGE("Result not as expected", pReturn->GetOUString() == "OK" ); CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"), pReturn->GetOUString() );
} }
} }