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

Stephan Bergmann sbergman at redhat.com
Mon Apr 25 14:31:39 UTC 2016


 cppu/qa/test_any.cxx |   84 ---------------------------------------------------
 1 file changed, 84 deletions(-)

New commits:
commit aa04c6d20df8746353db00c4ac8a265b45cf6b51
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 25 16:31:07 2016 +0200

    Cannot extract Any to sal_uInt32
    
    ...which has the same underlying type as sal_Bool
    
    Change-Id: Ief5a9b9a4d286488efe6e67ee72e7cc23d6f4075

diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index e173b10..233362c 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -241,10 +241,6 @@ void Test::testVoid() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -335,14 +331,6 @@ void Test::testBoolean() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        if (boost::is_same< sal_uInt8, sal_Bool >::value) {
-            CPPUNIT_ASSERT_MESSAGE("@sal_uInt8", (a >>= b) && b == 0);
-        } else {
-            CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-        }
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -434,10 +422,6 @@ void Test::testByte() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", (a >>= b) && b == 1);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b) && b == 1);
     }
@@ -533,10 +517,6 @@ void Test::testShort() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b) && b == 1);
     }
@@ -634,10 +614,6 @@ void Test::testUnsignedShort() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b) && b == 1);
     }
@@ -733,10 +709,6 @@ void Test::testLong() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -828,10 +800,6 @@ void Test::testUnsignedLong() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -923,10 +891,6 @@ void Test::testHyper() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1018,10 +982,6 @@ void Test::testUnsignedHyper() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1113,10 +1073,6 @@ void Test::testFloat() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1208,10 +1164,6 @@ void Test::testDouble() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1304,10 +1256,6 @@ void Test::testChar() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1403,10 +1351,6 @@ void Test::testString() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1498,10 +1442,6 @@ void Test::testType() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1595,10 +1535,6 @@ void Test::testSequence() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1696,10 +1632,6 @@ void Test::testEnum() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1795,10 +1727,6 @@ void Test::testStruct() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -1915,10 +1843,6 @@ void Test::testException() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -2029,10 +1953,6 @@ void Test::testInterface() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }
@@ -2141,10 +2061,6 @@ void Test::testNull() {
         CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2);
     }
     {
-        sal_uInt8 b = 2;
-        CPPUNIT_ASSERT_MESSAGE("sal_uInt8", !(a >>= b) && b == 2);
-    }
-    {
         sal_Int16 b = 2;
         CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2);
     }


More information about the Libreoffice-commits mailing list