fix: change order of params for syncregistry

gkampitakis · Jan 22, 2024 · 3f95f7d · 3f95f7d
1 parent 9394bc9
commit 3f95f7d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/snaps/matchJSON.go b/snaps/matchJSON.go
@@ -64,7 +64,7 @@ func matchJSON(c *config, t testingT, input any, matchers ...match.JSONMatcher)
 	t.Helper()
 
 	snapPath, snapPathRel := snapshotPath(c)
-	testID := testsRegistry.getTestID(t.Name(), snapPath)
+	testID := testsRegistry.getTestID(snapPath, t.Name())
 
 	j, err := validateJSON(input)
 	if err != nil {

diff --git a/snaps/matchSnapshot.go b/snaps/matchSnapshot.go
@@ -55,7 +55,7 @@ func matchSnapshot(c *config, t testingT, values ...any) {
 	}
 
 	snapPath, snapPathRel := snapshotPath(c)
-	testID := testsRegistry.getTestID(t.Name(), snapPath)
+	testID := testsRegistry.getTestID(snapPath, t.Name())
 	snapshot := takeSnapshot(values)
 	prevSnapshot, line, err := getPrevSnapshot(testID, snapPath)
 	if errors.Is(err, errSnapNotFound) {

diff --git a/snaps/snapshot.go b/snaps/snapshot.go
@@ -92,18 +92,18 @@ type syncRegistry struct {
 
 // Returns the id of the test in the snapshot
 // Form [<test-name> - <occurrence>]
-func (s *syncRegistry) getTestID(tName, snapPath string) string {
+func (s *syncRegistry) getTestID(snapPath, testName string) string {
 	s.Lock()
 
 	if _, exists := s.values[snapPath]; !exists {
 		s.values[snapPath] = make(map[string]int)
 	}
 
-	s.values[snapPath][tName]++
-	c := s.values[snapPath][tName]
+	s.values[snapPath][testName]++
+	c := s.values[snapPath][testName]
 	s.Unlock()
 
-	return fmt.Sprintf("[%s - %d]", tName, c)
+	return fmt.Sprintf("[%s - %d]", testName, c)
 }
 
 func newRegistry() *syncRegistry {

diff --git a/snaps/snapshot_test.go b/snaps/snapshot_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gkampitakis/go-snaps/internal/test"
 )
 
-func TestTestID(t *testing.T) {
+func TestSyncRegistry(t *testing.T) {
 	t.Run("should increment id on each call [concurrent safe]", func(t *testing.T) {
 		wg := sync.WaitGroup{}
 		registry := newRegistry()
@@ -17,15 +17,15 @@ func TestTestID(t *testing.T) {
 			wg.Add(1)
 
 			go func() {
-				registry.getTestID("test", "/file")
+				registry.getTestID("/file", "test")
 				wg.Done()
 			}()
 		}
 
 		wg.Wait()
 
-		test.Equal(t, "[test - 6]", registry.getTestID("test", "/file"))
-		test.Equal(t, "[test-v2 - 1]", registry.getTestID("test-v2", "/file"))
+		test.Equal(t, "[test - 6]", registry.getTestID("/file", "test"))
+		test.Equal(t, "[test-v2 - 1]", registry.getTestID("/file", "test-v2"))
 	})
 }