From 39cc43f26ba295342270ce5e5d6427d726e05e04 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 21 Feb 2020 17:53:43 +0100
Subject: [PATCH] [libcalamares] Fix tests

- QCOMPARE() is sensitive to differing types in actual and expected,
  and uchar and int (and mode_t and int) are different.
---
 src/libcalamares/utils/Tests.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp
index 34701a940..d50abef39 100644
--- a/src/libcalamares/utils/Tests.cpp
+++ b/src/libcalamares/utils/Tests.cpp
@@ -162,7 +162,7 @@ LibCalamaresTests::testUmask()
     // m gets the previous value of the mask (depends on the environment the
     // test is run in, might be 002, might be 077), ..
     mode_t m = CalamaresUtils::setUMask( 022 );
-    QCOMPARE( CalamaresUtils::setUMask( m ), 022 );  // But now most recently set was 022
+    QCOMPARE( CalamaresUtils::setUMask( m ), mode_t( 022 ) );  // But now most recently set was 022
 
     for ( mode_t i = 0; i <= 0777 /* octal! */; ++i )
     {
@@ -178,7 +178,7 @@ LibCalamaresTests::testUmask()
         QCOMPARE( unlink( name ), 0 );
     }
     QCOMPARE( CalamaresUtils::setUMask( 022 ), m );
-    QCOMPARE( CalamaresUtils::setUMask( m ), 022 );
+    QCOMPARE( CalamaresUtils::setUMask( m ), mode_t( 022 ) );
 }
 
 void
@@ -219,7 +219,7 @@ LibCalamaresTests::testPrintableEntropy()
     for ( QChar c : s )
     {
         QVERIFY( c.isPrint() );
-        QCOMPARE( c.row(), 0 );
+        QCOMPARE( c.row(), uchar( 0 ) );
         QVERIFY( c.cell() > 32 );  // ASCII SPACE
         QVERIFY( c.cell() < 127 );
     }
@@ -245,7 +245,7 @@ LibCalamaresTests::testOddSizedPrintable()
         for ( QChar c : s )
         {
             QVERIFY( c.isPrint() );
-            QCOMPARE( c.row(), 0 );
+            QCOMPARE( c.row(), uchar( 0 ) );
             QVERIFY( c.cell() > 32 );  // ASCII SPACE
             QVERIFY( c.cell() < 127 );
         }