Aneurin Barker Snook 1 سال پیش
والد
کامیت
1cb434327a
6فایلهای تغییر یافته به همراه40 افزوده شده و 32 حذف شده
  1. 2 2
      all_test.go
  2. 2 2
      chars_test.go
  3. 2 2
      email_test.go
  4. 28 20
      in_test.go
  5. 4 4
      length_test.go
  6. 2 2
      uuid_test.go

+ 2 - 2
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)
 

+ 2 - 2
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)

+ 2 - 2
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)
 

+ 28 - 20
in_test.go

@@ -4,23 +4,23 @@ 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)
+	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)
@@ -29,17 +29,25 @@ func TestIn(t *testing.T) {
 			t.Errorf("Expected error %v, got %v", tc.Err, err)
 		}
 	}
+}
+
+func TestInInt(t *testing.T) {
+	type TestCase struct {
+		Input int
+		A     []int
+		Err   error
+	}
 
-	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},
+	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 _, tc := range intTestCases {
-		t.Logf("Testing %d against %v", tc.Input, tc.A)
+	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)

+ 4 - 4
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)

+ 2 - 2
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)