From patchwork Wed Aug 21 12:30:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandra Pratap X-Patchwork-Id: 13771352 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 5E352190472 for ; Wed, 21 Aug 2024 12:42:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244140; cv=none; b=uk2o+ztiF56riGnpC3Hdqk1o6qIxh7C9TUQYBZinvIglbEzPEQnxPxHcXOrNUAgRObziKBcd7t9vEwrbqmmmFgdM+TzfX5lrki6nDyh36lAvj23NCs0ErZ4xhCTlcstEqvTzGyMw4vPogAn+M4KoxdN7H7cig+NMUKgK+BtNgwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244140; c=relaxed/simple; bh=agZnrMOtyNjNzuJqUc7XskvIpJQwL7dokPxm5FKsbaU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T71SltXlX1LjptSSKajgcu2iIrCyg1dz2w5SimrNQl+gbjNtuI0jqRMSk1Yqytqd3iDXr06CZyzwBfykkqzp56/c6aXIxkajizpke7R6H9SNOi6gsV5p0j181GJCIM/f2FmbHnBI2YfULbaGXjyZZ8sIw59RIzFx5r6CPxBb9ME= 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=kjXiYJml; arc=none smtp.client-ip=209.85.215.181 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="kjXiYJml" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7cd895682fcso248223a12.0 for ; Wed, 21 Aug 2024 05:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724244138; x=1724848938; 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=lPViukUUlapprpV9Rr9pSwpDCDAk1R+nEMTnVCtTuyk=; b=kjXiYJml9lyXJnXTRPUniorRC6SnS4UIaJd1ut4r73haYhdicu6O6S3M3B2x44e4CG Ll8XdTt1WVoRSPaG8HXSCIDKCoGhFABMc7ObaM9YUgHIZgD29O4yPOHi9SPSobgqYUGQ w5INwaFC5tJq7jT5A+2qa2l8JZ3a0nsMWY8UxaAg9HVv+4PCHUxtosLoUDkCW+A60oKT Iz2JMC/wqHrGLiphvNkr2uHfHMkuZzKfF7CqK/4TzNSdziKXpxZ/A9OdGCdBfDGKmPb3 RbWZI+5PvUdedKJNAMlL+t8mqsLZB2EcgIYO4Ppvcd3EFogUnGv7wNeCYxbMEyzx1uxY 4r/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244138; x=1724848938; 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=lPViukUUlapprpV9Rr9pSwpDCDAk1R+nEMTnVCtTuyk=; b=sbSDjRiOPb+CyDdPI+bmaJZnEpLOVGHxcRATc6KXGVUP9wyXV9GaZUGpIy3kGIb1yl JJkYtHaAOgfIIy/r/f9v6/2CJ1FsyYxd6o2Bupx8irQlJUMuRMmFDBPeVkixQSBZhRip EO46X9owv91iG7YjRpzoUv9M1QFscOBRTTGAziXD2Ke1OB2REqQmpP4nhpZq5vGPXwEX HNiPQJdW98Ecr9yaYhscr18fI01VmZCM7Rrnb+YUG7dLW9LvLCh0T1MKi+92rVxqmLVV gnS1LqE+ewfAJtE3MPP957ybCQK81Q48mf3B63S96FeOmMN6acaCFjOYkLmyNK2Vj65t Lx4Q== X-Gm-Message-State: AOJu0Yy6hokY4oWDb50xakF6WfY2zMJULeNPH6kvm+cVct2/IPn7A9Bi sjYgAoMGGZLGTk5lntOaDJZFgIRqyTiFrovvWjK/FwcqjSlnYCQQh3GL10VD X-Google-Smtp-Source: AGHT+IH8CAnPpnb9Kupr/8IF7nwGjTEFrFgwQ4kMMkhlV8tfX1Jb5EFftM/gFm+TsBBE418wgxAzQQ== X-Received: by 2002:a17:90a:c68d:b0:2c9:649c:5e08 with SMTP id 98e67ed59e1d1-2d5e99f84e8mr2094972a91.15.1724244137969; Wed, 21 Aug 2024 05:42:17 -0700 (PDT) Received: from Ubuntu.. ([27.59.95.0]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2d5ebba8853sm1670963a91.56.2024.08.21.05.42.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:42:17 -0700 (PDT) From: Chandra Pratap To: git@vger.kernel.org Cc: Chandra Pratap , Patrick Steinhardt , Christian Couder Subject: [PATCH v3 01/11] t: move reftable/block_test.c to the unit testing framework Date: Wed, 21 Aug 2024 18:00:51 +0530 Message-ID: <20240821124150.4463-2-chandrapratap3519@gmail.com> X-Mailer: git-send-email 2.45.GIT In-Reply-To: <20240821124150.4463-1-chandrapratap3519@gmail.com> References: <20240816175414.5169-1-chandrapratap3519@gmail.com> <20240821124150.4463-1-chandrapratap3519@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 reftable/block_test.c exercises the functions defined in reftable/block.{c, h}. Migrate reftable/block_test.c to the unit testing framework. Migration involves refactoring the tests to use the unit testing framework instead of reftable's test framework and renaming the tests to follow the unit-tests' naming conventions. Mentored-by: Patrick Steinhardt Mentored-by: Christian Couder Signed-off-by: Chandra Pratap --- Makefile | 2 +- reftable/reftable-tests.h | 1 - t/helper/test-reftable.c | 1 - .../unit-tests/t-reftable-block.c | 45 +++++++++---------- 4 files changed, 22 insertions(+), 27 deletions(-) rename reftable/block_test.c => t/unit-tests/t-reftable-block.c (76%) diff --git a/Makefile b/Makefile index 13890710f8..a30cd636f8 100644 --- a/Makefile +++ b/Makefile @@ -1340,6 +1340,7 @@ UNIT_TEST_PROGRAMS += t-oidmap UNIT_TEST_PROGRAMS += t-oidtree UNIT_TEST_PROGRAMS += t-prio-queue UNIT_TEST_PROGRAMS += t-reftable-basics +UNIT_TEST_PROGRAMS += t-reftable-block UNIT_TEST_PROGRAMS += t-reftable-merged UNIT_TEST_PROGRAMS += t-reftable-pq UNIT_TEST_PROGRAMS += t-reftable-record @@ -2681,7 +2682,6 @@ REFTABLE_OBJS += reftable/stack.o REFTABLE_OBJS += reftable/tree.o REFTABLE_OBJS += reftable/writer.o -REFTABLE_TEST_OBJS += reftable/block_test.o REFTABLE_TEST_OBJS += reftable/dump.o REFTABLE_TEST_OBJS += reftable/readwrite_test.o REFTABLE_TEST_OBJS += reftable/stack_test.o diff --git a/reftable/reftable-tests.h b/reftable/reftable-tests.h index 4b666810af..3d9118b91b 100644 --- a/reftable/reftable-tests.h +++ b/reftable/reftable-tests.h @@ -10,7 +10,6 @@ license that can be found in the LICENSE file or at #define REFTABLE_TESTS_H int basics_test_main(int argc, const char **argv); -int block_test_main(int argc, const char **argv); int record_test_main(int argc, const char **argv); int readwrite_test_main(int argc, const char **argv); int stack_test_main(int argc, const char **argv); diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c index 623cf3f0f5..7bdd18430b 100644 --- a/t/helper/test-reftable.c +++ b/t/helper/test-reftable.c @@ -5,7 +5,6 @@ int cmd__reftable(int argc, const char **argv) { /* test from simple to complex. */ - block_test_main(argc, argv); readwrite_test_main(argc, argv); stack_test_main(argc, argv); return 0; diff --git a/reftable/block_test.c b/t/unit-tests/t-reftable-block.c similarity index 76% rename from reftable/block_test.c rename to t/unit-tests/t-reftable-block.c index 90aecd5a7c..f2b9a8a6f4 100644 --- a/reftable/block_test.c +++ b/t/unit-tests/t-reftable-block.c @@ -6,17 +6,13 @@ license that can be found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd */ -#include "block.h" +#include "test-lib.h" +#include "reftable/block.h" +#include "reftable/blocksource.h" +#include "reftable/constants.h" +#include "reftable/reftable-error.h" -#include "system.h" -#include "blocksource.h" -#include "basics.h" -#include "constants.h" -#include "record.h" -#include "test_framework.h" -#include "reftable-tests.h" - -static void test_block_read_write(void) +static void t_block_read_write(void) { const int header_off = 21; /* random */ char *names[30]; @@ -45,7 +41,7 @@ static void test_block_read_write(void) rec.u.ref.refname = (char *) ""; rec.u.ref.value_type = REFTABLE_REF_DELETION; n = block_writer_add(&bw, &rec); - EXPECT(n == REFTABLE_API_ERROR); + check_int(n, ==, REFTABLE_API_ERROR); for (i = 0; i < N; i++) { char name[100]; @@ -59,11 +55,11 @@ static void test_block_read_write(void) n = block_writer_add(&bw, &rec); rec.u.ref.refname = NULL; rec.u.ref.value_type = REFTABLE_REF_DELETION; - EXPECT(n == 0); + check_int(n, ==, 0); } n = block_writer_finish(&bw); - EXPECT(n > 0); + check_int(n, >, 0); block_writer_release(&bw); @@ -73,11 +69,11 @@ static void test_block_read_write(void) while (1) { int r = block_iter_next(&it, &rec); - EXPECT(r >= 0); + check_int(r, >=, 0); if (r > 0) { break; } - EXPECT_STREQ(names[j], rec.u.ref.refname); + check_str(names[j], rec.u.ref.refname); j++; } @@ -90,20 +86,20 @@ static void test_block_read_write(void) strbuf_addstr(&want, names[i]); n = block_iter_seek_key(&it, &br, &want); - EXPECT(n == 0); + check_int(n, ==, 0); n = block_iter_next(&it, &rec); - EXPECT(n == 0); + check_int(n, ==, 0); - EXPECT_STREQ(names[i], rec.u.ref.refname); + check_str(names[i], rec.u.ref.refname); want.len--; n = block_iter_seek_key(&it, &br, &want); - EXPECT(n == 0); + check_int(n, ==, 0); n = block_iter_next(&it, &rec); - EXPECT(n == 0); - EXPECT_STREQ(names[10 * (i / 10)], rec.u.ref.refname); + check_int(n, ==, 0); + check_str(names[10 * (i / 10)], rec.u.ref.refname); block_iter_close(&it); } @@ -116,8 +112,9 @@ static void test_block_read_write(void) } } -int block_test_main(int argc, const char *argv[]) +int cmd_main(int argc, const char *argv[]) { - RUN_TEST(test_block_read_write); - return 0; + TEST(t_block_read_write(), "read-write operations on blocks work"); + + return test_done(); }