]> git.ipfire.org Git - thirdparty/xz.git/commitdiff
Tests: test_index: Replace if-statements with tuktest assertions
authorLasse Collin <lasse.collin@tukaani.org>
Sat, 27 Apr 2024 11:59:55 +0000 (14:59 +0300)
committerLasse Collin <lasse.collin@tukaani.org>
Tue, 21 May 2024 21:12:07 +0000 (00:12 +0300)
(cherry picked from commit cd88423e76d54eb72aea037364f3ebb21f122503)

tests/test_index.c

index 69f51aecfb623f5f4115eeb65ab32dfa740941f3..ef43e6e3acfdeb249807686b7ec1812b87a2ea5c 100644 (file)
@@ -1486,21 +1486,19 @@ generate_index_decode_buffer(void)
 {
 #ifdef HAVE_ENCODERS
        decode_test_index = lzma_index_init(NULL);
-       if (decode_test_index == NULL)
-               return;
+       assert_true(decode_test_index != NULL);
 
        // Add 4 Blocks
        for (uint32_t i = 1; i < 5; i++)
-               if (lzma_index_append(decode_test_index, NULL,
-                               0x1000 * i, 0x100 * i) != LZMA_OK)
-                       return;
+               assert_lzma_ret(lzma_index_append(decode_test_index, NULL,
+                               0x1000 * i, 0x100 * i), LZMA_OK);
 
-       size_t size = lzma_index_size(decode_test_index);
+       const size_t size = (size_t)lzma_index_size(decode_test_index);
        decode_buffer = tuktest_malloc(size);
 
-       if (lzma_index_buffer_encode(decode_test_index,
-                       decode_buffer, &decode_buffer_size, size) != LZMA_OK)
-               decode_buffer_size = 0;
+       assert_lzma_ret(lzma_index_buffer_encode(decode_test_index,
+                       decode_buffer, &decode_buffer_size, size), LZMA_OK);
+       assert_true(decode_buffer_size != 0);
 #endif
 }
 
@@ -1523,8 +1521,7 @@ test_lzma_index_decoder(void)
 #ifndef HAVE_DECODERS
        assert_skip("Decoder support disabled");
 #else
-       if (decode_buffer_size == 0)
-               assert_skip("Could not initialize decode test buffer");
+       assert_true(decode_buffer_size != 0);
 
        lzma_stream strm = LZMA_STREAM_INIT;
 
@@ -1650,8 +1647,7 @@ test_lzma_index_buffer_decode(void)
 #ifndef HAVE_DECODERS
        assert_skip("Decoder support disabled");
 #else
-       if (decode_buffer_size == 0)
-               assert_skip("Could not initialize decode test buffer");
+       assert_true(decode_buffer_size != 0);
 
        // Simple test since test_lzma_index_decoder() covers most of the
        // lzma_index_buffer_decode() code anyway.