From d34806a8aee494952a2bbacc46d053f71b9b91b1 Mon Sep 17 00:00:00 2001
From: John Shumway <jshumway@amd.com>
Date: Mon, 1 Sep 2025 22:04:04 +0000
Subject: [PATCH] Simplify convolution builder tests.

Move static_assert concept checks out of tests and improve instance test names.
---
 .../builder/test/test_conv_builder.cpp         | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/experimental/builder/test/test_conv_builder.cpp b/experimental/builder/test/test_conv_builder.cpp
index 831e49a9d1..0368e4bb79 100644
--- a/experimental/builder/test/test_conv_builder.cpp
+++ b/experimental/builder/test/test_conv_builder.cpp
@@ -13,28 +13,18 @@ struct FwdConvSignature
     static constexpr auto LAYOUT     = ckb::GroupConvLayout::NHWGC_GKYXC_NHWGK;
     static constexpr auto DATA_TYPE  = ckb::DataType::FP16;
 };
-
-TEST(ConvBuilderTest, TestSignature)
-{
-    static_assert(ckb::ConvSignature<FwdConvSignature>);
-    SUCCEED();
-}
+static_assert(ckb::ConvSignature<FwdConvSignature>);
 
 struct FwdConvAlgorithm
 {
     // TODO: Add algorithm info.
 };
-
-TEST(ConvBuilderTest, TestAlgorithm)
-{
-    static_assert(ckb::ConvAlgorithm<FwdConvAlgorithm>);
-    SUCCEED();
-}
+static_assert(ckb::ConvAlgorithm<FwdConvAlgorithm>);
 
 static constexpr char API_VERSION[] = "0.1.0";
 using FwdConvBuilder = ckb::ConvBuilder<FwdConvSignature, FwdConvAlgorithm, API_VERSION>;
 
-TEST(ConvBuilderTest, TestInstance)
+TEST(ConvBuilderTest, TestDefaultInstance)
 {
     EXPECT_EQ(
         FwdConvBuilder::Instance::TypeString(),
@@ -50,7 +40,7 @@ struct ConvFwdXdlBf16CompInstances2xAlgorithm0
     };
 };
 
-TEST(ConvBuilderTest, TestInstance0)
+TEST(ConvBuilderTest, TestConvFwdXdlBf16CompInstances2xInstance0)
 {
     using Builder =
         ckb::ConvBuilder<FwdConvSignature, ConvFwdXdlBf16CompInstances2xAlgorithm0, API_VERSION>;