From 6b09b11e7783fb0b1a008123c429328d6fe5b661 Mon Sep 17 00:00:00 2001
From: qmuntal <qmuntaldiaz@microsoft.com>
Date: Tue, 7 Jan 2025 18:22:21 +0100
Subject: [PATCH] improve test hierarchy

---
 cshake_test.go | 66 ++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/cshake_test.go b/cshake_test.go
index 962fc6c..89c762d 100644
--- a/cshake_test.go
+++ b/cshake_test.go
@@ -48,25 +48,27 @@ func skipCSHAKEIfNotSupported(t *testing.T, algo string) {
 func TestCSHAKESqueezing(t *testing.T) {
 	const testString = "brekeccakkeccak koax koax"
 	for algo, v := range testShakes {
-		skipCSHAKEIfNotSupported(t, algo)
-
-		d0 := v.constructor([]byte(v.defAlgoName), []byte(v.defCustomStr))
-		d0.Write([]byte(testString))
-		ref := make([]byte, 32)
-		d0.Read(ref)
-
-		d1 := v.constructor([]byte(v.defAlgoName), []byte(v.defCustomStr))
-		d1.Write([]byte(testString))
-		var multiple []byte
-		for range ref {
-			d1.Read(make([]byte, 0))
-			one := make([]byte, 1)
-			d1.Read(one)
-			multiple = append(multiple, one...)
-		}
-		if !bytes.Equal(ref, multiple) {
-			t.Errorf("%s: squeezing %d bytes one at a time failed", algo, len(ref))
-		}
+		t.Run(algo, func(t *testing.T) {
+			skipCSHAKEIfNotSupported(t, algo)
+
+			d0 := v.constructor([]byte(v.defAlgoName), []byte(v.defCustomStr))
+			d0.Write([]byte(testString))
+			ref := make([]byte, 32)
+			d0.Read(ref)
+
+			d1 := v.constructor([]byte(v.defAlgoName), []byte(v.defCustomStr))
+			d1.Write([]byte(testString))
+			var multiple []byte
+			for range ref {
+				d1.Read(make([]byte, 0))
+				one := make([]byte, 1)
+				d1.Read(one)
+				multiple = append(multiple, one...)
+			}
+			if !bytes.Equal(ref, multiple) {
+				t.Errorf("%s: squeezing %d bytes one at a time failed", algo, len(ref))
+			}
+		})
 	}
 }
 
@@ -88,21 +90,23 @@ func TestCSHAKEReset(t *testing.T) {
 	out2 := make([]byte, 32)
 
 	for algo, v := range testShakes {
-		skipCSHAKEIfNotSupported(t, algo)
+		t.Run(algo, func(t *testing.T) {
+			skipCSHAKEIfNotSupported(t, algo)
 
-		// Calculate hash for the first time
-		c := v.constructor(nil, []byte{0x99, 0x98})
-		c.Write(sequentialBytes(0x100))
-		c.Read(out1)
+			// Calculate hash for the first time
+			c := v.constructor(nil, []byte{0x99, 0x98})
+			c.Write(sequentialBytes(0x100))
+			c.Read(out1)
 
-		// Calculate hash again
-		c.Reset()
-		c.Write(sequentialBytes(0x100))
-		c.Read(out2)
+			// Calculate hash again
+			c.Reset()
+			c.Write(sequentialBytes(0x100))
+			c.Read(out2)
 
-		if !bytes.Equal(out1, out2) {
-			t.Error("\nExpected:\n", out1, "\ngot:\n", out2)
-		}
+			if !bytes.Equal(out1, out2) {
+				t.Error("\nExpected:\n", out1, "\ngot:\n", out2)
+			}
+		})
 	}
 }