X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftest_libFLAC%2Fmetadata_object.c;h=b190ce740b8a2f3f55606564f50f22c849a0fe96;hb=HEAD;hp=5c3f80a4cf63c0696cb0b9395240cffd411448ec;hpb=afae69f0e3491e69362f7f582ec6b3c8605ac83b;p=platform%2Fupstream%2Fflac.git diff --git a/src/test_libFLAC/metadata_object.c b/src/test_libFLAC/metadata_object.c index 5c3f80a..b190ce7 100644 --- a/src/test_libFLAC/metadata_object.c +++ b/src/test_libFLAC/metadata_object.c @@ -1,5 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC - * Copyright (C) 2002,2003 Josh Coalson + * Copyright (C) 2002-2009 Josh Coalson + * Copyright (C) 2011-2013 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -11,14 +12,20 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#if HAVE_CONFIG_H +# include +#endif + #include "FLAC/assert.h" #include "FLAC/metadata.h" -#include "metadata_utils.h" +#include "test_libs_common/metadata_utils.h" +#include "share/compat.h" +#include "metadata.h" #include #include /* for malloc() */ #include /* for memcmp() */ @@ -27,7 +34,7 @@ static FLAC__byte *make_dummydata_(FLAC__byte *dummydata, unsigned len) { FLAC__byte *ret; - if(0 == (ret = (FLAC__byte*)malloc(len))) { + if(0 == (ret = malloc(len))) { printf("FAILED, malloc error\n"); exit(1); } @@ -42,7 +49,7 @@ static FLAC__bool compare_track_(const FLAC__StreamMetadata_CueSheet_Track *from unsigned i; if(from->offset != to->offset) { - printf("FAILED, track offset mismatch, expected %llu, got %llu\n", to->offset, from->offset); + printf("FAILED, track offset mismatch, expected %" PRIu64 ", got %" PRIu64 "\n", to->offset, from->offset); return false; } if(from->number != to->number) { @@ -74,7 +81,7 @@ static FLAC__bool compare_track_(const FLAC__StreamMetadata_CueSheet_Track *from else { for(i = 0; i < to->num_indices; i++) { if(from->indices[i].offset != to->indices[i].offset) { - printf("FAILED, track indices[%u].offset mismatch, expected %llu, got %llu\n", i, to->indices[i].offset, from->indices[i].offset); + printf("FAILED, track indices[%u].offset mismatch, expected %" PRIu64 ", got %" PRIu64 "\n", i, to->indices[i].offset, from->indices[i].offset); return false; } if(from->indices[i].number != to->indices[i].number) { @@ -96,11 +103,11 @@ static FLAC__bool compare_seekpoint_array_(const FLAC__StreamMetadata_SeekPoint for(i = 0; i < n; i++) { if(from[i].sample_number != to[i].sample_number) { - printf("FAILED, point[%u].sample_number mismatch, expected %llu, got %llu\n", i, to[i].sample_number, from[i].sample_number); + printf("FAILED, point[%u].sample_number mismatch, expected %" PRIu64 ", got %" PRIu64 "\n", i, to[i].sample_number, from[i].sample_number); return false; } if(from[i].stream_offset != to[i].stream_offset) { - printf("FAILED, point[%u].stream_offset mismatch, expected %llu, got %llu\n", i, to[i].stream_offset, from[i].stream_offset); + printf("FAILED, point[%u].stream_offset mismatch, expected %" PRIu64 ", got %" PRIu64 "\n", i, to[i].stream_offset, from[i].stream_offset); return false; } if(from[i].frame_samples != to[i].frame_samples) { @@ -142,16 +149,18 @@ static FLAC__bool check_seektable_(const FLAC__StreamMetadata *block, unsigned n static void entry_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field) { entry->length = strlen(field); - entry->entry = (FLAC__byte*)malloc(entry->length); + entry->entry = malloc(entry->length+1); FLAC__ASSERT(0 != entry->entry); memcpy(entry->entry, field, entry->length); + entry->entry[entry->length] = '\0'; } static void entry_clone_(FLAC__StreamMetadata_VorbisComment_Entry *entry) { - FLAC__byte *x = (FLAC__byte*)malloc(entry->length); + FLAC__byte *x = malloc(entry->length+1); FLAC__ASSERT(0 != x); memcpy(x, entry->entry, entry->length); + x[entry->length] = '\0'; entry->entry = x; } @@ -190,7 +199,7 @@ static void vc_resize_(FLAC__StreamMetadata *block, unsigned num) } } else { - vc->comments = (FLAC__StreamMetadata_VorbisComment_Entry*)realloc(vc->comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry)*num); + vc->comments = realloc(vc->comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry)*num); FLAC__ASSERT(0 != vc->comments); if(num > vc->num_comments) memset(vc->comments+vc->num_comments, 0, sizeof(FLAC__StreamMetadata_VorbisComment_Entry)*(num-vc->num_comments)); @@ -200,6 +209,18 @@ static void vc_resize_(FLAC__StreamMetadata *block, unsigned num) vc_calc_len_(block); } +static int vc_find_from_(FLAC__StreamMetadata *block, const char *name, unsigned start) +{ + const unsigned n = strlen(name); + unsigned i; + for(i = start; i < block->data.vorbis_comment.num_comments; i++) { + const FLAC__StreamMetadata_VorbisComment_Entry *entry = &block->data.vorbis_comment.comments[i]; + if(entry->length > n && 0 == strncmp((const char *)entry->entry, name, n) && entry->entry[n] == '=') + return (int)i; + } + return -1; +} + static void vc_set_vs_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, FLAC__StreamMetadata *block, const char *field) { if(0 != block->data.vorbis_comment.vendor_string.entry) @@ -238,6 +259,30 @@ static void vc_delete_(FLAC__StreamMetadata *block, unsigned pos) vc_calc_len_(block); } +static void vc_replace_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, FLAC__StreamMetadata *block, const char *field, FLAC__bool all) +{ + int indx; + char field_name[256]; + const char *eq = strchr(field, '='); + FLAC__ASSERT(eq>field && (unsigned)(eq-field) < sizeof(field_name)); + memcpy(field_name, field, eq-field); + field_name[eq-field]='\0'; + + indx = vc_find_from_(block, field_name, 0); + if(indx < 0) + vc_insert_new_(entry, block, block->data.vorbis_comment.num_comments, field); + else { + vc_set_new_(entry, block, (unsigned)indx, field); + if(all) { + for(indx = indx+1; indx >= 0 && (unsigned)indx < block->data.vorbis_comment.num_comments; ) + if((indx = vc_find_from_(block, field_name, (unsigned)indx)) >= 0) + vc_delete_(block, (unsigned)indx); + } + } + + vc_calc_len_(block); +} + static void track_new_(FLAC__StreamMetadata_CueSheet_Track *track, FLAC__uint64 offset, FLAC__byte number, const char *isrc, FLAC__bool data, FLAC__bool pre_em) { track->offset = offset; @@ -253,7 +298,7 @@ static void track_clone_(FLAC__StreamMetadata_CueSheet_Track *track) { if(track->num_indices > 0) { size_t bytes = sizeof(FLAC__StreamMetadata_CueSheet_Index) * track->num_indices; - FLAC__StreamMetadata_CueSheet_Index *x = (FLAC__StreamMetadata_CueSheet_Index*)malloc(bytes); + FLAC__StreamMetadata_CueSheet_Index *x = malloc(bytes); FLAC__ASSERT(0 != x); memcpy(x, track->indices, bytes); track->indices = x; @@ -308,7 +353,7 @@ static void tr_resize_(FLAC__StreamMetadata *block, unsigned track_num, unsigned } } else { - tr->indices = (FLAC__StreamMetadata_CueSheet_Index*)realloc(tr->indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)*num); + tr->indices = realloc(tr->indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)*num); FLAC__ASSERT(0 != tr->indices); if(num > tr->num_indices) memset(tr->indices+tr->num_indices, 0, sizeof(FLAC__StreamMetadata_CueSheet_Index)*(num-tr->num_indices)); @@ -318,7 +363,7 @@ static void tr_resize_(FLAC__StreamMetadata *block, unsigned track_num, unsigned cs_calc_len_(block); } -static void tr_set_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index index) +static void tr_set_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index indx) { FLAC__StreamMetadata_CueSheet_Track *tr; @@ -328,12 +373,12 @@ static void tr_set_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigne FLAC__ASSERT(pos < tr->num_indices); - tr->indices[pos] = index; + tr->indices[pos] = indx; cs_calc_len_(block); } -static void tr_insert_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index index) +static void tr_insert_new_(FLAC__StreamMetadata *block, unsigned track_num, unsigned pos, FLAC__StreamMetadata_CueSheet_Index indx) { FLAC__StreamMetadata_CueSheet_Track *tr; @@ -345,7 +390,7 @@ static void tr_insert_new_(FLAC__StreamMetadata *block, unsigned track_num, unsi tr_resize_(block, track_num, tr->num_indices+1); memmove(&tr->indices[pos+1], &tr->indices[pos], sizeof(FLAC__StreamMetadata_CueSheet_Index)*(tr->num_indices-1-pos)); - tr_set_new_(block, track_num, pos, index); + tr_set_new_(block, track_num, pos, indx); cs_calc_len_(block); } @@ -385,7 +430,7 @@ static void cs_resize_(FLAC__StreamMetadata *block, unsigned num) } } else { - cs->tracks = (FLAC__StreamMetadata_CueSheet_Track*)realloc(cs->tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)*num); + cs->tracks = realloc(cs->tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)*num); FLAC__ASSERT(0 != cs->tracks); if(num > cs->num_tracks) memset(cs->tracks+cs->num_tracks, 0, sizeof(FLAC__StreamMetadata_CueSheet_Track)*(num-cs->num_tracks)); @@ -421,15 +466,49 @@ static void cs_delete_(FLAC__StreamMetadata *block, unsigned pos) cs_calc_len_(block); } +static void pi_set_mime_type(FLAC__StreamMetadata *block, const char *s) +{ + if(block->data.picture.mime_type) { + block->length -= strlen(block->data.picture.mime_type); + free(block->data.picture.mime_type); + } + block->data.picture.mime_type = strdup(s); + FLAC__ASSERT(block->data.picture.mime_type); + block->length += strlen(block->data.picture.mime_type); +} + +static void pi_set_description(FLAC__StreamMetadata *block, const FLAC__byte *s) +{ + if(block->data.picture.description) { + block->length -= strlen((const char *)block->data.picture.description); + free(block->data.picture.description); + } + block->data.picture.description = (FLAC__byte*)strdup((const char *)s); + FLAC__ASSERT(block->data.picture.description); + block->length += strlen((const char *)block->data.picture.description); +} + +static void pi_set_data(FLAC__StreamMetadata *block, const FLAC__byte *data, FLAC__uint32 len) +{ + if(block->data.picture.data) { + block->length -= block->data.picture.data_length; + free(block->data.picture.data); + } + block->data.picture.data = (FLAC__byte*)strdup((const char *)data); + FLAC__ASSERT(block->data.picture.data); + block->data.picture.data_length = len; + block->length += len; +} -FLAC__bool test_metadata_object() +FLAC__bool test_metadata_object(void) { - FLAC__StreamMetadata *block, *blockcopy, *vorbiscomment, *cuesheet; - FLAC__StreamMetadata_SeekPoint seekpoint_array[8]; + FLAC__StreamMetadata *block, *blockcopy, *vorbiscomment, *cuesheet, *picture; + FLAC__StreamMetadata_SeekPoint seekpoint_array[14]; FLAC__StreamMetadata_VorbisComment_Entry entry; - FLAC__StreamMetadata_CueSheet_Index index; + FLAC__StreamMetadata_CueSheet_Index indx; FLAC__StreamMetadata_CueSheet_Track track; unsigned i, expected_length, seekpoints; + int j; static FLAC__byte dummydata[4] = { 'a', 'b', 'c', 'd' }; printf("\n+++ libFLAC unit test: metadata objects\n\n"); @@ -456,7 +535,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -487,7 +566,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -518,7 +597,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -548,7 +627,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -578,7 +657,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -612,7 +691,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -699,7 +778,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -836,6 +915,28 @@ FLAC__bool test_metadata_object() if(!check_seektable_(block, seekpoints, seekpoint_array)) return false; + seekpoint_array[seekpoints++].sample_number = 0; + seekpoint_array[seekpoints++].sample_number = 10; + seekpoint_array[seekpoints++].sample_number = 20; + printf("testing FLAC__metadata_object_seekpoint_template_append_spaced_points_by_samples()... "); + if(!FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(block, 10, 30)) { + printf("FAILED, returned false\n"); + return false; + } + if(!check_seektable_(block, seekpoints, seekpoint_array)) + return false; + + seekpoint_array[seekpoints++].sample_number = 0; + seekpoint_array[seekpoints++].sample_number = 11; + seekpoint_array[seekpoints++].sample_number = 22; + printf("testing FLAC__metadata_object_seekpoint_template_append_spaced_points_by_samples()... "); + if(!FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(block, 11, 30)) { + printf("FAILED, returned false\n"); + return false; + } + if(!check_seektable_(block, seekpoints, seekpoint_array)) + return false; + printf("testing FLAC__metadata_object_delete()... "); FLAC__metadata_object_delete(block); printf("OK\n"); @@ -843,6 +944,55 @@ FLAC__bool test_metadata_object() printf("testing VORBIS_COMMENT\n"); + { + FLAC__StreamMetadata_VorbisComment_Entry entry_; + char *field_name, *field_value; + + printf("testing FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair()... "); + if(!FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry_, "name", "value")) { + printf("FAILED, returned false\n"); + return false; + } + if(strcmp((const char *)entry_.entry, "name=value")) { + printf("FAILED, field mismatch\n"); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair()... "); + if(!FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(entry_, &field_name, &field_value)) { + printf("FAILED, returned false\n"); + return false; + } + if(strcmp(field_name, "name")) { + printf("FAILED, field name mismatch\n"); + return false; + } + if(strcmp(field_value, "value")) { + printf("FAILED, field value mismatch\n"); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_entry_matches()... "); + if(!FLAC__metadata_object_vorbiscomment_entry_matches(entry_, field_name, strlen(field_name))) { + printf("FAILED, expected true, returned false\n"); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_entry_matches()... "); + if(FLAC__metadata_object_vorbiscomment_entry_matches(entry_, "blah", strlen("blah"))) { + printf("FAILED, expected false, returned true\n"); + return false; + } + printf("OK\n"); + + free(entry_.entry); + free(field_name); + free(field_value); + } + printf("testing FLAC__metadata_object_new()... "); block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); if(0 == block) { @@ -862,7 +1012,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -872,7 +1022,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -882,7 +1032,37 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + vc_resize_(vorbiscomment, 0); + printf("testing FLAC__metadata_object_vorbiscomment_resize_comments(shrink to %u)...", vorbiscomment->data.vorbis_comment.num_comments); + if(!FLAC__metadata_object_vorbiscomment_resize_comments(block, vorbiscomment->data.vorbis_comment.num_comments)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on empty array..."); + vc_insert_new_(&entry, vorbiscomment, 0, "name1=field1"); + if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 1, "name2=field2"); + if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -892,7 +1072,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -902,7 +1082,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -912,7 +1092,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -922,7 +1102,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -932,8 +1112,98 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(copy) on end of non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 4, "name3=field3dup1"); + if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 4, entry, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(copy) on end of non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 5, "name3=field3dup1"); + if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 5, entry, /*copy=*/true)) { + printf("FAILED, returned false\n"); return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()..."); + if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, "name3")) != 1) { + printf("FAILED, expected 1, got %d\n", j); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()..."); + if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, j+1, "name3")) != 4) { + printf("FAILED, expected 4, got %d\n", j); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()..."); + if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, j+1, "name3")) != 5) { + printf("FAILED, expected 5, got %d\n", j); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()..."); + if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, "name2")) != 0) { + printf("FAILED, expected 0, got %d\n", j); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()..."); + if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, j+1, "name2")) != -1) { + printf("FAILED, expected -1, got %d\n", j); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()..."); + if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, "blah")) != -1) { + printf("FAILED, expected -1, got %d\n", j); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(first, copy)..."); + vc_replace_new_(&entry, vorbiscomment, "name3=field3new1", /*all=*/false); + if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/false, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + if(block->data.vorbis_comment.num_comments != 6) { + printf("FAILED, expected 6 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(all, copy)..."); + vc_replace_new_(&entry, vorbiscomment, "name3=field3new2", /*all=*/true); + if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/true, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + if(block->data.vorbis_comment.num_comments != 4) { + printf("FAILED, expected 4 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } printf("OK\n"); printf("testing FLAC__metadata_object_clone()... "); @@ -942,7 +1212,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -956,7 +1226,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -966,7 +1236,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -976,21 +1246,106 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 1, "rem0=val0"); + if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 2, "rem0=val1"); + if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 3, "rem0=val2"); + if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_remove_entry_matching(\"blah\")..."); + if((j = FLAC__metadata_object_vorbiscomment_remove_entry_matching(block, "blah")) != 0) { + printf("FAILED, expected 0, got %d\n", j); + return false; + } + if(block->data.vorbis_comment.num_comments != 4) { + printf("FAILED, expected 4 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_remove_entry_matching(\"rem0\")..."); + vc_delete_(vorbiscomment, 1); + if((j = FLAC__metadata_object_vorbiscomment_remove_entry_matching(block, "rem0")) != 1) { + printf("FAILED, expected 1, got %d\n", j); + return false; + } + if(block->data.vorbis_comment.num_comments != 3) { + printf("FAILED, expected 3 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_remove_entries_matching(\"blah\")..."); + if((j = FLAC__metadata_object_vorbiscomment_remove_entries_matching(block, "blah")) != 0) { + printf("FAILED, expected 0, got %d\n", j); + return false; + } + if(block->data.vorbis_comment.num_comments != 3) { + printf("FAILED, expected 3 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_remove_entries_matching(\"rem0\")..."); + vc_delete_(vorbiscomment, 1); + vc_delete_(vorbiscomment, 1); + if((j = FLAC__metadata_object_vorbiscomment_remove_entries_matching(block, "rem0")) != 2) { + printf("FAILED, expected 2, got %d\n", j); + return false; + } + if(block->data.vorbis_comment.num_comments != 1) { + printf("FAILED, expected 1 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); printf("testing FLAC__metadata_object_vorbiscomment_set_comment(copy)..."); vc_set_new_(&entry, vorbiscomment, 0, "name5=field5"); FLAC__metadata_object_vorbiscomment_set_comment(block, 0, entry, /*copy=*/true); - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); printf("testing FLAC__metadata_object_vorbiscomment_set_vendor_string(copy)..."); vc_set_vs_new_(&entry, vorbiscomment, "name6=field6"); FLAC__metadata_object_vorbiscomment_set_vendor_string(block, entry, /*copy=*/true); - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1014,7 +1369,52 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_append_comment(own) on empty array..."); + vc_insert_new_(&entry, vorbiscomment, 0, "name1=field1"); + entry_clone_(&entry); + if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_append_comment(own) on non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 1, "name2=field2"); + entry_clone_(&entry); + if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(vorbiscomment); + FLAC__metadata_object_delete(block); + printf("OK\n"); + + printf("testing FLAC__metadata_object_new()... "); + block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); + if(0 == block) { + printf("FAILED, returned NULL\n"); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_clone()... "); + vorbiscomment = FLAC__metadata_object_clone(block); + if(0 == vorbiscomment) { + printf("FAILED, returned NULL\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1025,7 +1425,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1036,7 +1436,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1047,7 +1447,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1058,17 +1458,69 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); + printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(own) on end of non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 4, "name3=field3dup1"); + entry_clone_(&entry); + if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 4, entry, /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(own) on end of non-empty array..."); + vc_insert_new_(&entry, vorbiscomment, 5, "name3=field3dup1"); + entry_clone_(&entry); + if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 5, entry, /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(first, own)..."); + vc_replace_new_(&entry, vorbiscomment, "name3=field3new1", /*all=*/false); + entry_clone_(&entry); + if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/false, /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + if(block->data.vorbis_comment.num_comments != 6) { + printf("FAILED, expected 6 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(all, own)..."); + vc_replace_new_(&entry, vorbiscomment, "name3=field3new2", /*all=*/true); + entry_clone_(&entry); + if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/true, /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(vorbiscomment, block)) + return false; + if(block->data.vorbis_comment.num_comments != 4) { + printf("FAILED, expected 4 comments, got %u\n", block->data.vorbis_comment.num_comments); + return false; + } + printf("OK\n"); + printf("testing FLAC__metadata_object_vorbiscomment_delete_comment() on middle of array..."); vc_delete_(vorbiscomment, 2); if(!FLAC__metadata_object_vorbiscomment_delete_comment(block, 2)) { printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1078,7 +1530,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1088,7 +1540,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1096,7 +1548,7 @@ FLAC__bool test_metadata_object() vc_set_new_(&entry, vorbiscomment, 0, "name5=field5"); entry_clone_(&entry); FLAC__metadata_object_vorbiscomment_set_comment(block, 0, entry, /*copy=*/false); - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1104,7 +1556,7 @@ FLAC__bool test_metadata_object() vc_set_vs_new_(&entry, vorbiscomment, "name6=field6"); entry_clone_(&entry); FLAC__metadata_object_vorbiscomment_set_vendor_string(block, entry, /*copy=*/false); - if(!compare_block_(vorbiscomment, block)) + if(!mutils__compare_block(vorbiscomment, block)) return false; printf("OK\n"); @@ -1114,7 +1566,6 @@ FLAC__bool test_metadata_object() printf("OK\n"); - printf("testing CUESHEET\n"); { @@ -1170,7 +1621,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1180,7 +1631,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1190,7 +1641,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1200,7 +1651,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1210,7 +1661,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1220,7 +1671,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1230,7 +1681,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1240,7 +1691,17 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_cuesheet_insert_blank_track() on end of non-empty array..."); + cs_insert_new_(&track, cuesheet, 4, 0, 0, "\0\0\0\0\0\0\0\0\0\0\0\0", false, false); + if(!FLAC__metadata_object_cuesheet_insert_blank_track(block, 4)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1250,7 +1711,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -1258,13 +1719,23 @@ FLAC__bool test_metadata_object() FLAC__metadata_object_delete(blockcopy); printf("OK\n"); + printf("testing FLAC__metadata_object_cuesheet_delete_track() on end of array..."); + cs_delete_(cuesheet, 4); + if(!FLAC__metadata_object_cuesheet_delete_track(block, 4)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(cuesheet, block)) + return false; + printf("OK\n"); + printf("testing FLAC__metadata_object_cuesheet_delete_track() on middle of array..."); cs_delete_(cuesheet, 2); if(!FLAC__metadata_object_cuesheet_delete_track(block, 2)) { printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1274,7 +1745,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1284,14 +1755,14 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); printf("testing FLAC__metadata_object_cuesheet_set_track(copy)..."); cs_set_new_(&track, cuesheet, 0, 40, 5, "EBCDE1234567", false, false); FLAC__metadata_object_cuesheet_set_track(block, 0, &track, /*copy=*/true); - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1301,7 +1772,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1311,7 +1782,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1321,55 +1792,67 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); - index.offset = 0; - index.number = 1; + indx.offset = 0; + indx.number = 1; printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on empty array..."); - tr_insert_new_(cuesheet, 0, 0, index); - if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, index)) { + tr_insert_new_(cuesheet, 0, 0, indx); + if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, indx)) { printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); - index.offset = 10; - index.number = 2; + indx.offset = 10; + indx.number = 2; printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on beginning of non-empty array..."); - tr_insert_new_(cuesheet, 0, 0, index); - if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, index)) { + tr_insert_new_(cuesheet, 0, 0, indx); + if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 0, indx)) { printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); - index.offset = 20; - index.number = 3; + indx.offset = 20; + indx.number = 3; printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on middle of non-empty array..."); - tr_insert_new_(cuesheet, 0, 1, index); - if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 1, index)) { + tr_insert_new_(cuesheet, 0, 1, indx); + if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 1, indx)) { printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); - index.offset = 30; - index.number = 4; + indx.offset = 30; + indx.number = 4; printf("testing FLAC__metadata_object_cuesheet_track_insert_index() on end of non-empty array..."); - tr_insert_new_(cuesheet, 0, 3, index); - if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 3, index)) { + tr_insert_new_(cuesheet, 0, 3, indx); + if(!FLAC__metadata_object_cuesheet_track_insert_index(block, 0, 3, indx)) { printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) + return false; + printf("OK\n"); + + indx.offset = 0; + indx.number = 0; + printf("testing FLAC__metadata_object_cuesheet_track_insert_blank_index() on end of non-empty array..."); + tr_insert_new_(cuesheet, 0, 4, indx); + if(!FLAC__metadata_object_cuesheet_track_insert_blank_index(block, 0, 4)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1379,7 +1862,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(block, blockcopy)) + if(!mutils__compare_block(block, blockcopy)) return false; printf("OK\n"); @@ -1387,13 +1870,23 @@ FLAC__bool test_metadata_object() FLAC__metadata_object_delete(blockcopy); printf("OK\n"); + printf("testing FLAC__metadata_object_cuesheet_track_delete_index() on end of array..."); + tr_delete_(cuesheet, 0, 4); + if(!FLAC__metadata_object_cuesheet_track_delete_index(block, 0, 4)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(cuesheet, block)) + return false; + printf("OK\n"); + printf("testing FLAC__metadata_object_cuesheet_track_delete_index() on middle of array..."); tr_delete_(cuesheet, 0, 2); if(!FLAC__metadata_object_cuesheet_track_delete_index(block, 0, 2)) { printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1403,7 +1896,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1413,7 +1906,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1437,7 +1930,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1448,7 +1941,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1459,7 +1952,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1470,7 +1963,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1481,7 +1974,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1491,7 +1984,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1501,7 +1994,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1511,7 +2004,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned false\n"); return false; } - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1519,7 +2012,7 @@ FLAC__bool test_metadata_object() cs_set_new_(&track, cuesheet, 0, 100, 11, "KBCDE1234567", false, false); track_clone_(&track); FLAC__metadata_object_cuesheet_set_track(block, 0, &track, /*copy=*/false); - if(!compare_block_(cuesheet, block)) + if(!mutils__compare_block(cuesheet, block)) return false; printf("OK\n"); @@ -1539,5 +2032,254 @@ FLAC__bool test_metadata_object() printf("OK\n"); + printf("testing PICTURE\n"); + + printf("testing FLAC__metadata_object_new()... "); + block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PICTURE); + if(0 == block) { + printf("FAILED, returned NULL\n"); + return false; + } + expected_length = ( + FLAC__STREAM_METADATA_PICTURE_TYPE_LEN + + FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN + + FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN + + FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN + + FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN + + FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN + + FLAC__STREAM_METADATA_PICTURE_COLORS_LEN + + FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN + ) / 8; + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return false; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_clone()... "); + picture = FLAC__metadata_object_clone(block); + if(0 == picture) { + printf("FAILED, returned NULL\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + pi_set_mime_type(picture, "image/png\t"); + printf("testing FLAC__metadata_object_picture_set_mime_type(copy)..."); + if(!FLAC__metadata_object_picture_set_mime_type(block, "image/png\t", /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned true when expecting false\n"); + return false; + } + printf("returned false as expected, violation=\"%s\" OK\n", violation); + } + + pi_set_mime_type(picture, "image/png"); + printf("testing FLAC__metadata_object_picture_set_mime_type(copy)..."); + if(!FLAC__metadata_object_picture_set_mime_type(block, "image/png", /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(!FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned false, violation=\"%s\"\n", violation); + return false; + } + printf("OK\n"); + } + + pi_set_description(picture, (const FLAC__byte *)"DESCRIPTION\xff"); + printf("testing FLAC__metadata_object_picture_set_description(copy)..."); + if(!FLAC__metadata_object_picture_set_description(block, (FLAC__byte *)"DESCRIPTION\xff", /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned true when expecting false\n"); + return false; + } + printf("returned false as expected, violation=\"%s\" OK\n", violation); + } + + pi_set_description(picture, (const FLAC__byte *)"DESCRIPTION"); + printf("testing FLAC__metadata_object_picture_set_description(copy)..."); + if(!FLAC__metadata_object_picture_set_description(block, (FLAC__byte *)"DESCRIPTION", /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(!FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned false, violation=\"%s\"\n", violation); + return false; + } + printf("OK\n"); + } + + + pi_set_data(picture, (const FLAC__byte*)"PNGDATA", strlen("PNGDATA")); + printf("testing FLAC__metadata_object_picture_set_data(copy)..."); + if(!FLAC__metadata_object_picture_set_data(block, (FLAC__byte*)"PNGDATA", strlen("PNGDATA"), /*copy=*/true)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_clone()... "); + blockcopy = FLAC__metadata_object_clone(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return false; + } + if(!mutils__compare_block(block, blockcopy)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + printf("OK\n"); + + pi_set_mime_type(picture, "image/png\t"); + printf("testing FLAC__metadata_object_picture_set_mime_type(own)..."); + if(!FLAC__metadata_object_picture_set_mime_type(block, strdup("image/png\t"), /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned true when expecting false\n"); + return false; + } + printf("returned false as expected, violation=\"%s\" OK\n", violation); + } + + pi_set_mime_type(picture, "image/png"); + printf("testing FLAC__metadata_object_picture_set_mime_type(own)..."); + if(!FLAC__metadata_object_picture_set_mime_type(block, strdup("image/png"), /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(!FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned false, violation=\"%s\"\n", violation); + return false; + } + printf("OK\n"); + } + + pi_set_description(picture, (const FLAC__byte *)"DESCRIPTION\xff"); + printf("testing FLAC__metadata_object_picture_set_description(own)..."); + if(!FLAC__metadata_object_picture_set_description(block, (FLAC__byte *)strdup("DESCRIPTION\xff"), /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned true when expecting false\n"); + return false; + } + printf("returned false as expected, violation=\"%s\" OK\n", violation); + } + + pi_set_description(picture, (const FLAC__byte *)"DESCRIPTION"); + printf("testing FLAC__metadata_object_picture_set_description(own)..."); + if(!FLAC__metadata_object_picture_set_description(block, (FLAC__byte *)strdup("DESCRIPTION"), /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_picture_is_legal()..."); + { + const char *violation; + if(!FLAC__metadata_object_picture_is_legal(block, &violation)) { + printf("FAILED, returned false, violation=\"%s\"\n", violation); + return false; + } + printf("OK\n"); + } + + pi_set_data(picture, (const FLAC__byte*)"PNGDATA", strlen("PNGDATA")); + printf("testing FLAC__metadata_object_picture_set_data(own)..."); + if(!FLAC__metadata_object_picture_set_data(block, (FLAC__byte*)strdup("PNGDATA"), strlen("PNGDATA"), /*copy=*/false)) { + printf("FAILED, returned false\n"); + return false; + } + if(!mutils__compare_block(picture, block)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_clone()... "); + blockcopy = FLAC__metadata_object_clone(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return false; + } + if(!mutils__compare_block(block, blockcopy)) + return false; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(picture); + FLAC__metadata_object_delete(block); + printf("OK\n"); + + return true; }