diff options
Diffstat (limited to 'source/blender/blenlib/tests/BLI_array_store_test.cc')
-rw-r--r-- | source/blender/blenlib/tests/BLI_array_store_test.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/source/blender/blenlib/tests/BLI_array_store_test.cc b/source/blender/blenlib/tests/BLI_array_store_test.cc index 8e95557466e..c52d439308f 100644 --- a/source/blender/blenlib/tests/BLI_array_store_test.cc +++ b/source/blender/blenlib/tests/BLI_array_store_test.cc @@ -168,7 +168,7 @@ static void testbuffer_list_state_from_data__stride_expand(ListBase *lb, #define testbuffer_list_state_from_string_array(lb, data_array) \ { \ - unsigned int i_ = 0; \ + uint i_ = 0; \ const char *data; \ while ((data = data_array[i_++])) { \ testbuffer_list_state_from_data(lb, data, strlen(data)); \ @@ -224,7 +224,7 @@ static bool testbuffer_list_validate(const ListBase *lb) return true; } -static void testbuffer_list_data_randomize(ListBase *lb, unsigned int random_seed) +static void testbuffer_list_data_randomize(ListBase *lb, uint random_seed) { for (TestBuffer *tb = (TestBuffer *)lb->first; tb; tb = tb->next) { BLI_array_randomize((void *)tb->data, 1, tb->data_len, random_seed++); @@ -301,7 +301,7 @@ TEST(array_store, Nop) TEST(array_store, NopState) { BArrayStore *bs = BLI_array_store_create(1, 32); - const unsigned char data[] = "test"; + const uchar data[] = "test"; BArrayState *state = BLI_array_store_state_add(bs, data, sizeof(data) - 1, nullptr); EXPECT_EQ(BLI_array_store_state_size_get(state), sizeof(data) - 1); BLI_array_store_state_remove(bs, state); @@ -556,18 +556,15 @@ TEST(array_store, TextSentencesRandom_Stride128_Chunk6) /* -------------------------------------------------------------------- */ /* Random Data Tests */ -static unsigned int rand_range_i(RNG *rng, - unsigned int min_i, - unsigned int max_i, - unsigned int step) +static uint rand_range_i(RNG *rng, uint min_i, uint max_i, uint step) { if (min_i == max_i) { return min_i; } BLI_assert(min_i <= max_i); BLI_assert(((min_i % step) == 0) && ((max_i % step) == 0)); - unsigned int range = (max_i - min_i); - unsigned int value = BLI_rng_get_uint(rng) % range; + uint range = (max_i - min_i); + uint value = BLI_rng_get_uint(rng) % range; value = (value / step) * step; return min_i + value; } @@ -577,7 +574,7 @@ static void testbuffer_list_state_random_data(ListBase *lb, const size_t data_min_len, const size_t data_max_len, - const unsigned int mutate, + const uint mutate, RNG *rng) { size_t data_len = rand_range_i(rng, data_min_len, data_max_len + stride, stride); @@ -612,7 +609,7 @@ static void testbuffer_list_state_random_data(ListBase *lb, break; } case MUTATE_ADD: { - const unsigned int offset = rand_range_i(rng, 0, data_len, stride); + const uint offset = rand_range_i(rng, 0, data_len, stride); if (data_len < data_max_len) { data_len += stride; data = (char *)MEM_reallocN((void *)data, data_len); @@ -622,7 +619,7 @@ static void testbuffer_list_state_random_data(ListBase *lb, break; } case MUTATE_REMOVE: { - const unsigned int offset = rand_range_i(rng, 0, data_len, stride); + const uint offset = rand_range_i(rng, 0, data_len, stride); if (data_len > data_min_len) { memmove(&data[offset], &data[offset + stride], data_len - (offset + stride)); data_len -= stride; @@ -638,7 +635,7 @@ static void testbuffer_list_state_random_data(ListBase *lb, } case MUTATE_RANDOMIZE: { if (data_len > 0) { - const unsigned int offset = rand_range_i(rng, 0, data_len - stride, stride); + const uint offset = rand_range_i(rng, 0, data_len - stride, stride); BLI_rng_get_char_n(rng, &data[offset], stride); } break; |