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

cppu: fix loplugin:cppunitassertequals warnings

Browse Source 
Change-Id: I1a459954c84290d340a887212fd1f839f4ebe715
Reviewed-on: https://gerrit.libreoffice.org/28229
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-08-19 09:23:14 +02:00
parent d890ec2f13
commit 6c4dfb98b3
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
cppu/qa/test_any.cxx
View File

@@ -227,7 +227,7 @@ public:
void Test::testVoid() { void Test::testVoid() {
css::uno::Any a; css::uno::Any a;
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<void>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<void>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -317,7 +317,7 @@ void Test::testVoid() {
void Test::testBoolean() { void Test::testBoolean() {
css::uno::Any a(false); css::uno::Any a(false);
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<bool>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<bool>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", (a >>= b) && !b); CPPUNIT_ASSERT_MESSAGE("bool", (a >>= b) && !b);
@@ -408,7 +408,7 @@ void Test::testBoolean() {
void Test::testByte() { void Test::testByte() {
css::uno::Any a(static_cast< sal_Int8 >(1)); css::uno::Any a(static_cast< sal_Int8 >(1));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<sal_Int8>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_Int8>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -503,7 +503,7 @@ void Test::testByte() {
void Test::testShort() { void Test::testShort() {
css::uno::Any a(static_cast< sal_Int16 >(1)); css::uno::Any a(static_cast< sal_Int16 >(1));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<sal_Int16>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_Int16>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -600,7 +600,7 @@ void Test::testUnsignedShort() {
sal_uInt16 n = 1; sal_uInt16 n = 1;
css::uno::Any a(&n, cppu::UnoType<cppu::UnoUnsignedShortType>::get()); css::uno::Any a(&n, cppu::UnoType<cppu::UnoUnsignedShortType>::get());
CPPUNIT_ASSERT( CPPUNIT_ASSERT(
a.getValueType() == cppu::UnoType<cppu::UnoUnsignedShortType>::get()); bool(a.getValueType() == cppu::UnoType<cppu::UnoUnsignedShortType>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -695,7 +695,7 @@ void Test::testUnsignedShort() {
void Test::testLong() { void Test::testLong() {
css::uno::Any a(static_cast< sal_Int32 >(1)); css::uno::Any a(static_cast< sal_Int32 >(1));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<sal_Int32>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_Int32>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -786,7 +786,7 @@ void Test::testLong() {
void Test::testUnsignedLong() { void Test::testUnsignedLong() {
css::uno::Any a(static_cast< sal_uInt32 >(1)); css::uno::Any a(static_cast< sal_uInt32 >(1));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<sal_uInt32>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_uInt32>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -877,7 +877,7 @@ void Test::testUnsignedLong() {
void Test::testHyper() { void Test::testHyper() {
css::uno::Any a(static_cast< sal_Int64 >(1)); css::uno::Any a(static_cast< sal_Int64 >(1));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<sal_Int64>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_Int64>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -968,7 +968,7 @@ void Test::testHyper() {
void Test::testUnsignedHyper() { void Test::testUnsignedHyper() {
css::uno::Any a(static_cast< sal_uInt64 >(1)); css::uno::Any a(static_cast< sal_uInt64 >(1));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<sal_uInt64>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_uInt64>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1059,7 +1059,7 @@ void Test::testUnsignedHyper() {
void Test::testFloat() { void Test::testFloat() {
css::uno::Any a(1.f); css::uno::Any a(1.f);
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<float>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<float>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1150,7 +1150,7 @@ void Test::testFloat() {
void Test::testDouble() { void Test::testDouble() {
css::uno::Any a(1.); css::uno::Any a(1.);
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<double>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<double>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1242,7 +1242,7 @@ void Test::testDouble() {
void Test::testChar() { void Test::testChar() {
sal_Unicode c = '1'; sal_Unicode c = '1';
css::uno::Any a(&c, cppu::UnoType<cppu::UnoCharType>::get()); css::uno::Any a(&c, cppu::UnoType<cppu::UnoCharType>::get());
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<cppu::UnoCharType>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<cppu::UnoCharType>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1337,7 +1337,7 @@ void Test::testChar() {
void Test::testString() { void Test::testString() {
css::uno::Any a(rtl::OUString("1")); css::uno::Any a(rtl::OUString("1"));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<OUString>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1428,7 +1428,7 @@ void Test::testString() {
void Test::testType() { void Test::testType() {
css::uno::Any a(cppu::UnoType<sal_Int32>::get()); css::uno::Any a(cppu::UnoType<sal_Int32>::get());
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<css::uno::Type>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<css::uno::Type>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1520,8 +1520,8 @@ void Test::testSequence() {
sal_Int32 n = 1; sal_Int32 n = 1;
css::uno::Any a(css::uno::Sequence< sal_Int32 >(&n, 1)); css::uno::Any a(css::uno::Sequence< sal_Int32 >(&n, 1));
CPPUNIT_ASSERT( CPPUNIT_ASSERT(
a.getValueType() bool(a.getValueType()
== cppu::UnoType<css::uno::Sequence<sal_Int32>>::get()); == cppu::UnoType<css::uno::Sequence<sal_Int32>>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1618,7 +1618,7 @@ void Test::testSequence() {
void Test::testEnum() { void Test::testEnum() {
css::uno::Any a(Enum2_M1); css::uno::Any a(Enum2_M1);
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<Enum2>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Enum2>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1713,7 +1713,7 @@ void Test::testEnum() {
void Test::testStruct() { void Test::testStruct() {
css::uno::Any a(Struct2a(1, 3)); css::uno::Any a(Struct2a(1, 3));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<Struct2a>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Struct2a>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1818,10 +1818,10 @@ void Test::testStruct() {
void Test::testPoly() { void Test::testPoly() {
css::uno::Any a; css::uno::Any a;
a <<= Poly< css::uno::Sequence< ::sal_Unicode > >(); a <<= Poly< css::uno::Sequence< ::sal_Unicode > >();
CPPUNIT_ASSERT_MESSAGE( "type name", a.getValueType().getTypeName() == "Poly<[]char>" ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "type name", OUString("Poly<[]char>"), a.getValueType().getTypeName() );
CPPUNIT_ASSERT_MESSAGE( CPPUNIT_ASSERT_EQUAL_MESSAGE(
"constructor", "constructor",
a == css::uno::Any(Poly< css::uno::Sequence< ::sal_Unicode > >())); css::uno::Any(Poly< css::uno::Sequence< ::sal_Unicode > >()), a);
} }
void Test::testException() { void Test::testException() {
@@ -1829,7 +1829,7 @@ void Test::testException() {
Exception2a( Exception2a(
rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 1, rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 1,
3)); 3));
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<Exception2a>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Exception2a>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -1939,7 +1939,7 @@ void Test::testException() {
void Test::testInterface() { void Test::testInterface() {
css::uno::Reference< Interface2a > i2(new Impl2); css::uno::Reference< Interface2a > i2(new Impl2);
css::uno::Any a(i2); css::uno::Any a(i2);
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<Interface2a>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Interface2a>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
@@ -2047,7 +2047,7 @@ void Test::testInterface() {
void Test::testNull() { void Test::testNull() {
css::uno::Any a = css::uno::Any(css::uno::Reference< Interface2a >()); css::uno::Any a = css::uno::Any(css::uno::Reference< Interface2a >());
CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<Interface2a>::get()); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Interface2a>::get()));
{ {
bool b = true; bool b = true;
CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);

6
cppu/qa/test_unotype.cxx
View File

@@ -113,11 +113,11 @@ void Test::testUnoType() {
t = cppu::UnoType<cppu::UnoVoidType>::get(); t = cppu::UnoType<cppu::UnoVoidType>::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_VOID, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_VOID, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("void"), t.getTypeName()); CPPUNIT_ASSERT_EQUAL(OUString("void"), t.getTypeName());
CPPUNIT_ASSERT(cppu::UnoType<void>::get() == t); CPPUNIT_ASSERT(bool(cppu::UnoType<void>::get() == t));
t = cppu::UnoType<bool>::get(); t = cppu::UnoType<bool>::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BOOLEAN, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BOOLEAN, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("boolean"), t.getTypeName()); CPPUNIT_ASSERT_EQUAL(OUString("boolean"), t.getTypeName());
CPPUNIT_ASSERT(cppu::UnoType<sal_Bool>::get() == t); CPPUNIT_ASSERT(bool(cppu::UnoType<sal_Bool>::get() == t));
t = cppu::UnoType<sal_Int8>::get(); t = cppu::UnoType<sal_Int8>::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BYTE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BYTE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("byte"), t.getTypeName()); CPPUNIT_ASSERT_EQUAL(OUString("byte"), t.getTypeName());
@@ -162,7 +162,7 @@ void Test::testUnoType() {
t = cppu::UnoType<cppu::UnoSequenceType<sal_Int8>>::get(); t = cppu::UnoType<cppu::UnoSequenceType<sal_Int8>>::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[]byte"), t.getTypeName()); CPPUNIT_ASSERT_EQUAL(OUString("[]byte"), t.getTypeName());
CPPUNIT_ASSERT(cppu::UnoType<css::uno::Sequence<sal_Int8>>::get() == t); CPPUNIT_ASSERT(bool(cppu::UnoType<css::uno::Sequence<sal_Int8>>::get() == t));
t = cppu::UnoType<cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>::get(); t = cppu::UnoType<cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass()); CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(OUString("[]unsigned short"), t.getTypeName()); CPPUNIT_ASSERT_EQUAL(OUString("[]unsigned short"), t.getTypeName());