refactor: use b.Loop() to simplify the code and improve performance

Signed-off-by: promalert <[email protected]>

Author: promalert

pkg/clean/ascii_test.go

@@ -26,13 +26,13 @@ func TestASCII(t *testing.T) {
 }
 
 func BenchmarkASCII(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		ASCII("https://docs.photoprism.app/getting-started 👍/config-options/#file-converters")
 	}
 }
 
 func BenchmarkASCIIEmpty(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		ASCII("")
 	}
 }

pkg/clean/header_test.go

@@ -27,13 +27,13 @@ func TestHeader(t *testing.T) {
 }
 
 func BenchmarkHeader(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		Header("https://..docs.photoprism.app/gettin\\g-started/config-options/\tfile-converters")
 	}
 }
 
 func BenchmarkHeaderEmpty(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		Header("")
 	}
 }

pkg/clean/search_test.go

@@ -48,15 +48,15 @@ func TestSearchQuery(t *testing.T) {
 func BenchmarkSearchQuery_Complex(b *testing.B) {
 	s := "Jens AND Mander and me Or Kitty WITH flowers IN the park AT noon | img% json OR BILL!\n"
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_ = SearchQuery(s)
 	}
 }
 
 func BenchmarkSearchQuery_Short(b *testing.B) {
 	s := "cat and dog"
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_ = SearchQuery(s)
 	}
 }
@@ -65,7 +65,7 @@ func BenchmarkSearchQuery_LongNoOps(b *testing.B) {
 	// No tokens to replace, primarily tests normalization + trim.
 	s := strings.Repeat("alpha beta gamma ", 50)
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_ = SearchQuery(s)
 	}
 }

pkg/clean/uri_test.go

@@ -26,13 +26,13 @@ func TestUri(t *testing.T) {
 }
 
 func BenchmarkUri(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		Uri("https://docs.photoprism.app/getting-started/config-options/#file-converters")
 	}
 }
 
 func BenchmarkUriEmpty(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		Uri("")
 	}
 }

pkg/fs/fastwalk/fastwalk_test.go

@@ -233,7 +233,7 @@ var benchDir = flag.String("benchdir", runtime.GOROOT(), "The directory to scan
 
 func BenchmarkFastWalk(b *testing.B) {
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		err := fastwalk.Walk(*benchDir, func(path string, typ os.FileMode) error { return nil })
 		if err != nil {
 			b.Fatal(err)

pkg/http/header/cache_test.go

@@ -27,13 +27,13 @@ func TestCacheControlMaxAge(t *testing.T) {
 }
 
 func BenchmarkTestCacheControlMaxAge(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		_ = CacheControlMaxAge(DurationYear, false)
 	}
 }
 
 func BenchmarkTestCacheControlMaxAgeImmutable(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		_ = CacheControlMaxAge(DurationYear, false) + ", " + CacheControlImmutable
 	}
 }

pkg/list/bench_test.go

@@ -33,7 +33,7 @@ func BenchmarkContainsAny_LargeOverlap(b *testing.B) {
 		bList[i] = a[i*4]
 	}
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		if !ContainsAny(a, bList) {
 			b.Fatalf("expected overlap")
 		}
@@ -44,7 +44,7 @@ func BenchmarkContainsAny_Disjoint(b *testing.B) {
 	a := makeStrings("a", 5000)
 	bList := makeStrings("b", 5000)
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		if ContainsAny(a, bList) {
 			b.Fatalf("expected disjoint")
 		}
@@ -56,7 +56,7 @@ func BenchmarkJoin_Large(b *testing.B) {
 	j := append(makeStrings("y", 5000), a[:1000]...) // 1000 duplicates
 	j = shuffleEveryK(j, 7)
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		out := Join(a, j)
 		if len(out) != 10000 {
 			b.Fatalf("unexpected length: %d", len(out))

pkg/rnd/auth_test.go

@@ -166,7 +166,7 @@ func TestIsJoinToken(t *testing.T) {
 }
 
 func BenchmarkJoinToken(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		JoinToken()
 	}
 }

pkg/txt/clip_test.go

@@ -29,15 +29,15 @@ func TestClip(t *testing.T) {
 func BenchmarkClipRunesASCII(b *testing.B) {
 	s := strings.Repeat("abc def ghi ", 20) // ASCII
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_ = Clip(s, 50)
 	}
 }
 
 func BenchmarkClipRunesUTF8(b *testing.B) {
 	s := strings.Repeat("Grüße 世", 20) // non-ASCII runes
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_ = Clip(s, 50)
 	}
 }

pkg/txt/contains_test.go

@@ -115,15 +115,15 @@ func TestContainsAlnumLower(t *testing.T) {
 func BenchmarkContainsNumber(b *testing.B) {
 	s := "The quick brown fox jumps over 13 lazy dogs"
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		_ = ContainsNumber(s)
 	}
 }
 
 func BenchmarkSortCaseInsensitive(b *testing.B) {
 	words := []string{"Zebra", "apple", "Banana", "cherry", "Apricot", "banana", "zebra", "Cherry"}
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		w := append([]string(nil), words...)
 		SortCaseInsensitive(w)
 	}