From: Jonathan Dieter Date: Tue, 13 Nov 2018 13:56:18 +0000 (+0000) Subject: Update tests to work with optional elements rather than optional flags X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~79 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8306c48ed085df9821b36635fb4da7245da3424f;p=zchunk.git Update tests to work with optional elements rather than optional flags Signed-off-by: Jonathan Dieter --- diff --git a/test/files/empty.optelems.zck b/test/files/empty.optelems.zck new file mode 100644 index 0000000..0fbe0d8 Binary files /dev/null and b/test/files/empty.optelems.zck differ diff --git a/test/files/empty.optflags.zck b/test/files/empty.optflags.zck deleted file mode 100644 index 0e0b457..0000000 Binary files a/test/files/empty.optflags.zck and /dev/null differ diff --git a/test/invalid_input_checksum.c b/test/invalid_input_checksum.c index 4def6a4..9b4f109 100644 --- a/test/invalid_input_checksum.c +++ b/test/invalid_input_checksum.c @@ -41,7 +41,7 @@ int main (int argc, char *argv[]) { /* Open zchunk file and verify that an invalid checksum will fail */ int in = open(argv[1], O_RDONLY); if(in < 0) { - perror("Unable to open empty.zck for reading"); + perror("Unable to open empty.optelems.zck for reading"); exit(1); } diff --git a/test/meson.build b/test/meson.build index 407ab35..eeb654c 100644 --- a/test/meson.build +++ b/test/meson.build @@ -4,7 +4,7 @@ incdir = include_directories(['lib', '../src/lib', '../include']) empty = executable('empty', ['empty.c'] + util_sources, include_directories: incdir, dependencies: [zstd_dep, openssl_dep]) -optflag = executable('optflag', ['optflag.c'] + util_sources, +optelems = executable('optelems', ['optelems.c'] + util_sources, include_directories: incdir, dependencies: [zstd_dep, openssl_dep]) invalid_input_checksum = executable('invalid_input_checksum', @@ -57,9 +57,9 @@ test( test( 'check opening file with optional flags', - optflag, + optelems, args: [ - join_paths(file_path, 'empty.optflags.zck') + join_paths(file_path, 'empty.optelems.zck') ] ) @@ -67,7 +67,7 @@ test( 'checksum with non-hex character', invalid_input_checksum, args: [ - join_paths(file_path, 'empty.optflags.zck') + join_paths(file_path, 'empty.optelems.zck') ] ) diff --git a/test/optelems.c b/test/optelems.c new file mode 100644 index 0000000..ab96890 --- /dev/null +++ b/test/optelems.c @@ -0,0 +1,73 @@ +/* + * Copyright 2018 Jonathan Dieter + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "zck_private.h" +#include "util.h" + +int main (int argc, char *argv[]) { + zck_set_log_level(ZCK_LOG_DEBUG); + char data[1000] = {0}; + + /* Open zchunk file and verify that zck->has_optional_elems is set */ + int in = open(argv[1], O_RDONLY); + if(in < 0) { + perror("Unable to open empty.optelems.zck for reading"); + exit(1); + } + + zckCtx *zck = zck_create(); + if(zck == NULL) + exit(1); + if(!zck_init_read(zck, in)) { + printf("%s", zck_get_error(zck)); + exit(1); + } + if(!zck->has_optional_elems) { + printf("zck->has_optional_elems should be set, but isn't"); + exit(1); + } + memset(data, 0, 1000); + ssize_t len = zck_read(zck, data, 1000); + if(len > 0) { + printf("%li bytes read, but file should be empty\n", (long)len); + exit(1); + } + if(!zck_close(zck)) + exit(1); + + zck_free(&zck); + return 0; +} diff --git a/test/optflag.c b/test/optflag.c deleted file mode 100644 index ea6b3a9..0000000 --- a/test/optflag.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2018 Jonathan Dieter - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "zck_private.h" -#include "util.h" - -int main (int argc, char *argv[]) { - zck_set_log_level(ZCK_LOG_DEBUG); - char data[1000] = {0}; - - /* Open zchunk file and verify that zck->has_optional_flags is set */ - int in = open(argv[1], O_RDONLY); - if(in < 0) { - perror("Unable to open empty.zck for reading"); - exit(1); - } - - zckCtx *zck = zck_create(); - if(zck == NULL) - exit(1); - if(!zck_init_read(zck, in)) { - printf("%s", zck_get_error(zck)); - exit(1); - } - if(!zck->has_optional_flags) { - printf("zck->has_optional_flags should be set, but isn't"); - exit(1); - } - memset(data, 0, 1000); - ssize_t len = zck_read(zck, data, 1000); - if(len > 0) { - printf("%li bytes read, but file should be empty\n", (long)len); - exit(1); - } - if(!zck_close(zck)) - exit(1); - - zck_free(&zck); - return 0; -}