From 8306c48ed085df9821b36635fb4da7245da3424f Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter@gmail.com>
Date: Tue, 13 Nov 2018 13:56:18 +0000
Subject: [PATCH] Update tests to work with optional elements rather than
 optional flags

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
 test/files/empty.optelems.zck  | Bin 0 -> 146 bytes
 test/files/empty.optflags.zck  | Bin 112 -> 0 bytes
 test/invalid_input_checksum.c  |   2 +-
 test/meson.build               |   8 ++++----
 test/{optflag.c => optelems.c} |   8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 test/files/empty.optelems.zck
 delete mode 100644 test/files/empty.optflags.zck
 rename test/{optflag.c => optelems.c} (90%)

diff --git a/test/files/empty.optelems.zck b/test/files/empty.optelems.zck
new file mode 100644
index 0000000000000000000000000000000000000000..0fbe0d8b6e5b3a01d21c483f56fd0260c0087c7b
GIT binary patch
literal 146
zcmZRGa`rZCeEoUFf!S;0-tU~|;<cft^_r#o(agXjYZui1?B>q$lD}sAc*7B=8GmF%
zX8rzhVrKqM74>zFPf})2_E|D@rgTNnj?kv2rYY0>3raHc^Ad9uQgc#sQ}ap`N>YnU
W7^cp^Dz0F}Fr~SX0Sz=XGynisXFS3H

literal 0
HcmV?d00001

diff --git a/test/files/empty.optflags.zck b/test/files/empty.optflags.zck
deleted file mode 100644
index 0e0b45721692a092b4e56cdbc6dcc1589c693c56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 112
zcmZRGa`rZCJZWgslYVILEFqZ_?WS8MU9%9B2-dqfb)LG!L$;@Nf0Ir=-f+Ze#vd7x
zS--!Wn3=y*MSY#)la$$$eU?m}DP0k?Bebchqdz1gvseL$5*12Pi%S@$G&eG!frf?#
E03^UHnE(I)

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/optflag.c b/test/optelems.c
similarity index 90%
rename from test/optflag.c
rename to test/optelems.c
index ea6b3a9..ab96890 100644
--- a/test/optflag.c
+++ b/test/optelems.c
@@ -41,10 +41,10 @@ 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 */
+    /* 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.zck for reading");
+        perror("Unable to open empty.optelems.zck for reading");
         exit(1);
     }
 
@@ -55,8 +55,8 @@ int main (int argc, char *argv[]) {
         printf("%s", zck_get_error(zck));
         exit(1);
     }
-    if(!zck->has_optional_flags) {
-        printf("zck->has_optional_flags should be set, but isn't");
+    if(!zck->has_optional_elems) {
+        printf("zck->has_optional_elems should be set, but isn't");
         exit(1);
     }
     memset(data, 0, 1000);
-- 
2.30.2