Skip to content

Commit 0139994

Browse files
committed
Simplified logic
1 parent f09dbb7 commit 0139994

File tree

1 file changed

+7
-41
lines changed

1 file changed

+7
-41
lines changed

tests/b2nd/test_b2nd_concatenate.c

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -190,25 +190,9 @@ CUTEST_TEST_TEST(concatenate) {
190190
/* Create src2 with a value */
191191
b2nd_array_t *src2;
192192
uint8_t *value = malloc(typesize);
193-
switch (typesize) {
194-
case 8:
195-
((int64_t *) value)[0] = (int64_t) fill_value;
196-
break;
197-
case 4:
198-
((int32_t *) value)[0] = (int32_t) fill_value;
199-
break;
200-
case 2:
201-
((int16_t *) value)[0] = (int16_t) fill_value;
202-
break;
203-
case 1:
204-
((int8_t *) value)[0] = fill_value;
205-
break;
206-
default:
207-
// Fill a buffer with fill_value
208-
for (int i = 0; i < typesize; ++i) {
209-
value[i] = fill_value;
210-
}
211-
break;
193+
// Fill a buffer with fill_value
194+
for (int i = 0; i < typesize; ++i) {
195+
value[i] = fill_value;
212196
}
213197
blosc2_storage b2_storage2 = {.cparams=&cparams};
214198
if (backend.persistent) {
@@ -290,29 +274,12 @@ CUTEST_TEST_TEST(concatenate) {
290274
uint8_t *buffer = malloc(buffersize2);
291275

292276
B2ND_TEST_ASSERT(b2nd_get_slice_cbuffer(array, start, stop, buffer, buffershape, buffersize));
293-
// Check if the data in the concatenated array matches the helperbuffer
277+
// Data in the concatenated array matches the helperbuffer?
294278
uint8_t *buffer_fill = malloc(typesize);
295279
for (int64_t i = 0; i < buffersize / typesize; ++i) {
296280
bool is_true = false;
297-
switch (typesize) {
298-
case 8:
299-
is_true = ((int64_t *) buffer)[i] == ((int64_t *) helperbuffer)[i];
300-
break;
301-
case 4:
302-
is_true = ((int32_t *) buffer)[i] == ((int32_t *) helperbuffer)[i];
303-
break;
304-
case 2:
305-
is_true = ((int16_t *) buffer)[i] == ((int16_t *) helperbuffer)[i];
306-
break;
307-
case 1:
308-
is_true = ((int8_t *) buffer)[i] == ((int8_t *) helperbuffer)[i];
309-
break;
310-
default:
311-
// For default case, don't copy helperbuffer over buffer data
312-
memcpy(buffer_fill, &buffer[i * typesize], typesize);
313-
is_true = memcmp(buffer_fill, helperbuffer + i * typesize, typesize) == 0;
314-
break;
315-
}
281+
memcpy(buffer_fill, &buffer[i * typesize], typesize);
282+
is_true = memcmp(buffer_fill, helperbuffer + i * typesize, typesize) == 0;
316283
if (!is_true) {
317284
// Print the raw byte values for better debugging
318285
fprintf(stderr, "Data mismatch at index %d: buffer bytes = ", (int)i);
@@ -325,8 +292,7 @@ CUTEST_TEST_TEST(concatenate) {
325292
}
326293
fprintf(stderr, "\n");
327294
}
328-
CUTEST_ASSERT("Data in the concatenated array does not match the helperbuffer",
329-
is_true);
295+
CUTEST_ASSERT("Data in the concatenated array does not match the helperbuffer", is_true);
330296
}
331297

332298
/* Free mallocs */

0 commit comments

Comments
 (0)