From 3468a10cbf0ac2516fe4090d2f4e963214340e11 Mon Sep 17 00:00:00 2001
From: Siew Kam Onn <kosiew@gmail.com>
Date: Thu, 25 Sep 2025 16:41:20 +0800
Subject: [PATCH] Refactor tests in coalesce_test.go to use require and assert
 for better error handling and readability

Signed-off-by: Siew Kam Onn <kosiew@gmail.com>
---
 pkg/chart/common/util/coalesce_test.go | 37 +++++++-------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/pkg/chart/common/util/coalesce_test.go b/pkg/chart/common/util/coalesce_test.go
index c1ac66922..f127b5f0f 100644
--- a/pkg/chart/common/util/coalesce_test.go
+++ b/pkg/chart/common/util/coalesce_test.go
@@ -25,6 +25,7 @@ import (
 	"text/template"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
@@ -256,24 +257,14 @@ func TestCoalesceValuesEmptyMapOverride(t *testing.T) {
 	}
 
 	result, err := CoalesceValues(c, overrides)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	config, ok := result["config"].(map[string]interface{})
-	if !ok {
-		t.Fatalf("expected config to remain a map, got %T", result["config"])
-	}
-	if len(config) != 0 {
-		t.Fatalf("expected config map to be empty, got %v", config)
-	}
-	if _, exists := config["foo"]; exists {
-		t.Fatalf("expected config override to drop default key, still found foo in %v", config)
-	}
+	require.Truef(t, ok, "expected config to remain a map, got %T", result["config"])
+	assert.Empty(t, config, "expected config map to be empty")
+	assert.NotContains(t, config, "foo", "expected config override to drop default key")
 
-	if _, exists := result["toDelete"]; exists {
-		t.Fatalf("expected toDelete key to be removed when set to nil override")
-	}
+	assert.NotContains(t, result, "toDelete", "expected toDelete key to be removed when set to nil override")
 }
 
 func ttpl(tpl string, v map[string]interface{}) (string, error) {
@@ -452,18 +443,10 @@ func TestCoalesceTables(t *testing.T) {
 		CoalesceTables(dst, src)
 
 		config, ok := dst["config"].(map[string]interface{})
-		if !ok {
-			t.Fatalf("config should remain a map, got %T", dst["config"])
-		}
-		if len(config) != 0 {
-			t.Fatalf("expected empty config map, got %v", config)
-		}
-		if _, exists := config["enabled"]; exists {
-			t.Fatal("expected default \"enabled\" key to be absent")
-		}
-		if _, exists := config["port"]; exists {
-			t.Fatal("expected default \"port\" key to be absent")
-		}
+		require.Truef(t, ok, "config should remain a map, got %T", dst["config"])
+		assert.Empty(t, config, "expected empty config map")
+		assert.NotContains(t, config, "enabled", "expected default \"enabled\" key to be absent")
+		assert.NotContains(t, config, "port", "expected default \"port\" key to be absent")
 	})
 
 	dst := map[string]interface{}{