add regress tests for the remainder of the function provided by our uuid.h

diff --git a/regress/lib/libc/uuid/uuidtest.c b/regress/lib/libc/uuid/uuidtest.c
index 9dc838f..9f6fd01 100644 (file)
--- a/regress/lib/libc/uuid/uuidtest.c
+++ b/regress/lib/libc/uuid/uuidtest.c
@@ -1,6 +1,6 @@
-/*     $OpenBSD: uuidtest.c,v 1.1 2021/08/31 09:57:27 jasper Exp $     */
+/*     $OpenBSD: uuidtest.c,v 1.2 2023/07/03 13:51:55 jasper Exp $     */
 /*
- * Copyright (c) 2021 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+ * Copyright (c) 2021, 2023 Jasper Lievisse Adriaanse <jasper@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -26,13 +26,14 @@
 int
 main(int argc, char **argv)
 {
-       struct uuid     uuid, uuid_want;
+       struct uuid     uuid, uuid2, uuid_want;
        char            *uuid_str, *uuid_str_want;
        uint32_t        status;
-       int             t = 1;
+       unsigned char   bin[16];
+       int             rc, t = 1;
 
        /* Test invalid input to uuid_from_string() */
-       printf("[%d] uuid_from_string ", t);
+       printf("[%d] uuid_from_string (invalid) ", t);
        uuid_str = "6fc3134d-011d-463d-a6b4-fe1f3a5e57dX";
        uuid_from_string(uuid_str, &uuid, &status);
        if (status != uuid_s_invalid_string_uuid) {
@@ -44,6 +45,19 @@ main(int argc, char **argv)
        printf("ok\n");
        t++;
 
+       /* Test a bad version gets recognized */
+       printf("[%d] uuid_from_string (bad version) ", t);
+       uuid_str = "ffffffff-ffff-ffff-ffff-ffffffffffff";
+       uuid_from_string(uuid_str, &uuid, &status);
+       if (status != uuid_s_bad_version) {
+               printf("failed to return uuid_s_bad_version for '%s'\n",
+                   uuid_str);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
        /* Test valid input to uuid_from_string() */
        printf("[%d] uuid_from_string ", t);
        uuid_str = "f81d4fae-7dec-11d0-a765-00a0c91e6bf6";
@@ -65,6 +79,7 @@ main(int argc, char **argv)
                printf("failed to return uuid_s_ok for '%s', got %d\n", uuid_str, status);
                return 1;
        }
+
        ASSERT_EQ(uuid.time_low, uuid_want.time_low);
        ASSERT_EQ(uuid.time_mid, uuid_want.time_mid);
        ASSERT_EQ(uuid.time_hi_and_version, uuid_want.time_hi_and_version);
@@ -125,5 +140,122 @@ main(int argc, char **argv)
        printf("ok\n");
        t++;
 
+       /*
+        * Assuming the clock of the system running the test is ahead of the one
+        * where this test was written, we can test uuid_create along with
+        * uuid_compare here.
+        */
+       printf("[%d] uuid_create ", t);
+       uuid_create(&uuid, &status);
+       if (status != uuid_s_ok) {
+               printf("uuid_create failed to return uuid_s_ok, got %d\n",
+                   status);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       printf("[%d] uuid_compare ", t);
+       /* uuid was just generated, uuid2 was generated before. */
+       uuid_from_string(uuid_str, &uuid2, &status);
+       rc = uuid_compare(&uuid, &uuid2, &status);
+       if ((status != uuid_s_ok) || (rc != 1)) {
+               printf("uuid_compare failed, expected 1 got: %d and status: %d\n",
+                   rc, status);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       printf("[%d] uuid_equal ", t);
+       rc = uuid_equal(&uuid, &uuid, &status);
+       if ((status != uuid_s_ok) || (rc != 1)) {
+               printf("uuid_compare failed, expected 1 got: %d and status: %d\n",
+                   rc, status);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       printf("[%d] uuid_equal (nil) ", t);
+       uuid_create_nil(&uuid, &status);
+       rc = uuid_equal(&uuid, &uuid2, &status);
+       if ((status != uuid_s_ok) || (rc != 1)) {
+               printf("uuid_compare failed, expected 1 got: %d and status: %d\n",
+                   rc, status);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       printf("[%d] uuid_hash ", t);
+       uint16_t hash = uuid_hash(&uuid_want, &status);
+       if ((status != uuid_s_ok) || (hash != 0x4fae)) {
+               printf("uuid_hash failed, expected 0x4fae got: 0x%04x and status: %d\n",
+                   hash, status);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       uuid_str_want = "f81d4fae-7dec-11d0-a765-00a0c91e6bf6";
+       printf("[%d] uuid_enc_le ", t);
+       uuid_from_string(uuid_str_want, &uuid, &status);
+       /*
+        * Check two fields to ensure they're in the right order.
+        * If these two are ok, it's safe to assum the rest are too.
+        */
+       uuid_enc_le(bin, &uuid);
+       if (bin[4] != 0xec || bin[5] != 0x7d) {
+               uuid_to_string(&uuid, &uuid_str, &status);
+               printf("uuid_enc_le failed, expected %s got %s\n",
+                   uuid_str_want, uuid_str);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       printf("[%d] uuid_dec_le ", t);
+       uuid_dec_le(bin, &uuid);
+       if (uuid_equal(&uuid, &uuid_want, &status) == 0) {
+               uuid_to_string(&uuid, &uuid_str, &status);
+               printf("uuid_dec_le failed, expected %s got %s\n",
+                   uuid_str_want, uuid_str);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       printf("[%d] uuid_enc_be ", t);
+       uuid_enc_be(bin, &uuid);
+       if (bin[4] != 0x7d || bin[5] != 0xec) {
+               uuid_to_string(&uuid, &uuid_str, &status);
+               printf("uuid_enc_be failed, expected %s got %s\n",
+                   uuid_str_want, uuid_str);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
+       printf("[%d] uuid_dec_be ", t);
+       uuid_dec_be(bin, &uuid);
+       if (uuid_equal(&uuid, &uuid_want, &status) == 0) {
+               uuid_to_string(&uuid, &uuid_str, &status);
+               printf("uuid_dec_be failed, expected %s got %s\n",
+                   uuid_str_want, uuid_str);
+               return 1;
+       }
+
+       printf("ok\n");
+       t++;
+
        return 0;
 }