From patchwork Mon Feb 24 15:27:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seyi Kuforiji X-Patchwork-Id: 13988368 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5E967DA7F for ; Mon, 24 Feb 2025 15:27:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410876; cv=none; b=SY2e6qkUWOe8gBwfhllKSKsHCftHy/y8OWEkQbdstNjH5lQ8Cph8/sEVDBNglk+g+ytNYwJttl7Xg4qGAhjdIQqHwQy7R+4eXcGLBT5fIvIIs7j1pzyDQP9UpQfJlOYhwvo5M14bmaVv2PjQpffKMpBw7AsbNWYK3VmKMCyABMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410876; c=relaxed/simple; bh=QFRjOlzRq5DY/Xu9KebYSiPvF4g4mGUOpvrXSwGq/Q4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C/QvbVl1Qe9DMzmRRHqQdjX8nqWe+PgMm2DKMTMwNnhLMwuhG9QZj7AqTraTvuVIIkuCSoe4qfgfQNIhtY77U2b2vEjZ/bb9AyolNvFR9u9oqwTjKf71HZ2bGfREGIrGC6pq8GEKcKu/BkuPIdm6+dxQb3JDXOlRE1Qcsdx+JDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q3EjcJHh; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q3EjcJHh" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4397dff185fso39874155e9.2 for ; Mon, 24 Feb 2025 07:27:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740410872; x=1741015672; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N3BxshT2jsCWCs6KcKUYJB0MFdzxLIb2ESWXfh/Cuqc=; b=Q3EjcJHhE5fSiNq/jkUbn1y+hMOT/JXTPOgS1th+gCyzU+Y/DTB40TUabuunSIlavB DLJrRGcK6eMEtYWKoisnXPS4VtsuwRXFApTC3UZTeT5jDnFrfpawSKiYN78qduUAUYTL RVZ7OioTe1btnyHKrSB8qkVqh0xrrX76JA4gVE//BNtdK2kI7Qv9TS7Y9QrVbzCYBhKx DzEoggWDp/uyJ7CTb2W16YTMdqF8lCzPC9UI0o990Qlt8r7q19ttKV9308t6qMosJqAP +kj12umjhkWGobBg8XAsF7gZUy6ict1H2FjgK4Dua8vIuYXnwy9fNSu5rN8XAX4hekys P4tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740410872; x=1741015672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N3BxshT2jsCWCs6KcKUYJB0MFdzxLIb2ESWXfh/Cuqc=; b=UdF3kfnBncMZj5K3uuKIyO3IY7FgfecA5WRh0PysQt5weLwh1R+YMX3fLxFOsiOClB unBUPZEdmd6b8GubuTjDaLK0Hpta/7UJ+z9OHRpRubKW6KC2r136r1Di+QTRwWOQ/UoH /BXQh1Nmj8ad6wUb8eYkeOp6d/PTQ+7Z+NtVTOg88b3WQvHvrTciJ50tVpV+MmzcISPk mcjttqiL/xxePBDlyAI2hoUPxsY2x2jp2E8vHOibSmcvvUOMdgRC0tiGiX8uS6iCyVB9 y3NWOqqrm8bHdJFTtS8DSx1pNe2XpUIVULa3ck2vsApDcPG845kXraTpibM0YLXZs+uj yLnw== X-Gm-Message-State: AOJu0YwRpEwdcjY413gft2MJchD2E5MpDgab9HtiUDvP3lGU+9YLMZA7 dSqctw0ZRQRWFKQeOyxbb1ntzPcEXCIj4DoQPwn6ggHBJe4Iz6qWYI62J6oSZ6fcuw== X-Gm-Gg: ASbGnctm7VSda53/5ZlbqfCgqG8cotmtN6WryiXl5hreLLzm4nPCJXbBlo2hkZu6x4v Q6U7l/beLkU28GYQdrnZaZb+PRY+vCPSay1sPaOfSZq8NLhrjetzEgxidp5d86q2gokD8Lgg1YA 0OjxbTI15y9VzNqJTlAHPgprgUVkRR3y4q7Fre0JZa9YFB91N+slHFB7fpVr8OSnib/qo2FyhGf +BukBWeNn+kSvRmSe8uuJ8UBIOTajiVNmet6qRukcEADD5caQauHjx2KTDuP31MGwMfIRu+XeKS +Z8JP3DJTdgVYqhGuuQMuP8aB9CKg1po4cJGY9U= X-Google-Smtp-Source: AGHT+IHsOboEGh+VAb+pOCD6o9MpatKCpCBE7oJDLStYLwZBGW+yTeo4sOcrgfHsKkwY5kiH3pXQLw== X-Received: by 2002:a05:600c:548a:b0:439:4700:9eb3 with SMTP id 5b1f17b1804b1-439ae1d7ebfmr110160435e9.3.1740410871574; Mon, 24 Feb 2025 07:27:51 -0800 (PST) Received: from localhost.localdomain ([41.217.53.197]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-439b02e425esm109048915e9.17.2025.02.24.07.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 07:27:51 -0800 (PST) From: Seyi Kuforiji To: git@vger.kernel.org Cc: ps@pks.im, phillip.wood@dunelm.org.uk, Seyi Kuforiji Subject: [PATCH v2 1/4] t/unit-tests: implement clar specific oid helper functions Date: Mon, 24 Feb 2025 16:27:01 +0100 Message-ID: <20250224152704.70289-2-kuforiji98@gmail.com> X-Mailer: git-send-email 2.47.0.86.g15030f9556 In-Reply-To: <20250224152704.70289-1-kuforiji98@gmail.com> References: <20250220082959.10854-1-kuforiji98@gmail.com> <20250224152704.70289-1-kuforiji98@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 `get_oid_arbitrary_hex()` and `init_hash_algo()` are both required for oid-related tests to run without errors. In the current implementation, both functions are defined and declared in the `t/unit-tests/lib-oid.{c,h}` which is utilized by oid-related tests in the homegrown unit tests structure. Adapt functions in lib-oid.{c,h} to use clar. Both these functions become available for oid-related test files implemented using the clar testing framework, which requires them. This will be used by subsequent commits. Mentored-by: Patrick Steinhardt Signed-off-by: Seyi Kuforiji --- Makefile | 2 +- t/meson.build | 2 +- t/unit-tests/lib-oid.c | 31 +++++++++++-------------------- t/unit-tests/lib-oid.h | 9 ++++++--- t/unit-tests/unit-test.c | 2 ++ 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index bcf5ed3f85..81799488f0 100644 --- a/Makefile +++ b/Makefile @@ -1365,6 +1365,7 @@ CLAR_TEST_PROG = $(UNIT_TEST_BIN)/unit-tests$(X) CLAR_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(CLAR_TEST_SUITES)) CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o +CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o UNIT_TEST_PROGRAMS += t-oid-array UNIT_TEST_PROGRAMS += t-oidmap @@ -1381,7 +1382,6 @@ UNIT_TEST_PROGRAMS += t-trailer UNIT_TEST_PROGRAMS += t-urlmatch-normalization UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS)) UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o -UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/lib-reftable.o # xdiff and reftable libs may in turn depend on what is in libgit.a diff --git a/t/meson.build b/t/meson.build index 780939d49f..862cf1cfd4 100644 --- a/t/meson.build +++ b/t/meson.build @@ -14,6 +14,7 @@ clar_test_suites = [ clar_sources = [ 'unit-tests/clar/clar.c', 'unit-tests/unit-test.c', + 'unit-tests/lib-oid.c' ] clar_decls_h = custom_target( @@ -68,7 +69,6 @@ foreach unit_test_program : unit_test_programs unit_test = executable(unit_test_name, sources: [ 'unit-tests/test-lib.c', - 'unit-tests/lib-oid.c', 'unit-tests/lib-reftable.c', unit_test_program, ], diff --git a/t/unit-tests/lib-oid.c b/t/unit-tests/lib-oid.c index 8f0ccac532..8bf09ea1cb 100644 --- a/t/unit-tests/lib-oid.c +++ b/t/unit-tests/lib-oid.c @@ -1,9 +1,9 @@ -#include "test-lib.h" +#include "unit-test.h" #include "lib-oid.h" #include "strbuf.h" #include "hex.h" -int init_hash_algo(void) +int cl_setup_hash_algo(void) { static int algo = -1; @@ -11,42 +11,33 @@ int init_hash_algo(void) const char *algo_name = getenv("GIT_TEST_DEFAULT_HASH"); algo = algo_name ? hash_algo_by_name(algo_name) : GIT_HASH_SHA1; - if (!check(algo != GIT_HASH_UNKNOWN)) - test_msg("BUG: invalid GIT_TEST_DEFAULT_HASH value ('%s')", - algo_name); + cl_assert(algo != GIT_HASH_UNKNOWN); } return algo; } -static int get_oid_arbitrary_hex_algop(const char *hex, struct object_id *oid, +static void cl_parse_oid(const char *hex, struct object_id *oid, const struct git_hash_algo *algop) { int ret; size_t sz = strlen(hex); struct strbuf buf = STRBUF_INIT; - if (!check(sz <= algop->hexsz)) { - test_msg("BUG: hex string (%s) bigger than maximum allowed (%lu)", - hex, (unsigned long)algop->hexsz); - return -1; - } + cl_assert(sz <= algop->hexsz); strbuf_add(&buf, hex, sz); strbuf_addchars(&buf, '0', algop->hexsz - sz); - ret = get_oid_hex_algop(buf.buf, oid, algop); - if (!check_int(ret, ==, 0)) - test_msg("BUG: invalid hex input (%s) provided", hex); + cl_assert_equal_i(get_oid_hex_algop(buf.buf, oid, algop), 0); strbuf_release(&buf); - return ret; } -int get_oid_arbitrary_hex(const char *hex, struct object_id *oid) + +void cl_parse_any_oid(const char *hex, struct object_id *oid) { - int hash_algo = init_hash_algo(); + int hash_algo = cl_setup_hash_algo(); - if (!check_int(hash_algo, !=, GIT_HASH_UNKNOWN)) - return -1; - return get_oid_arbitrary_hex_algop(hex, oid, &hash_algos[hash_algo]); + cl_assert(hash_algo != GIT_HASH_UNKNOWN); + cl_parse_oid(hex, oid, &hash_algos[hash_algo]); } diff --git a/t/unit-tests/lib-oid.h b/t/unit-tests/lib-oid.h index 4e77c04bd2..4031775104 100644 --- a/t/unit-tests/lib-oid.h +++ b/t/unit-tests/lib-oid.h @@ -5,6 +5,7 @@ /* * Convert arbitrary hex string to object_id. + * * For example, passing "abc12" will generate * "abc1200000000000000000000000000000000000" hex of length 40 for SHA-1 and * create object_id with that. @@ -12,14 +13,16 @@ * algo is not allowed. The hash algo is decided based on GIT_TEST_DEFAULT_HASH * environment variable. */ -int get_oid_arbitrary_hex(const char *s, struct object_id *oid); + +void cl_parse_any_oid (const char *s, struct object_id *oid); /* * Returns one of GIT_HASH_{SHA1, SHA256, UNKNOWN} based on the value of * GIT_TEST_DEFAULT_HASH environment variable. The fallback value in the * absence of GIT_TEST_DEFAULT_HASH is GIT_HASH_SHA1. It also uses - * check(algo != GIT_HASH_UNKNOWN) before returning to verify if the + * cl_assert(algo != GIT_HASH_UNKNOWN) before returning to verify if the * GIT_TEST_DEFAULT_HASH's value is valid or not. */ -int init_hash_algo(void); + +int cl_setup_hash_algo(void); #endif /* LIB_OID_H */ diff --git a/t/unit-tests/unit-test.c b/t/unit-tests/unit-test.c index fa8818842a..5af645048a 100644 --- a/t/unit-tests/unit-test.c +++ b/t/unit-tests/unit-test.c @@ -1,5 +1,7 @@ #include "unit-test.h" +#include "hex.h" #include "parse-options.h" +#include "strbuf.h" #include "string-list.h" #include "strvec.h" From patchwork Mon Feb 24 15:27:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seyi Kuforiji X-Patchwork-Id: 13988369 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B280C23BCED for ; Mon, 24 Feb 2025 15:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410881; cv=none; b=hhUbbnG3mH76mpPbQ8BWC0wJz3RKIpdnJorZl1w3RseUgAkFGUd8PG2eM9jpbLfE7EHoLsEZL6ZjHQ9XUbnbDZf2Q5T9FgcHL34Y8JvuMYslmPSlHwsd05/yhpMEAw+kBtafiP1FZzNGUo0/XpXdYpvIzd6CygtGqtHs4nyL9DA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410881; c=relaxed/simple; bh=A01EJzzZiByvriqE51xBYmWYBxsYKlH+ASS/hzAjoro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZfccnJw3Ebwh2tn/+PUBK9mAUkiYC9P1b1lHRMg2WsVf9nZtV8iSgAeFog13BfruuZ5vDKWptzlHQfp1L26UYsgYBkHI9WJFlrkSbbXV415dtnjcHPS6Jh/bAHaX6tVBqpRqHL4nB+GHTk/4OqxkfQxlXevlTS8sJXRbECdkRDg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TX6blCDl; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TX6blCDl" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-38f406e9f80so4248585f8f.2 for ; Mon, 24 Feb 2025 07:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740410878; x=1741015678; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WO1c+28Pbxy1nqeTNAkDEuYLGqNpuqYXvjNj66FccDg=; b=TX6blCDlREQAiC5Qt/1NAgnOQZOlkuWRWNE5Ztjd4imlzE15VjuqdRYjUmRciwfGID +CyiDESJFr1kLR1N7GyObLV8lUy6oZdzQcn5SCMabTU8D/ej2pRHy9KeSm8U5Ho17HAR FmNjpFUgND2hHvOZ4EpEC1pXZPLrI0TIC+9BCwpHjgOcwL58FVAGkk4BZ/cp4v280aP7 D+Kq/netuttV9ilNMFsWoDIbAkF0FF5+m9CwY1/+Xi5zC90Oo4U/mJ801B2mEFsdC3Z9 eJO0Wmf5UF9LxwAN8bQLhN2Kxe2P5DwSLzkMaOUZN6HpnWkI5kdqjia/p1LN7e2dKLPV N1Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740410878; x=1741015678; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WO1c+28Pbxy1nqeTNAkDEuYLGqNpuqYXvjNj66FccDg=; b=leA7YbzjgorrF0kBZ+n1yxmiiHkU1x/DfwrUXldzsfvaRPlPcmlvPAv+JlqxFKzphp SUfknf7pLoGDIj2RFAG6RWTGvyGsbm5/UNa8SnPlLKoWYnttQ9kA42J/xXmojzonCJmC ug0lXbduy7jfBNThCYDA41HdUyKocXy071OA520VyJVkg7rRUv193a4NJBC3ZB9DChoW Bqh/FtyexywGyiaV47rWCl3ce2AJ333dDpjCf17Oipj4GGXMjRY9PAPORDTxj+jAIPmf dV9+SGZzAmeW2+pHUWxHYLHt1Iwb1LJ/J8wVjkuQoeg4T2Mk8cjUyOqwqFKbGx5vIcF7 SJAQ== X-Gm-Message-State: AOJu0Yxp8JU4KfWnKIhIT09WTteB72lEBG2nyaJPrKMTunUDvqiQ8J9Z sCPA1xoXQMh8recMltrKiPyW5f5QvZ7LygiC0trNt8qiPRfmIVg2s++3RyPIc6F42g== X-Gm-Gg: ASbGnctK1TOLTC0WtNuSzWbhC+aljbAxmTg9buPIfXjXYCAlx0ChE5x87y3HD89Pq+d +tDGbWBVJtMonsedRyN84pUljqqxc6fT4actPRpkuQS1C5xK8//m17QOGxql3UonV7tqdu/VjGs 5ny1XSOCm9cVhNJb9ZUcS+yyAsKBg6qXK7xFzj0Muxid8NKIKeN9QXw2vXD1Vd0qpL/SFruyvZL K1AMNuq85FuYic/2JF9HIrFwfxi1FywH3RV2ukXd8B5oSK87fOc5rvI6YoIinHDHYy1UNseyDrW W1mkMNbAQqKH+QgTVGSZHWmsiBlstUexM8BZpbs= X-Google-Smtp-Source: AGHT+IEugPWIBUa/jXqqUelsH7ybiuIdHImy6cT1mmfIvBL5B4RRPH0wR9jU0S4UPCwNVusHiOrRPg== X-Received: by 2002:a5d:64c9:0:b0:38f:465d:fdf5 with SMTP id ffacd0b85a97d-38f6e97a12emr10322050f8f.26.1740410877611; Mon, 24 Feb 2025 07:27:57 -0800 (PST) Received: from localhost.localdomain ([41.217.53.197]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-439b02e425esm109048915e9.17.2025.02.24.07.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 07:27:57 -0800 (PST) From: Seyi Kuforiji To: git@vger.kernel.org Cc: ps@pks.im, phillip.wood@dunelm.org.uk, Seyi Kuforiji Subject: [PATCH v2 2/4] t/unit-tests: convert oid-array test to use clar test framework Date: Mon, 24 Feb 2025 16:27:02 +0100 Message-ID: <20250224152704.70289-3-kuforiji98@gmail.com> X-Mailer: git-send-email 2.47.0.86.g15030f9556 In-Reply-To: <20250224152704.70289-1-kuforiji98@gmail.com> References: <20250220082959.10854-1-kuforiji98@gmail.com> <20250224152704.70289-1-kuforiji98@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Adapt oid-array test script to clar framework by using clar assertions where necessary. Remove descriptions from macros to reduce redundancy, and move test input arrays to global scope for reuse across multiple test functions. Introduce `test_oid_array__initialize()` to explicitly initialize the hash algorithm. These changes streamline the test suite, making individual tests self-contained and reducing redundant code. Mentored-by: Patrick Steinhardt Signed-off-by: Seyi Kuforiji --- Makefile | 2 +- t/meson.build | 2 +- t/unit-tests/{t-oid-array.c => u-oid-array.c} | 125 +++++++++--------- 3 files changed, 66 insertions(+), 63 deletions(-) rename t/unit-tests/{t-oid-array.c => u-oid-array.c} (34%) diff --git a/Makefile b/Makefile index 81799488f0..c9b0320fcb 100644 --- a/Makefile +++ b/Makefile @@ -1356,6 +1356,7 @@ CLAR_TEST_SUITES += u-example-decorate CLAR_TEST_SUITES += u-hash CLAR_TEST_SUITES += u-hashmap CLAR_TEST_SUITES += u-mem-pool +CLAR_TEST_SUITES += u-oid-array CLAR_TEST_SUITES += u-prio-queue CLAR_TEST_SUITES += u-reftable-tree CLAR_TEST_SUITES += u-strbuf @@ -1367,7 +1368,6 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o -UNIT_TEST_PROGRAMS += t-oid-array UNIT_TEST_PROGRAMS += t-oidmap UNIT_TEST_PROGRAMS += t-oidtree UNIT_TEST_PROGRAMS += t-reftable-basics diff --git a/t/meson.build b/t/meson.build index 862cf1cfd4..1b17a53acc 100644 --- a/t/meson.build +++ b/t/meson.build @@ -4,6 +4,7 @@ clar_test_suites = [ 'unit-tests/u-hash.c', 'unit-tests/u-hashmap.c', 'unit-tests/u-mem-pool.c', + 'unit-tests/u-oid-array.c', 'unit-tests/u-prio-queue.c', 'unit-tests/u-reftable-tree.c', 'unit-tests/u-strbuf.c', @@ -49,7 +50,6 @@ clar_unit_tests = executable('unit-tests', test('unit-tests', clar_unit_tests) unit_test_programs = [ - 'unit-tests/t-oid-array.c', 'unit-tests/t-oidmap.c', 'unit-tests/t-oidtree.c', 'unit-tests/t-reftable-basics.c', diff --git a/t/unit-tests/t-oid-array.c b/t/unit-tests/u-oid-array.c similarity index 34% rename from t/unit-tests/t-oid-array.c rename to t/unit-tests/u-oid-array.c index 45b59a2a51..e48a433f21 100644 --- a/t/unit-tests/t-oid-array.c +++ b/t/unit-tests/u-oid-array.c @@ -1,22 +1,19 @@ #define USE_THE_REPOSITORY_VARIABLE -#include "test-lib.h" +#include "unit-test.h" #include "lib-oid.h" #include "oid-array.h" #include "hex.h" -static int fill_array(struct oid_array *array, const char *hexes[], size_t n) +static void fill_array(struct oid_array *array, const char *hexes[], size_t n) { for (size_t i = 0; i < n; i++) { struct object_id oid; - if (!check_int(get_oid_arbitrary_hex(hexes[i], &oid), ==, 0)) - return -1; + cl_parse_any_oid(hexes[i], &oid); oid_array_append(array, &oid); } - if (!check_uint(array->nr, ==, n)) - return -1; - return 0; + cl_assert_equal_i(array->nr, n); } static int add_to_oid_array(const struct object_id *oid, void *data) @@ -34,30 +31,22 @@ static void t_enumeration(const char **input_args, size_t input_sz, actual = OID_ARRAY_INIT; size_t i; - if (fill_array(&input, input_args, input_sz)) - return; - if (fill_array(&expect, expect_args, expect_sz)) - return; + fill_array(&input, input_args, input_sz); + fill_array(&expect, expect_args, expect_sz); oid_array_for_each_unique(&input, add_to_oid_array, &actual); - if (!check_uint(actual.nr, ==, expect.nr)) - return; - - for (i = 0; i < actual.nr; i++) { - if (!check(oideq(&actual.oid[i], &expect.oid[i]))) - test_msg("expected: %s\n got: %s\n index: %" PRIuMAX, - oid_to_hex(&expect.oid[i]), oid_to_hex(&actual.oid[i]), - (uintmax_t)i); - } + cl_assert_equal_i(actual.nr, expect.nr); + + for (i = 0; i < actual.nr; i++) + cl_assert(oideq(&actual.oid[i], &expect.oid[i])); oid_array_clear(&actual); oid_array_clear(&input); oid_array_clear(&expect); } -#define TEST_ENUMERATION(input, expect, desc) \ - TEST(t_enumeration(input, ARRAY_SIZE(input), expect, ARRAY_SIZE(expect)), \ - desc " works") +#define TEST_ENUMERATION(input, expect) \ + t_enumeration(input, ARRAY_SIZE(input), expect, ARRAY_SIZE(expect)); static void t_lookup(const char **input_hexes, size_t n, const char *query_hex, int lower_bound, int upper_bound) @@ -66,61 +55,75 @@ static void t_lookup(const char **input_hexes, size_t n, const char *query_hex, struct object_id oid_query; int ret; - if (!check_int(get_oid_arbitrary_hex(query_hex, &oid_query), ==, 0)) - return; - if (fill_array(&array, input_hexes, n)) - return; + cl_parse_any_oid(query_hex, &oid_query); + fill_array(&array, input_hexes, n); ret = oid_array_lookup(&array, &oid_query); - if (!check_int(ret, <=, upper_bound) || - !check_int(ret, >=, lower_bound)) - test_msg("oid query for lookup: %s", oid_to_hex(&oid_query)); + cl_assert(ret <= upper_bound); + cl_assert(ret >= lower_bound); oid_array_clear(&array); } -#define TEST_LOOKUP(input_hexes, query, lower_bound, upper_bound, desc) \ - TEST(t_lookup(input_hexes, ARRAY_SIZE(input_hexes), query, \ - lower_bound, upper_bound), \ - desc " works") +#define TEST_LOOKUP(input_hexes, query, lower_bound, upper_bound) \ + t_lookup(input_hexes, ARRAY_SIZE(input_hexes), query, \ + lower_bound, upper_bound); -static void setup(void) +void test_oid_array__initialize(void) { /* The hash algo is used by oid_array_lookup() internally */ - int algo = init_hash_algo(); - if (check_int(algo, !=, GIT_HASH_UNKNOWN)) - repo_set_hash_algo(the_repository, algo); + int algo = cl_setup_hash_algo(); + repo_set_hash_algo(the_repository, algo); } -int cmd_main(int argc UNUSED, const char **argv UNUSED) +static const char *arr_input[] = { "88", "44", "aa", "55" }; +static const char *arr_input_dup[] = { "88", "44", "aa", "55", + "88", "44", "aa", "55", + "88", "44", "aa", "55" }; +static const char *res_sorted[] = { "44", "55", "88", "aa" }; + +void test_oid_array__enumerate_unique(void) { - const char *arr_input[] = { "88", "44", "aa", "55" }; - const char *arr_input_dup[] = { "88", "44", "aa", "55", - "88", "44", "aa", "55", - "88", "44", "aa", "55" }; - const char *res_sorted[] = { "44", "55", "88", "aa" }; - const char *nearly_55; + TEST_ENUMERATION(arr_input, res_sorted); +} + +void test_oid_array__enumerate_duplicate(void) +{ + TEST_ENUMERATION(arr_input_dup, res_sorted); +} + +void test_oid_array__lookup(void) +{ + TEST_LOOKUP(arr_input, "55", 1, 1); +} - if (!TEST(setup(), "setup")) - test_skip_all("hash algo initialization failed"); +void test_oid_array__lookup_non_existent(void) +{ + TEST_LOOKUP(arr_input, "33", INT_MIN, -1); +} + +void test_oid_array__lookup_duplicates(void) +{ + TEST_LOOKUP(arr_input_dup, "55", 3, 5); +} - TEST_ENUMERATION(arr_input, res_sorted, "ordered enumeration"); - TEST_ENUMERATION(arr_input_dup, res_sorted, - "ordered enumeration with duplicate suppression"); +void test_oid_array__lookup_non_existent_dup(void) +{ + TEST_LOOKUP(arr_input_dup, "66", INT_MIN, -1); +} - TEST_LOOKUP(arr_input, "55", 1, 1, "lookup"); - TEST_LOOKUP(arr_input, "33", INT_MIN, -1, "lookup non-existent entry"); - TEST_LOOKUP(arr_input_dup, "55", 3, 5, "lookup with duplicates"); - TEST_LOOKUP(arr_input_dup, "66", INT_MIN, -1, - "lookup non-existent entry with duplicates"); +void test_oid_array__lookup_almost_dup(void) +{ + const char *nearly_55; - nearly_55 = init_hash_algo() == GIT_HASH_SHA1 ? + nearly_55 = cl_setup_hash_algo() == GIT_HASH_SHA1 ? "5500000000000000000000000000000000000001" : "5500000000000000000000000000000000000000000000000000000000000001"; - TEST_LOOKUP(((const char *[]){ "55", nearly_55 }), "55", 0, 0, - "lookup with almost duplicate values"); - TEST_LOOKUP(((const char *[]){ "55", "55" }), "55", 0, 1, - "lookup with single duplicate value"); - return test_done(); + TEST_LOOKUP(((const char *[]){ "55", nearly_55 }), "55", 0, 0); +} + +void test_oid_array__lookup_single_dup(void) +{ + TEST_LOOKUP(((const char *[]){ "55", "55" }), "55", 0, 1); } From patchwork Mon Feb 24 15:27:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seyi Kuforiji X-Patchwork-Id: 13988370 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 141B41FAC52 for ; Mon, 24 Feb 2025 15:28:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410887; cv=none; b=m/QIR843AQ11/2hODt9pamhd2gd4hptFFivdTzbEohLGW5PbAsWsFGgDi3pxg51xMr6laRMiSH29aV71yPBFi4ah8cUEuGYE483lQeVrNrE1y/OVfvXiMtkk8GT5ZX8nNkVlcxCmIxukEmeuDRYsUgJdGdQcGZMWwC1Y51UgyZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410887; c=relaxed/simple; bh=2I3Sxy0+gRaej2+g2kj7a9a7YacCAzgqKhviw2Gw+iw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j/BiCwOEJPbuzwd/azlqXHea2MnWG+NIcYKI0CyiHL8FFMIkr4f8HtlPMpspYFwqNIC+wuA7weJNtSIhHA2pvtRQeksvn84pxuXv6z/n6SECMhUbQcvpF2DGX+9OtxalHghkod6rxyTtHF4Q41cUMpfRCIUo/pg6z0hVhB4K5ag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iSDoGzJm; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iSDoGzJm" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43aac0390e8so5441525e9.2 for ; Mon, 24 Feb 2025 07:28:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740410883; x=1741015683; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=52pGapUxpqKwFzQKL/kANoHc4ZzG6RaXxnCvaVWUCvI=; b=iSDoGzJmaIZQhp/Jkk6RlieBxKJj0+e5M4rtNc2Q6VwXgGOVV/IPzTTD0ZdeHrhteL 064s6ZHoUQrQygiGurHFL/FNS2pAdYQ8FsYJ6q/gjhI6s56C8Oduat23ZlBNvmS3ZOPG N5QabFdDrbsugIxufutYeBnnm9Xmnj3R6XU8+teZI8c5l6u3O9+Vq6z4Xu20CQfeBAit zuw5/4JkS3uPQw/OlFuX0i5azoYSgTWi6Ygz9GxfPahhgUiVqUq86WD8QwwO4GfPxccB 94sNLV2k8CFGN9sTW/LiaT8+QDQ6MwuXlPWsPCrRrG496VC8PSXLH03NpmNYZPuXOSsQ BpFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740410883; x=1741015683; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=52pGapUxpqKwFzQKL/kANoHc4ZzG6RaXxnCvaVWUCvI=; b=W+o6Cmctk9LmMc9gzQvTrP1Pb5RvmHAZ2Q9z54nxG3e1KClHQ+r5xArxNaMzKrhsBf AHLkcafnLVuU7/hHn6ft+t7VIlJgD5HCpWyo8WKEcCWI2bj6TJeh0NuvPkf7pEr3riI2 HM/k3IerUf5v3mZN8Pv/WNSUHjO22ZSR/rzjhwEIpAA4tF7ciKJ6ZH2EnCjsGILDFb9v W7o+m2R1M73mJhkE6pwfYgGlAUXw8HAjXTv5MxVSsNJAobqU3akPc9O8D6snjakKS3ua X8w8v3h1LsxjUiVJXtVaz+KZlT6qZs7lpIUAl0+gzezxTt8c34RZbvGnvS+zzu6PGpDI 6ixA== X-Gm-Message-State: AOJu0Yx1PJ/frW+dpQz7xnvhmBUyv3riWpJf9rAIzA5UDV1Laq9ZqdFe GUcgxw2NZBKp0j+uYMm257xQgwDdbMxunDb70/i9lNQBhInPqmF+LPU9kRsZZaf0ow== X-Gm-Gg: ASbGncss6DWetKAHpfkjSb5VW04EoeFdj3TPOOxQmHWu5eCZRjG25EaRYS6wirVPd8t 1w/5Thjk5Y9HtsU11j/LEX1+Tx/EtzFn2OHcn7WkigCMieGu1GTVXM3qfZlmPVHV9/HNEs+wZI4 UEqq5dWXxAabGc8w73Vh2By3rxHmLOwDzG4vEdx8o8PcWB6a7wgQlvegmPncGoCEcFVJtbMwZ5E 7eYyCw7sDxZ5r4g3AZ9iGVfuzeRXDpVtmmvEjjavGoSsuBb1mI3zmmKSKflgQ5gVQioQj0xtCVe qYoMOY9iQTiTpm88sVQ6Q8ZbsLgypdvSp6A4pGM= X-Google-Smtp-Source: AGHT+IGf8xZoK6mr+/PFSvSiBzyHo2Gp0+x6G9zy3JD+g6FQkj12SeFv+Bw+FUC/kgTcbLbxMQ4/QA== X-Received: by 2002:a05:600c:3150:b0:439:955d:7adb with SMTP id 5b1f17b1804b1-439ae222a7amr141485965e9.30.1740410882723; Mon, 24 Feb 2025 07:28:02 -0800 (PST) Received: from localhost.localdomain ([41.217.53.197]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-439b02e425esm109048915e9.17.2025.02.24.07.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 07:28:02 -0800 (PST) From: Seyi Kuforiji To: git@vger.kernel.org Cc: ps@pks.im, phillip.wood@dunelm.org.uk, Seyi Kuforiji Subject: [PATCH v2 3/4] t/unit-tests: convert oidmap test to use clar test framework Date: Mon, 24 Feb 2025 16:27:03 +0100 Message-ID: <20250224152704.70289-4-kuforiji98@gmail.com> X-Mailer: git-send-email 2.47.0.86.g15030f9556 In-Reply-To: <20250224152704.70289-1-kuforiji98@gmail.com> References: <20250220082959.10854-1-kuforiji98@gmail.com> <20250224152704.70289-1-kuforiji98@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Adapt oidmap test script to clar framework by using clar assertions where necessary. `cl_parse_any_oid()` ensures the hash algorithm is set before parsing. This prevents issues from an uninitialized or invalid hash algorithm. Introduce 'test_oidmap__initialize` handles the to set up of the global oidmap map with predefined key-value pairs, and `test_oidmap__cleanup` frees the oidmap and its entries when all tests are completed. The test loops through all entries to detect multiple errors. With this change, it stops at the first error encountered, making it easier to address it. Mentored-by: Patrick Steinhardt Signed-off-by: Seyi Kuforiji --- Makefile | 2 +- t/meson.build | 2 +- t/unit-tests/{t-oidmap.c => u-oidmap.c} | 153 +++++++++--------------- 3 files changed, 56 insertions(+), 101 deletions(-) rename t/unit-tests/{t-oidmap.c => u-oidmap.c} (32%) diff --git a/Makefile b/Makefile index c9b0320fcb..e4e85e6007 100644 --- a/Makefile +++ b/Makefile @@ -1357,6 +1357,7 @@ CLAR_TEST_SUITES += u-hash CLAR_TEST_SUITES += u-hashmap CLAR_TEST_SUITES += u-mem-pool CLAR_TEST_SUITES += u-oid-array +CLAR_TEST_SUITES += u-oidmap CLAR_TEST_SUITES += u-prio-queue CLAR_TEST_SUITES += u-reftable-tree CLAR_TEST_SUITES += u-strbuf @@ -1368,7 +1369,6 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o -UNIT_TEST_PROGRAMS += t-oidmap UNIT_TEST_PROGRAMS += t-oidtree UNIT_TEST_PROGRAMS += t-reftable-basics UNIT_TEST_PROGRAMS += t-reftable-block diff --git a/t/meson.build b/t/meson.build index 1b17a53acc..d5b83cdb72 100644 --- a/t/meson.build +++ b/t/meson.build @@ -5,6 +5,7 @@ clar_test_suites = [ 'unit-tests/u-hashmap.c', 'unit-tests/u-mem-pool.c', 'unit-tests/u-oid-array.c', + 'unit-tests/u-oidmap.c', 'unit-tests/u-prio-queue.c', 'unit-tests/u-reftable-tree.c', 'unit-tests/u-strbuf.c', @@ -50,7 +51,6 @@ clar_unit_tests = executable('unit-tests', test('unit-tests', clar_unit_tests) unit_test_programs = [ - 'unit-tests/t-oidmap.c', 'unit-tests/t-oidtree.c', 'unit-tests/t-reftable-basics.c', 'unit-tests/t-reftable-block.c', diff --git a/t/unit-tests/t-oidmap.c b/t/unit-tests/u-oidmap.c similarity index 32% rename from t/unit-tests/t-oidmap.c rename to t/unit-tests/u-oidmap.c index b22e52d08b..dc805b7e3c 100644 --- a/t/unit-tests/t-oidmap.c +++ b/t/unit-tests/u-oidmap.c @@ -1,4 +1,4 @@ -#include "test-lib.h" +#include "unit-test.h" #include "lib-oid.h" #include "oidmap.h" #include "hash.h" @@ -18,102 +18,85 @@ static const char *const key_val[][2] = { { "11", "one" }, { "22", "two" }, { "33", "three" } }; -static void setup(void (*f)(struct oidmap *map)) +static struct oidmap map; + +void test_oidmap__initialize(void) { - struct oidmap map = OIDMAP_INIT; - int ret = 0; + oidmap_init(&map, 0); for (size_t i = 0; i < ARRAY_SIZE(key_val); i++){ struct test_entry *entry; FLEX_ALLOC_STR(entry, name, key_val[i][1]); - if ((ret = get_oid_arbitrary_hex(key_val[i][0], &entry->entry.oid))) { - free(entry); - break; - } - entry = oidmap_put(&map, entry); - if (!check(entry == NULL)) - free(entry); + cl_parse_any_oid(key_val[i][0], &entry->entry.oid); + cl_assert(oidmap_put(&map, entry) == NULL); } +} - if (!ret) - f(&map); +void test_oidmap__cleanup(void) +{ oidmap_free(&map, 1); } -static void t_replace(struct oidmap *map) +void test_oidmap__replace(void) { struct test_entry *entry, *prev; FLEX_ALLOC_STR(entry, name, "un"); - if (get_oid_arbitrary_hex("11", &entry->entry.oid)) - return; - prev = oidmap_put(map, entry); - if (!check(prev != NULL)) - return; - check_str(prev->name, "one"); + cl_parse_any_oid("11", &entry->entry.oid); + prev = oidmap_put(&map, entry); + cl_assert(prev != NULL); + cl_assert_equal_s(prev->name, "one"); free(prev); FLEX_ALLOC_STR(entry, name, "deux"); - if (get_oid_arbitrary_hex("22", &entry->entry.oid)) - return; - prev = oidmap_put(map, entry); - if (!check(prev != NULL)) - return; - check_str(prev->name, "two"); + cl_parse_any_oid("22", &entry->entry.oid); + prev = oidmap_put(&map, entry); + cl_assert(prev != NULL); + cl_assert_equal_s(prev->name, "two"); free(prev); } -static void t_get(struct oidmap *map) +void test_oidmap__get(void) { struct test_entry *entry; struct object_id oid; - if (get_oid_arbitrary_hex("22", &oid)) - return; - entry = oidmap_get(map, &oid); - if (!check(entry != NULL)) - return; - check_str(entry->name, "two"); - - if (get_oid_arbitrary_hex("44", &oid)) - return; - check(oidmap_get(map, &oid) == NULL); - - if (get_oid_arbitrary_hex("11", &oid)) - return; - entry = oidmap_get(map, &oid); - if (!check(entry != NULL)) - return; - check_str(entry->name, "one"); + cl_parse_any_oid("22", &oid); + entry = oidmap_get(&map, &oid); + cl_assert(entry != NULL); + cl_assert_equal_s(entry->name, "two"); + + cl_parse_any_oid("44", &oid); + cl_assert(oidmap_get(&map, &oid) == NULL); + + cl_parse_any_oid("11", &oid); + entry = oidmap_get(&map, &oid); + cl_assert(entry != NULL); + cl_assert_equal_s(entry->name, "one"); } -static void t_remove(struct oidmap *map) +void test_oidmap__remove(void) { struct test_entry *entry; struct object_id oid; - if (get_oid_arbitrary_hex("11", &oid)) - return; - entry = oidmap_remove(map, &oid); - if (!check(entry != NULL)) - return; - check_str(entry->name, "one"); - check(oidmap_get(map, &oid) == NULL); + cl_parse_any_oid("11", &oid); + entry = oidmap_remove(&map, &oid); + cl_assert(entry != NULL); + cl_assert_equal_s(entry->name, "one"); + cl_assert(oidmap_get(&map, &oid) == NULL); free(entry); - if (get_oid_arbitrary_hex("22", &oid)) - return; - entry = oidmap_remove(map, &oid); - if (!check(entry != NULL)) - return; - check_str(entry->name, "two"); - check(oidmap_get(map, &oid) == NULL); + cl_parse_any_oid("22", &oid); + entry = oidmap_remove(&map, &oid); + cl_assert(entry != NULL); + cl_assert_equal_s(entry->name, "two"); + cl_assert(oidmap_get(&map, &oid) == NULL); free(entry); - if (get_oid_arbitrary_hex("44", &oid)) - return; - check(oidmap_remove(map, &oid) == NULL); + cl_parse_any_oid("44", &oid); + cl_assert(oidmap_remove(&map, &oid) == NULL); } static int key_val_contains(struct test_entry *entry, char seen[]) @@ -121,8 +104,7 @@ static int key_val_contains(struct test_entry *entry, char seen[]) for (size_t i = 0; i < ARRAY_SIZE(key_val); i++) { struct object_id oid; - if (get_oid_arbitrary_hex(key_val[i][0], &oid)) - return -1; + cl_parse_any_oid(key_val[i][0], &oid); if (oideq(&entry->entry.oid, &oid)) { if (seen[i]) @@ -134,48 +116,21 @@ static int key_val_contains(struct test_entry *entry, char seen[]) return 1; } -static void t_iterate(struct oidmap *map) +void test_oidmap__iterate(void) { struct oidmap_iter iter; struct test_entry *entry; char seen[ARRAY_SIZE(key_val)] = { 0 }; int count = 0; - oidmap_iter_init(map, &iter); + oidmap_iter_init(&map, &iter); while ((entry = oidmap_iter_next(&iter))) { - int ret; - if (!check_int((ret = key_val_contains(entry, seen)), ==, 0)) { - switch (ret) { - case -1: - break; /* error message handled by get_oid_arbitrary_hex() */ - case 1: - test_msg("obtained entry was not given in the input\n" - " name: %s\n oid: %s\n", - entry->name, oid_to_hex(&entry->entry.oid)); - break; - case 2: - test_msg("duplicate entry detected\n" - " name: %s\n oid: %s\n", - entry->name, oid_to_hex(&entry->entry.oid)); - break; - default: - test_msg("BUG: invalid return value (%d) from key_val_contains()", - ret); - break; - } - } else { - count++; + if (key_val_contains(entry, seen) != 0) { + cl_failf("Unexpected entry: name = %s, oid = %s", + entry->name, oid_to_hex(&entry->entry.oid)); } + count++; } - check_int(count, ==, ARRAY_SIZE(key_val)); - check_int(hashmap_get_size(&map->map), ==, ARRAY_SIZE(key_val)); -} - -int cmd_main(int argc UNUSED, const char **argv UNUSED) -{ - TEST(setup(t_replace), "replace works"); - TEST(setup(t_get), "get works"); - TEST(setup(t_remove), "remove works"); - TEST(setup(t_iterate), "iterate works"); - return test_done(); + cl_assert_equal_i(count, ARRAY_SIZE(key_val)); + cl_assert_equal_i(hashmap_get_size(&map.map), ARRAY_SIZE(key_val)); } From patchwork Mon Feb 24 15:27:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seyi Kuforiji X-Patchwork-Id: 13988371 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F556248897 for ; Mon, 24 Feb 2025 15:28:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410893; cv=none; b=QNC8dR0HwPydnkY03N3mXfZeYjpEYrkJEM5mAq/LTxcchjPpjxshFTF60X4rZttE5IihJCen0ismFQ9gR5BuxH8n+rCDWFPfrROB0M4ryGO3NGY/02+3AVJjNYjBrDhYjcWkA5r22hucdcSlRmi/gS+2oftiL1PnUhMKJfxf8Jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740410893; c=relaxed/simple; bh=Jy8UAsmv0M9Ianz70QW37WeM/FMtgRFue80XQrAXUSY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrV53LGDvR4uoV5s/Rf7zNZSxyh+kvLT9Z0KzErECIuN0C5Io1j9qdqsfLo+LukqoMmJfHHcxsi4kvC2zEcymbW0kkxhqWdPDPCJ+XpUrYVPPVodMohx/3Q5N/uCcRZdMfcvAkVYSzq98216ZfeILyPdl//MfbaKwGt6tG/FsX0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JiygDa0W; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JiygDa0W" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-438a3216fc2so43490845e9.1 for ; Mon, 24 Feb 2025 07:28:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740410889; x=1741015689; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0NgQ/SeUGRi4k7g9nIO1t+BNpYgEGEVWcRY2g0N2lSM=; b=JiygDa0WclWj2o2QnTIb3UnbB3V9K8nj8ERHhaiYkZvySNPP4TisA2+N49jFVoxByz M64lgD95D2ON+HVILIwzAOxzoSQ8r8ybILD7WIu3asZRV01+iDPb0yWwtqex8FgCXAdG fxNrx4x/byNzsaMJoEnPJ0ug1Laq1Vsu0j6hv3pWDPd5X/WsLVERnfMHw/ZzRCucwOGN HtTTpB7SkhyvYT6krOQHr4CXSSwfys++DGUYMgJQUry4bye+7+DSdDVomlHhQKQs01h2 CEVoXePaZ6u1WDAGUloEsFWuUhXo+Ba8FvbPKwfJABbcKj/TqSUYHXOaNOwyrrYlFTy5 PiqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740410889; x=1741015689; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0NgQ/SeUGRi4k7g9nIO1t+BNpYgEGEVWcRY2g0N2lSM=; b=MXxL9OkP5pb9saboKSk8OrcD/PcGwmQ73y49lr+pUJWaVT9hCbdVZCdPoX+NYJAUUm yYi8R8d4TFFBvF1xIDRbYcf865jBDlSQhUPAEgkRq3729g+B/7xG+5wP4q5SubgQF5CU oEQQ0xFUnR7x7XvSt2CHV48cjB8QQJjwfjXQzNftGfQurJsRiUm8/tfluw34BZRK1zPJ RjuQOXGNmhiDiQlnpIannMdzexASrFmxk0BQer0B4rAEMQeKV9W2n7+Q4UcGYc0hdPk1 7GYHNSVsQRoYK1N/b45fpeGJVj8D37Hj+uVTlw+bHF7depdsOgwVQRhs8akse82jes7M HlGg== X-Gm-Message-State: AOJu0Yw2526qOl8xdaTsaXp5re6Tv3Is9QgKFk4Wi9FPWY7j8jQiFPPz yzDxix9ArYbaLpl4tS7RiyG2EnYOal6eCg3mjlbqGtuqE3fGoMKAxm8zKjCDKCNCUg== X-Gm-Gg: ASbGncv5ONUCX7lZM+5jpQopo2jkH2X+pO/lgjWYYdaIXuWcp8FM/HsbnhtgOP8Rmy/ yBd+r9B4UoxpXhJkatVcIznaF0GSzCn5l4bC2dQ9GIpNyYRRFgMaVf64uaI5WEvjEtCxCSXIbIb q7tLVK5bJycilev+T3XpqfRJKQygVGqPSV97I6bp6rwuc9OIMcwRFfgNK83G5YZib/lSwy/DCWF jBtjMZ1avfhIFck4bJ4L5ZZZrQ5wTxVVfvZygtllXAP2iMme0wCZ30W8uHjYmQ0qFARCutlhPr5 qyQ9qiCoLNrLN7zZKDcA5JNvNRpWTiTGNE9rdR8= X-Google-Smtp-Source: AGHT+IGh5ovlNNy7phMH4cEZc7HlhmERnxDvU5C0EYu1n6vgUkUjwUvAVxCbsFszo0stOgMmXixBaA== X-Received: by 2002:a05:600c:1910:b0:439:98f6:8bc8 with SMTP id 5b1f17b1804b1-439aebcf61dmr101985245e9.26.1740410888835; Mon, 24 Feb 2025 07:28:08 -0800 (PST) Received: from localhost.localdomain ([41.217.53.197]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-439b02e425esm109048915e9.17.2025.02.24.07.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 07:28:08 -0800 (PST) From: Seyi Kuforiji To: git@vger.kernel.org Cc: ps@pks.im, phillip.wood@dunelm.org.uk, Seyi Kuforiji Subject: [PATCH v2 4/4] t/unit-tests: convert oidtree test to use clar test framework Date: Mon, 24 Feb 2025 16:27:04 +0100 Message-ID: <20250224152704.70289-5-kuforiji98@gmail.com> X-Mailer: git-send-email 2.47.0.86.g15030f9556 In-Reply-To: <20250224152704.70289-1-kuforiji98@gmail.com> References: <20250220082959.10854-1-kuforiji98@gmail.com> <20250224152704.70289-1-kuforiji98@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Adapt oidtree test script to clar framework by using clar assertions where necessary. `cl_parse_any_oid()` ensures the hash algorithm is set before parsing. This prevents issues from an uninitialized or invalid hash algorithm. Introduce 'test_oidtree__initialize` handles the to set up of the global oidtree variable and `test_oidtree__cleanup` frees the oidtree when all tests are completed. With this change, `check_each` stops at the first error encountered, making it easier to address it. Mentored-by: Patrick Steinhardt Signed-off-by: Seyi Kuforiji --- Makefile | 2 +- t/meson.build | 2 +- t/unit-tests/{t-oidtree.c => u-oidtree.c} | 79 +++++++++-------------- 3 files changed, 34 insertions(+), 49 deletions(-) rename t/unit-tests/{t-oidtree.c => u-oidtree.c} (45%) diff --git a/Makefile b/Makefile index e4e85e6007..2b134efc70 100644 --- a/Makefile +++ b/Makefile @@ -1358,6 +1358,7 @@ CLAR_TEST_SUITES += u-hashmap CLAR_TEST_SUITES += u-mem-pool CLAR_TEST_SUITES += u-oid-array CLAR_TEST_SUITES += u-oidmap +CLAR_TEST_SUITES += u-oidtree CLAR_TEST_SUITES += u-prio-queue CLAR_TEST_SUITES += u-reftable-tree CLAR_TEST_SUITES += u-strbuf @@ -1369,7 +1370,6 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/clar/clar.o CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/lib-oid.o -UNIT_TEST_PROGRAMS += t-oidtree UNIT_TEST_PROGRAMS += t-reftable-basics UNIT_TEST_PROGRAMS += t-reftable-block UNIT_TEST_PROGRAMS += t-reftable-merged diff --git a/t/meson.build b/t/meson.build index d5b83cdb72..91699917ff 100644 --- a/t/meson.build +++ b/t/meson.build @@ -6,6 +6,7 @@ clar_test_suites = [ 'unit-tests/u-mem-pool.c', 'unit-tests/u-oid-array.c', 'unit-tests/u-oidmap.c', + 'unit-tests/u-oidtree.c', 'unit-tests/u-prio-queue.c', 'unit-tests/u-reftable-tree.c', 'unit-tests/u-strbuf.c', @@ -51,7 +52,6 @@ clar_unit_tests = executable('unit-tests', test('unit-tests', clar_unit_tests) unit_test_programs = [ - 'unit-tests/t-oidtree.c', 'unit-tests/t-reftable-basics.c', 'unit-tests/t-reftable-block.c', 'unit-tests/t-reftable-merged.c', diff --git a/t/unit-tests/t-oidtree.c b/t/unit-tests/u-oidtree.c similarity index 45% rename from t/unit-tests/t-oidtree.c rename to t/unit-tests/u-oidtree.c index a38754b066..e6eede2740 100644 --- a/t/unit-tests/t-oidtree.c +++ b/t/unit-tests/u-oidtree.c @@ -1,10 +1,12 @@ -#include "test-lib.h" +#include "unit-test.h" #include "lib-oid.h" #include "oidtree.h" #include "hash.h" #include "hex.h" #include "strvec.h" +static struct oidtree ot; + #define FILL_TREE(tree, ...) \ do { \ const char *hexes[] = { __VA_ARGS__ }; \ @@ -16,8 +18,7 @@ static int fill_tree_loc(struct oidtree *ot, const char *hexes[], size_t n) { for (size_t i = 0; i < n; i++) { struct object_id oid; - if (!check_int(get_oid_arbitrary_hex(hexes[i], &oid), ==, 0)) - return -1; + cl_parse_any_oid(hexes[i], &oid); oidtree_insert(ot, &oid); } return 0; @@ -27,10 +28,8 @@ static void check_contains(struct oidtree *ot, const char *hex, int expected) { struct object_id oid; - if (!check_int(get_oid_arbitrary_hex(hex, &oid), ==, 0)) - return; - if (!check_int(oidtree_contains(ot, &oid), ==, expected)) - test_msg("oid: %s", oid_to_hex(&oid)); + cl_parse_any_oid(hex, &oid); + cl_assert_equal_i(oidtree_contains(ot, &oid), expected); } struct expected_hex_iter { @@ -44,19 +43,11 @@ static enum cb_next check_each_cb(const struct object_id *oid, void *data) struct expected_hex_iter *hex_iter = data; struct object_id expected; - if (!check_int(hex_iter->i, <, hex_iter->expected_hexes.nr)) { - test_msg("error: extraneous callback for query: ('%s'), object_id: ('%s')", - hex_iter->query, oid_to_hex(oid)); - return CB_BREAK; - } - - if (!check_int(get_oid_arbitrary_hex(hex_iter->expected_hexes.v[hex_iter->i], - &expected), ==, 0)) - ; /* the data is bogus and cannot be used */ - else if (!check(oideq(oid, &expected))) - test_msg("expected: %s\n got: %s\n query: %s", - oid_to_hex(&expected), oid_to_hex(oid), hex_iter->query); + cl_assert(hex_iter->i < hex_iter->expected_hexes.nr); + cl_parse_any_oid(hex_iter->expected_hexes.v[hex_iter->i], + &expected); + cl_assert_equal_s(oid_to_hex(oid), oid_to_hex(&expected)); hex_iter->i += 1; return CB_CONTINUE; } @@ -75,48 +66,42 @@ static void check_each(struct oidtree *ot, const char *query, ...) strvec_push(&hex_iter.expected_hexes, arg); va_end(hex_args); - if (!check_int(get_oid_arbitrary_hex(query, &oid), ==, 0)) - return; + cl_parse_any_oid(query, &oid); oidtree_each(ot, &oid, strlen(query), check_each_cb, &hex_iter); - if (!check_int(hex_iter.i, ==, hex_iter.expected_hexes.nr)) - test_msg("error: could not find some 'object_id's for query ('%s')", query); + if (hex_iter.i != hex_iter.expected_hexes.nr) + cl_failf("error: could not find some 'object_id's for query ('%s')", query); + strvec_clear(&hex_iter.expected_hexes); } -static void setup(void (*f)(struct oidtree *ot)) +void test_oidtree__initialize(void) { - struct oidtree ot; - oidtree_init(&ot); - f(&ot); - oidtree_clear(&ot); } -static void t_contains(struct oidtree *ot) +void test_oidtree__cleanup(void) { - FILL_TREE(ot, "444", "1", "2", "3", "4", "5", "a", "b", "c", "d", "e"); - check_contains(ot, "44", 0); - check_contains(ot, "441", 0); - check_contains(ot, "440", 0); - check_contains(ot, "444", 1); - check_contains(ot, "4440", 1); - check_contains(ot, "4444", 0); + oidtree_clear(&ot); } -static void t_each(struct oidtree *ot) +void test_oidtree__contains(void) { - FILL_TREE(ot, "f", "9", "8", "123", "321", "320", "a", "b", "c", "d", "e"); - check_each(ot, "12300", "123", NULL); - check_each(ot, "3211", NULL); /* should not reach callback */ - check_each(ot, "3210", "321", NULL); - check_each(ot, "32100", "321", NULL); - check_each(ot, "32", "320", "321", NULL); + FILL_TREE(&ot, "444", "1", "2", "3", "4", "5", "a", "b", "c", "d", "e"); + check_contains(&ot, "44", 0); + check_contains(&ot, "441", 0); + check_contains(&ot, "440", 0); + check_contains(&ot, "444", 1); + check_contains(&ot, "4440", 1); + check_contains(&ot, "4444", 0); } -int cmd_main(int argc UNUSED, const char **argv UNUSED) +void test_oidtree__each(void) { - TEST(setup(t_contains), "oidtree insert and contains works"); - TEST(setup(t_each), "oidtree each works"); - return test_done(); + FILL_TREE(&ot, "f", "9", "8", "123", "321", "320", "a", "b", "c", "d", "e"); + check_each(&ot, "12300", "123", NULL); + check_each(&ot, "3211", NULL); /* should not reach callback */ + check_each(&ot, "3210", "321", NULL); + check_each(&ot, "32100", "321", NULL); + check_each(&ot, "32", "320", "321", NULL); }