From 966478bb62a73ed6706e1db3fc604394b573d4fd Mon Sep 17 00:00:00 2001 From: Ketsia Date: Tue, 10 Sep 2024 21:12:55 +0200 Subject: [PATCH 1/3] improve example test by sorting output --- internal/common/debug/example_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index bb3627737..3a7649a3a 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -23,6 +23,8 @@ package debug import ( "encoding/json" "fmt" + "slices" + "strings" "sync" "go.uber.org/atomic" @@ -75,6 +77,14 @@ func (ati *activityTrackerImpl) Stats() Activities { }{Info: a, Count: count}) } } + slices.SortFunc( + activities, + func(a, b struct { + Info ActivityInfo + Count int64 + }) int { + return strings.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) + }) return activities } From b43a28f25b5958834bccebe33fb0fce917a69897 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Tue, 10 Sep 2024 21:41:20 +0200 Subject: [PATCH 2/3] replace slices pkg with sort --- internal/common/debug/example_test.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index 3a7649a3a..4449f34c2 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -23,7 +23,7 @@ package debug import ( "encoding/json" "fmt" - "slices" + "sort" "strings" "sync" @@ -77,14 +77,9 @@ func (ati *activityTrackerImpl) Stats() Activities { }{Info: a, Count: count}) } } - slices.SortFunc( - activities, - func(a, b struct { - Info ActivityInfo - Count int64 - }) int { - return strings.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) - }) + sort.Slice(activities, func(i, j int) bool { + return strings.Compare(strings.ToLower(activities[i].Info.ActivityType), strings.ToLower(activities[j].Info.ActivityType)) < 0 + }) return activities } From 9da3feab84081176c516e4d12ec00ff2c9daebe3 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Tue, 10 Sep 2024 22:36:58 +0200 Subject: [PATCH 3/3] address comments --- internal/common/debug/example_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index 4449f34c2..a60130722 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -78,7 +78,7 @@ func (ati *activityTrackerImpl) Stats() Activities { } } sort.Slice(activities, func(i, j int) bool { - return strings.Compare(strings.ToLower(activities[i].Info.ActivityType), strings.ToLower(activities[j].Info.ActivityType)) < 0 + return strings.Compare(activities[i].Info.ActivityType, activities[j].Info.ActivityType) < 0 }) return activities }