Tests: Prefer TRY_OR_FAIL() and MUST() over EXPECT(!.is_error())

Note that in some cases (in particular SQL::Result and PDFErrorOr),
there is no Formatter defined for the error type, hence TRY_OR_FAIL
cannot work as-is. Furthermore, this commit leaves untouched the places
where MUST could be replaced by TRY_OR_FAIL.

Inspired by:
https://github.com/SerenityOS/serenity/pull/18710#discussion_r1186892445

1 files changed, 10 insertions, 17 deletions

diff --git a/Tests/LibCompress/TestDeflate.cpp b/Tests/LibCompress/TestDeflate.cpp
index c4bd045182..f081fb1cb8 100644
--- a/Tests/LibCompress/TestDeflate.cpp
+++ b/Tests/LibCompress/TestDeflate.cpp
@@ -116,11 +116,9 @@ TEST_CASE(deflate_round_trip_store)
 {
     auto original = ByteBuffer::create_uninitialized(1024).release_value();
     fill_with_random(original);
-    auto compressed = Compress::DeflateCompressor::compress_all(original, Compress::DeflateCompressor::CompressionLevel::STORE);
-    EXPECT(!compressed.is_error());
-    auto uncompressed = Compress::DeflateDecompressor::decompress_all(compressed.value());
-    EXPECT(!uncompressed.is_error());
-    EXPECT(uncompressed.value() == original);
+    auto compressed = TRY_OR_FAIL(Compress::DeflateCompressor::compress_all(original, Compress::DeflateCompressor::CompressionLevel::STORE));
+    auto uncompressed = TRY_OR_FAIL(Compress::DeflateDecompressor::decompress_all(compressed));
+    EXPECT(uncompressed == original);
 }
 
 TEST_CASE(deflate_round_trip_compress)
@@ -128,11 +126,9 @@ TEST_CASE(deflate_round_trip_compress)
     auto original = ByteBuffer::create_zeroed(2048).release_value();
     fill_with_random(original.bytes().trim(1024)); // we pre-filled the second half with 0s to make sure we test back references as well
     // Since the different levels just change how much time is spent looking for better matches, just use fast here to reduce test time
-    auto compressed = Compress::DeflateCompressor::compress_all(original, Compress::DeflateCompressor::CompressionLevel::FAST);
-    EXPECT(!compressed.is_error());
-    auto uncompressed = Compress::DeflateDecompressor::decompress_all(compressed.value());
-    EXPECT(!uncompressed.is_error());
-    EXPECT(uncompressed.value() == original);
+    auto compressed = TRY_OR_FAIL(Compress::DeflateCompressor::compress_all(original, Compress::DeflateCompressor::CompressionLevel::FAST));
+    auto uncompressed = TRY_OR_FAIL(Compress::DeflateDecompressor::decompress_all(compressed));
+    EXPECT(uncompressed == original);
 }
 
 TEST_CASE(deflate_round_trip_compress_large)
@@ -141,17 +137,14 @@ TEST_CASE(deflate_round_trip_compress_large)
     auto original = ByteBuffer::create_uninitialized(size).release_value(); // Compress a buffer larger than the maximum block size to test the sliding window mechanism
     fill_with_random(original);
     // Since the different levels just change how much time is spent looking for better matches, just use fast here to reduce test time
-    auto compressed = Compress::DeflateCompressor::compress_all(original, Compress::DeflateCompressor::CompressionLevel::FAST);
-    EXPECT(!compressed.is_error());
-    auto uncompressed = Compress::DeflateDecompressor::decompress_all(compressed.value());
-    EXPECT(!uncompressed.is_error());
-    EXPECT(uncompressed.value() == original);
+    auto compressed = TRY_OR_FAIL(Compress::DeflateCompressor::compress_all(original, Compress::DeflateCompressor::CompressionLevel::FAST));
+    auto uncompressed = TRY_OR_FAIL(Compress::DeflateDecompressor::decompress_all(compressed));
+    EXPECT(uncompressed == original);
 }
 
 TEST_CASE(deflate_compress_literals)
 {
     // This byte array is known to not produce any back references with our lz77 implementation even at the highest compression settings
     Array<u8, 0x13> test { 0, 0, 0, 0, 0x72, 0, 0, 0xee, 0, 0, 0, 0x26, 0, 0, 0, 0x28, 0, 0, 0x72 };
-    auto compressed = Compress::DeflateCompressor::compress_all(test, Compress::DeflateCompressor::CompressionLevel::GOOD);
-    EXPECT(!compressed.is_error());
+    auto compressed = TRY_OR_FAIL(Compress::DeflateCompressor::compress_all(test, Compress::DeflateCompressor::CompressionLevel::GOOD));
 }