Update examples/tests to use slices/maps for Equal()

Author: IsaacG

exercises/practice/all-your-base/all_your_base_test.go

@@ -1,7 +1,7 @@
 package allyourbase
 
 import (
-	"reflect"
+	"slices"
 	"testing"
 )
 
@@ -15,7 +15,7 @@ func TestConvertToBase(t *testing.T) {
 				} else if tc.expectedError != err.Error() {
 					t.Errorf("ConvertToBase(%d, %#v, %d)\nwant error: %q\ngot: %q", tc.inputBase, tc.inputDigits, tc.outputBase, tc.expectedError, err.Error())
 				}
-			} else if !reflect.DeepEqual(tc.expected, actual) {
+			} else if !slices.Equal(tc.expected, actual) {
 				t.Errorf("ConvertToBase(%d, %#v, %d) = %#v, want: %#v", tc.inputBase, tc.inputDigits, tc.outputBase, actual, tc.expected)
 			}
 		})

exercises/practice/alphametics/alphametics_test.go

@@ -1,7 +1,7 @@
 package alphametics
 
 import (
-	"reflect"
+	"maps"
 	"testing"
 )
 
@@ -16,7 +16,7 @@ func TestSolve(t *testing.T) {
 				}
 			case err != nil:
 				t.Fatalf("Solve(%q)\nwant: %#v\ngot error: %q", tc.input, tc.expected, err)
-			case !reflect.DeepEqual(s, tc.expected):
+			case !maps.Equal(s, tc.expected):
 				t.Fatalf("Solve(%q)\ngot: %#v\nwant: %#v", tc.input, s, tc.expected)
 			}
 		})

exercises/practice/anagram/anagram_test.go

@@ -1,32 +1,23 @@
 package anagram
 
 import (
-	"fmt"
-	"sort"
+	"slices"
 	"testing"
 )
 
 func TestDetectAnagrams(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			actual := Detect(tc.subject, tc.candidates)
-			if !equal(tc.expected, actual) {
+			slices.Sort(actual)
+			slices.Sort(tc.expected)
+			if !slices.Equal(tc.expected, actual) {
 				t.Errorf("Detect(%q, %#v) = %#v, want: %#v", tc.subject, tc.candidates, actual, tc.expected)
 			}
 		})
 	}
 }
 
-func equal(a, b []string) bool {
-	if len(b) != len(a) {
-		return false
-	}
-
-	sort.Strings(a)
-	sort.Strings(b)
-	return fmt.Sprintf("%v", a) == fmt.Sprintf("%v", b)
-}
-
 func BenchmarkDetectAnagrams(b *testing.B) {
 	for range b.N {
 		for _, tt := range testCases {

exercises/practice/bottle-song/bottle_song_test.go

@@ -1,7 +1,7 @@
 package bottlesong
 
 import (
-	"fmt"
+	"slices"
 	"strings"
 	"testing"
 	"unicode"
@@ -11,31 +11,18 @@ func TestRecite(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			actual := Recite(tc.input.startBottles, tc.input.takeDown)
-			if !equal(actual, tc.expected) {
+			if !slices.Equal(actual, tc.expected) {
 				t.Errorf("Recite(%d, %d) = %q, want: %q", tc.input.startBottles, tc.input.takeDown, actual, tc.expected)
 			}
 		})
 	}
 }
 
-func equal(a, b []string) bool {
-	if len(b) != len(a) {
-		return false
-	}
-
-	if len(a) == 0 && len(b) == 0 {
-		return true
-	}
-
-	return fmt.Sprintf("%v", a) == fmt.Sprintf("%v", b)
-}
-
 // Title is a copy of strings.Title function of the stdlib.
 // The copy is here because strings.Title is deprecated but we still
 // want to use this function as the alternative would require us to support
 // external dependencies which we don't yet (tracking issue https://github.com/exercism/go/issues/2379).
 // Students should still be able to use strings.Title if they want.
-// Since this exercise is currently deprecated, this shouldn't matter too much.
 func Title(s string) string {
 	// Use a closure here to remember state.
 	// Hackish but effective. Depends on Map scanning in order and calling

exercises/practice/change/change_test.go

@@ -1,7 +1,7 @@
 package change
 
 import (
-	"reflect"
+	"slices"
 	"testing"
 )
 
@@ -12,7 +12,7 @@ func TestChange(t *testing.T) {
 			if tc.valid {
 				if err != nil {
 					t.Fatalf("Change(%v, %d): want: %v, got error: %v", tc.coins, tc.target, tc.expectedChange, err)
-				} else if !reflect.DeepEqual(actual, tc.expectedChange) {
+				} else if !slices.Equal(actual, tc.expectedChange) {
 					t.Fatalf("Change(%v, %d): want: %#v, got: %#v", tc.coins, tc.target, tc.expectedChange, actual)
 				}
 			} else {

exercises/practice/etl/etl_test.go

@@ -1,6 +1,9 @@
 package etl
 
-import "testing"
+import (
+	"maps"
+	"testing"
+)
 
 var transformTests = []struct {
 	description string
@@ -53,26 +56,10 @@ var transformTests = []struct {
 	},
 }
 
-func equal(actual, expectation map[string]int) bool {
-	if len(actual) != len(expectation) {
-		return false
-	}
-
-	for k, actualVal := range actual {
-		expectationVal, present := expectation[k]
-
-		if !present || actualVal != expectationVal {
-			return false
-		}
-	}
-
-	return true
-}
-
 func TestTransform(t *testing.T) {
 	for _, tt := range transformTests {
 		t.Run(tt.description, func(t *testing.T) {
-			if actual := Transform(tt.input); !equal(actual, tt.expect) {
+			if actual := Transform(tt.input); !maps.Equal(actual, tt.expect) {
 				t.Fatalf("Transform(%v)\ngot: %v\nwant: %v", tt.input, actual, tt.expect)
 			}
 		})

exercises/practice/flatten-array/flatten_array_test.go

@@ -1,7 +1,7 @@
 package flattenarray
 
 import (
-	"reflect"
+	"slices"
 	"testing"
 )
 
@@ -15,7 +15,7 @@ func TestFlatten(t *testing.T) {
 				t.Fatalf("Flatten(%v) = %v (nil slice), want: %v (empty slice)", tc.input, actual, tc.expected)
 			}
 
-			if !reflect.DeepEqual(actual, tc.expected) {
+			if !slices.Equal(actual, tc.expected) {
 				t.Fatalf("Flatten(%v) = %v, want: %v", tc.input, &actual, tc.expected)
 			}
 		})

exercises/practice/forth/forth_test.go

@@ -1,7 +1,7 @@
 package forth
 
 import (
-	"reflect"
+	"slices"
 	"testing"
 )
 
@@ -12,7 +12,7 @@ func TestForth(t *testing.T) {
 			if err == nil {
 				if tc.expected == nil {
 					t.Fatalf("Forth(%#v) expected an error, got %v", tc.input, v)
-				} else if !reflect.DeepEqual(v, tc.expected) {
+				} else if !slices.Equal(v, tc.expected) {
 					t.Fatalf("Forth(%#v) expected %v, got %v", tc.input, tc.expected, v)
 				}
 			} else if tc.expected != nil {

exercises/practice/grep/grep_test.go

@@ -2,7 +2,7 @@ package grep
 
 import (
 	"os"
-	"reflect"
+	"slices"
 	"strings"
 	"testing"
 )
@@ -70,7 +70,7 @@ func TestSearch(t *testing.T) {
 				return
 			}
 
-			if !reflect.DeepEqual(actual, tc.expected) {
+			if !slices.Equal(actual, tc.expected) {
 				t.Errorf("Search(%q, %q, %q)\ngot: %q\nwant: %q", tc.pattern, tc.flags, tc.files, actual, tc.expected)
 			}
 		})

exercises/practice/ocr-numbers/ocr_numbers_test.go

@@ -1,7 +1,7 @@
 package ocr
 
 import (
-	"reflect"
+	"slices"
 	"testing"
 )
 
@@ -168,7 +168,7 @@ var _ = recognizeDigit // step 1.
 func TestRecognize(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
-			if got := Recognize(tc.in); !reflect.DeepEqual(got, tc.out) {
+			if got := Recognize(tc.in); !slices.Equal(got, tc.out) {
 				t.Fatalf("Recognize(%q) = %q, want: %q", tc.in, got, tc.out)
 			}
 		})