Improve error reporing of layered streams.

2 files changed, 14 insertions, 14 deletions

diff --git a/tests/TestHashedBlockStream.cpp b/tests/TestHashedBlockStream.cpp
index 09179fef2..2a37d0aa4 100644
--- a/tests/TestHashedBlockStream.cpp
+++ b/tests/TestHashedBlockStream.cpp
@@ -36,15 +36,15 @@ void TestHashedBlockStream::testWriteRead()
     QByteArray data = QByteArray::fromHex("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4");
 
     QBuffer buffer;
-    buffer.open(QIODevice::ReadWrite);
+    QVERIFY(buffer.open(QIODevice::ReadWrite));
 
     HashedBlockStream writer(&buffer, 16);
-    writer.open(QIODevice::WriteOnly);
+    QVERIFY(writer.open(QIODevice::WriteOnly));
 
     HashedBlockStream reader(&buffer);
-    reader.open(QIODevice::ReadOnly);
+    QVERIFY(reader.open(QIODevice::ReadOnly));
 
-    writer.write(data.left(16));
+    QCOMPARE(writer.write(data.left(16)), qint64(16));
     QVERIFY(writer.reset());
     buffer.reset();
     QCOMPARE(reader.read(17), data.left(16));
@@ -52,7 +52,7 @@ void TestHashedBlockStream::testWriteRead()
     buffer.reset();
     buffer.buffer().clear();
 
-    writer.write(data.left(10));
+    QCOMPARE(writer.write(data.left(10)), qint64(10));
     QVERIFY(writer.reset());
     buffer.reset();
     QCOMPARE(reader.read(5), data.left(5));
@@ -62,7 +62,7 @@ void TestHashedBlockStream::testWriteRead()
     buffer.reset();
     buffer.buffer().clear();
 
-    writer.write(data.left(20));
+    QCOMPARE(writer.write(data.left(20)), qint64(20));
     QVERIFY(writer.reset());
     buffer.reset();
     QCOMPARE(reader.read(20), data.left(20));
diff --git a/tests/TestSymmetricCipher.cpp b/tests/TestSymmetricCipher.cpp
index ec9badd90..55a1bbe37 100644
--- a/tests/TestSymmetricCipher.cpp
+++ b/tests/TestSymmetricCipher.cpp
@@ -57,12 +57,12 @@ void TestSymmetricCipher::testAes256CbcEncryption()
                                  SymmetricCipher::Encrypt);
     QVERIFY(stream.init(key, iv));
     buffer.open(QIODevice::WriteOnly);
-    stream.open(QIODevice::WriteOnly);
+    QVERIFY(stream.open(QIODevice::WriteOnly));
     QVERIFY(stream.reset());
 
     buffer.reset();
     buffer.buffer().clear();
-    stream.write(plainText.left(16));
+    QCOMPARE(stream.write(plainText.left(16)), qint64(16));
     QCOMPARE(buffer.data(), cipherText.left(16));
     QVERIFY(stream.reset());
     // make sure padding is written
@@ -70,13 +70,13 @@ void TestSymmetricCipher::testAes256CbcEncryption()
 
     buffer.reset();
     buffer.buffer().clear();
-    stream.write(plainText.left(10));
+    QCOMPARE(stream.write(plainText.left(10)), qint64(10));
     QVERIFY(buffer.data().isEmpty());
 
     QVERIFY(stream.reset());
     buffer.reset();
     buffer.buffer().clear();
-    stream.write(plainText.left(10));
+    QCOMPARE(stream.write(plainText.left(10)), qint64(10));
     stream.close();
     QCOMPARE(buffer.data().size(), 16);
 }
@@ -106,20 +106,20 @@ void TestSymmetricCipher::testAes256CbcDecryption()
                                  SymmetricCipher::Decrypt);
     QVERIFY(stream.init(key, iv));
     buffer.open(QIODevice::ReadOnly);
-    stream.open(QIODevice::ReadOnly);
+    QVERIFY(stream.open(QIODevice::ReadOnly));
 
     QCOMPARE(stream.read(10),
              plainText.left(10));
     buffer.reset();
-    stream.reset();
+    QVERIFY(stream.reset());
     QCOMPARE(stream.read(20),
              plainText.left(20));
     buffer.reset();
-    stream.reset();
+    QVERIFY(stream.reset());
     QCOMPARE(stream.read(16),
              plainText.left(16));
     buffer.reset();
-    stream.reset();
+    QVERIFY(stream.reset());
     QCOMPARE(stream.read(100),
              plainText);
 }