From 1cb434327a5debbaefdfb3fc5d3d667a277bd4ff Mon Sep 17 00:00:00 2001
From: Aneurin Barker Snook <a@aneur.in>
Date: Sun, 8 Oct 2023 16:20:21 +0100
Subject: [PATCH] number tests

---
 all_test.go    |  4 +--
 chars_test.go  |  4 +--
 email_test.go  |  4 +--
 in_test.go     | 70 ++++++++++++++++++++++++++++----------------------
 length_test.go |  8 +++---
 uuid_test.go   |  4 +--
 6 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/all_test.go b/all_test.go
index bf51489..ef84ef4 100644
--- a/all_test.go
+++ b/all_test.go
@@ -26,8 +26,8 @@ func TestAll(t *testing.T) {
 		{Input: "01abcd", F: f, Err: ErrValueNotAllowed},
 	}
 
-	for _, tc := range testCases {
-		t.Logf("Testing %q", tc.Input)
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %q", n, tc.Input)
 
 		err := tc.F(tc.Input)
 
diff --git a/chars_test.go b/chars_test.go
index 9c40129..09556e6 100644
--- a/chars_test.go
+++ b/chars_test.go
@@ -16,8 +16,8 @@ func TestChars(t *testing.T) {
 		{Input: "abcd 1234", C: hexRange, Err: ErrDisallowedChars},
 	}
 
-	for _, tc := range testCases {
-		t.Logf("Testing %q against %q", tc.Input, tc.C)
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %q against %q", n, tc.Input, tc.C)
 
 		f := Chars(tc.C)
 		err := f(tc.Input)
diff --git a/email_test.go b/email_test.go
index d2f3053..9378418 100644
--- a/email_test.go
+++ b/email_test.go
@@ -13,8 +13,8 @@ func TestEmail(t *testing.T) {
 		{Input: "testexample.com", Err: ErrInvalidEmail},
 	}
 
-	for _, tc := range testCases {
-		t.Logf("Testing %q", tc.Input)
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %q", n, tc.Input)
 
 		err := Email(tc.Input)
 
diff --git a/in_test.go b/in_test.go
index 60a6402..1a9c883 100644
--- a/in_test.go
+++ b/in_test.go
@@ -4,42 +4,50 @@ import (
 	"testing"
 )
 
-func TestIn(t *testing.T) {
-	type TestCase[T comparable] struct {
-		Input T
-		A     []T
+func TestInString(t *testing.T) {
+	type TestCase struct {
+		Input string
+		A     []string
 		Err   error
 	}
 
-	strIn := []string{"abcd", "ef", "1234"}
-	strTestCases := []TestCase[string]{
-		{Input: "abcd", A: strIn},
-		{Input: "ef", A: strIn},
-		{Input: "1234", A: strIn},
-		{Input: "5678", A: strIn, Err: ErrValueNotAllowed},
+	allow := []string{"abcd", "ef", "1234"}
+	testCases := []TestCase{
+		{Input: "abcd", A: allow},
+		{Input: "ef", A: allow},
+		{Input: "1234", A: allow},
+		{Input: "5678", A: allow, Err: ErrValueNotAllowed},
 	}
 
-	for _, tc := range strTestCases {
-		t.Logf("Testing %q against %v", tc.Input, tc.A)
-
-		f := In(tc.A...)
-		err := f(tc.Input)
-
-		if err != tc.Err {
-			t.Errorf("Expected error %v, got %v", tc.Err, err)
-		}
-	}
-
-	intIn := []int{1, 23, 456}
-	intTestCases := []TestCase[int]{
-		{Input: 1, A: intIn},
-		{Input: 23, A: intIn},
-		{Input: 456, A: intIn},
-		{Input: 789, A: intIn, Err: ErrValueNotAllowed},
-	}
-
-	for _, tc := range intTestCases {
-		t.Logf("Testing %d against %v", tc.Input, tc.A)
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %q against %v", n, tc.Input, tc.A)
+
+		f := In(tc.A...)
+		err := f(tc.Input)
+
+		if err != tc.Err {
+			t.Errorf("Expected error %v, got %v", tc.Err, err)
+		}
+	}
+}
+
+func TestInInt(t *testing.T) {
+	type TestCase struct {
+		Input int
+		A     []int
+		Err   error
+	}
+
+	allow := []int{1, 23, 456}
+	testCases := []TestCase{
+		{Input: 1, A: allow},
+		{Input: 23, A: allow},
+		{Input: 456, A: allow},
+		{Input: 789, A: allow, Err: ErrValueNotAllowed},
+	}
+
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %d against %v", n, tc.Input, tc.A)
 
 		f := In(tc.A...)
 		err := f(tc.Input)
diff --git a/length_test.go b/length_test.go
index e0fe015..0d16f14 100644
--- a/length_test.go
+++ b/length_test.go
@@ -16,8 +16,8 @@ func TestMaxLength(t *testing.T) {
 		{Input: "abcdefghi", L: 8, Err: ErrTooManyChars},
 	}
 
-	for _, tc := range testCases {
-		t.Logf("Testing %q against maximum length of %d", tc.Input, tc.L)
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %q against maximum length of %d", n, tc.Input, tc.L)
 
 		f := MaxLength(tc.L)
 		err := f(tc.Input)
@@ -42,8 +42,8 @@ func TestMinLength(t *testing.T) {
 		{Input: "abcdefghi", L: 8},
 	}
 
-	for _, tc := range testCases {
-		t.Logf("Testing %q against minimum length of %d", tc.Input, tc.L)
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %q against minimum length of %d", n, tc.Input, tc.L)
 
 		f := MinLength(tc.L)
 		err := f(tc.Input)
diff --git a/uuid_test.go b/uuid_test.go
index 6981f7a..f46af12 100644
--- a/uuid_test.go
+++ b/uuid_test.go
@@ -18,8 +18,8 @@ func TestUUID(t *testing.T) {
 		{Input: "01234567-89ab-cdef-ghij-klmnopqrstuv", Err: ErrInvalidUUID},
 	}
 
-	for _, tc := range testCases {
-		t.Logf("Testing %q", tc.Input)
+	for n, tc := range testCases {
+		t.Logf("(%d) Testing %q", n, tc.Input)
 
 		err := UUID(tc.Input)