diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp index 2e654cec..87eadf43 100644 --- a/lang/qt/tests/t-addexistingsubkey.cpp +++ b/lang/qt/tests/t-addexistingsubkey.cpp @@ -222,9 +222,9 @@ private Q_SLOTS: // several times const auto allowedDeltaTSeconds = 1; const auto expectedExpirationRange = std::make_pair( - sourceSubkey.expirationTime() - allowedDeltaTSeconds, - sourceSubkey.expirationTime() + allowedDeltaTSeconds); - const auto actualExpiration = key.subkey(2).expirationTime(); + uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds, + uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds); + const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp index 090002f3..3da74d46 100644 --- a/lang/qt/tests/t-changeexpiryjob.cpp +++ b/lang/qt/tests/t-changeexpiryjob.cpp @@ -70,7 +70,7 @@ private Q_SLOTS: QVERIFY(!key.isNull()); QVERIFY(!key.subkey(0).isNull()); QVERIFY(!key.subkey(1).isNull()); - const auto subkeyExpiration = key.subkey(1).expirationTime(); + const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime()); { // Create the job @@ -101,7 +101,7 @@ private Q_SLOTS: newExpirationDate.toSecsSinceEpoch() - 10, QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch()); { - const auto actualExpiration = key.subkey(0).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); @@ -110,7 +110,7 @@ private Q_SLOTS: "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); } { - const auto actualExpiration = key.subkey(1).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); QCOMPARE(actualExpiration, subkeyExpiration); // unchanged } } @@ -133,7 +133,7 @@ private Q_SLOTS: QVERIFY(!key.isNull()); QVERIFY(!key.subkey(0).isNull()); QVERIFY(!key.subkey(1).isNull()); - const auto primaryKeyExpiration = key.subkey(0).expirationTime(); + const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime()); { // Create the job @@ -164,11 +164,11 @@ private Q_SLOTS: newExpirationDate.toSecsSinceEpoch() - 10, QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch()); { - const auto actualExpiration = key.subkey(0).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); QCOMPARE(actualExpiration, primaryKeyExpiration); // unchanged } { - const auto actualExpiration = key.subkey(1).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); @@ -196,7 +196,7 @@ private Q_SLOTS: QVERIFY(!key.isNull()); QVERIFY(!key.subkey(0).isNull()); QVERIFY(!key.subkey(1).isNull()); - const auto subkeyExpiration = key.subkey(1).expirationTime(); + const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime()); { // Create the job @@ -228,7 +228,7 @@ private Q_SLOTS: newExpirationDate.toSecsSinceEpoch() - 10, QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch()); { - const auto actualExpiration = key.subkey(0).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); @@ -237,7 +237,7 @@ private Q_SLOTS: "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); } { - const auto actualExpiration = key.subkey(1).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); QCOMPARE(actualExpiration, subkeyExpiration); // unchanged } } @@ -291,7 +291,7 @@ private Q_SLOTS: newExpirationDate.toSecsSinceEpoch() - 10, QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch()); { - const auto actualExpiration = key.subkey(0).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); @@ -300,7 +300,7 @@ private Q_SLOTS: "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); } { - const auto actualExpiration = key.subkey(1).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); @@ -359,7 +359,7 @@ private Q_SLOTS: newExpirationDate.toSecsSinceEpoch() - 10, QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch()); { - const auto actualExpiration = key.subkey(0).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str()); @@ -368,7 +368,7 @@ private Q_SLOTS: "; expected: " + std::to_string(expectedExpirationRange.second)).c_str()); } { - const auto actualExpiration = key.subkey(1).expirationTime(); + const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime()); QVERIFY2(actualExpiration >= expectedExpirationRange.first, ("actual: " + std::to_string(actualExpiration) + "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());