[Libreoffice-commits] core.git: basic/qa

[Miklos Vajna]

 basic/qa/cppunit/test_append.cxx        |    2 +-
 basic/qa/cppunit/test_nested_struct.cxx |    8 ++++----
 basic/qa/cppunit/test_vba.cxx           |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4e6d0f6fe70cb84c0fda0cc8e61baf20f5ab250e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jul 22 09:14:24 2016 +0200

    basic: fix loplugin:cppunitassertequals warnings
    
    Change-Id: I80c773f3127ebbce4b9b2a122a91a2e2ca4f505b
    Reviewed-on: https://gerrit.libreoffice.org/27424
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx
index 98b96c4..986c941 100644
--- a/basic/qa/cppunit/test_append.cxx
+++ b/basic/qa/cppunit/test_append.cxx
@@ -53,7 +53,7 @@ void EnableTest::testEnableRuntime()
     myMacro.Compile();
     CPPUNIT_ASSERT_MESSAGE("testEnableRuntime fails with compile error",!myMacro.HasError() );
     SbxVariableRef pNew = myMacro.Run();
-    CPPUNIT_ASSERT(pNew->GetInteger() == 3 );
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(3), pNew->GetInteger());
 }
 
 void EnableTest::testDimEnable()
diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx
index aaa3ca8..2fc0600 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -173,7 +173,7 @@ void Nested_Struct::testAssign1()
     myMacro.Compile();
     CPPUNIT_ASSERT_MESSAGE("testAssign1 fails with compile error",!myMacro.HasError() );
     SbxVariableRef pNew = myMacro.Run();
-    CPPUNIT_ASSERT(pNew->GetInteger() == 9 );
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(9), pNew->GetInteger());
 }
 
 void Nested_Struct::testAssign1Alt()
@@ -196,7 +196,7 @@ void Nested_Struct::testOldAssign()
     myMacro.Compile();
     CPPUNIT_ASSERT_MESSAGE("testOldAssign fails with compile error",!myMacro.HasError() );
     SbxVariableRef pNew = myMacro.Run();
-    CPPUNIT_ASSERT(pNew->GetInteger() == 9 );
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(9), pNew->GetInteger());
 }
 
 void Nested_Struct::testOldAssignAlt()
@@ -220,7 +220,7 @@ void Nested_Struct::testUnfixedVarAssign()
     CPPUNIT_ASSERT_MESSAGE("testUnfixedVarAssign fails with compile error",!myMacro.HasError() );
     // forces a broadcast
     SbxVariableRef pNew = myMacro.Run();
-    CPPUNIT_ASSERT(pNew->GetInteger() == 13 );
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(13), pNew->GetInteger());
 }
 
 void Nested_Struct::testUnfixedVarAssignAlt()
@@ -256,7 +256,7 @@ void Nested_Struct::testFixedVarAssign()
     myMacro.Compile();
     CPPUNIT_ASSERT_MESSAGE("testFixedVarAssign fails with compile error",!myMacro.HasError() );
     SbxVariableRef pNew = myMacro.Run();
-    CPPUNIT_ASSERT(pNew->GetInteger() == 13 );
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(13), pNew->GetInteger());
 }
 
 void Nested_Struct::testFixedVarAssignAlt()
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 7d145e8..ee0d6dc 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -81,7 +81,7 @@ void VBATest::testMiscVBAFunctions()
             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("Result not as expected", pReturn->GetOUString() == "OK" );
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"), pReturn->GetOUString() );
     }
 }