encoding/json: move some misplaced benchmark tests to bench_test.go

Change-Id: I5987eed00ee825421abe62699a06e9b66499f35f
Reviewed-on: https://go-review.googlesource.com/c/go/+/425016
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Reviewed-by: David Chase <drchase@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/encoding/json/bench_test.go b/src/encoding/json/bench_test.go
index 133084976b80e0ce46f54f05c3131ef7eb9584c0..d3af0dc0ed62bd27e3344fb6ae228dc29fb69deb 100644 (file)
--- a/src/encoding/json/bench_test.go
+++ b/src/encoding/json/bench_test.go
@@ -18,6 +18,7 @@ import (
        "io"
        "os"
        "reflect"
+       "regexp"
        "runtime"
        "strings"
        "sync"
@@ -508,3 +509,33 @@ func BenchmarkEncodeMarshaler(b *testing.B) {
                }
        })
 }
+
+func BenchmarkEncoderEncode(b *testing.B) {
+       b.ReportAllocs()
+       type T struct {
+               X, Y string
+       }
+       v := &T{"foo", "bar"}
+       b.RunParallel(func(pb *testing.PB) {
+               for pb.Next() {
+                       if err := NewEncoder(io.Discard).Encode(v); err != nil {
+                               b.Fatal(err)
+                       }
+               }
+       })
+}
+
+func BenchmarkNumberIsValid(b *testing.B) {
+       s := "-61657.61667E+61673"
+       for i := 0; i < b.N; i++ {
+               isValidNumber(s)
+       }
+}
+
+func BenchmarkNumberIsValidRegexp(b *testing.B) {
+       var jsonNumberRegexp = regexp.MustCompile(`^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$`)
+       s := "-61657.61667E+61673"
+       for i := 0; i < b.N; i++ {
+               jsonNumberRegexp.MatchString(s)
+       }
+}

diff --git a/src/encoding/json/number_test.go b/src/encoding/json/number_test.go
index cc6701814fb725e5209282f9615271aaa5201b9b..c82e6deb8326261ffc05344423bf904e5e7f18d8 100644 (file)
--- a/src/encoding/json/number_test.go
+++ b/src/encoding/json/number_test.go
@@ -116,18 +116,3 @@ func TestNumberIsValid(t *testing.T) {
                }
        }
 }
-
-func BenchmarkNumberIsValid(b *testing.B) {
-       s := "-61657.61667E+61673"
-       for i := 0; i < b.N; i++ {
-               isValidNumber(s)
-       }
-}
-
-func BenchmarkNumberIsValidRegexp(b *testing.B) {
-       var jsonNumberRegexp = regexp.MustCompile(`^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$`)
-       s := "-61657.61667E+61673"
-       for i := 0; i < b.N; i++ {
-               jsonNumberRegexp.MatchString(s)
-       }
-}

diff --git a/src/encoding/json/stream_test.go b/src/encoding/json/stream_test.go
index 1f40c796709df7b3c252d0422dfd73874274c75f..712293de0f6f55b11f6effad64193b126fa4866a 100644 (file)
--- a/src/encoding/json/stream_test.go
+++ b/src/encoding/json/stream_test.go
@@ -347,21 +347,6 @@ func TestBlocking(t *testing.T) {
        }
 }
 
-func BenchmarkEncoderEncode(b *testing.B) {
-       b.ReportAllocs()
-       type T struct {
-               X, Y string
-       }
-       v := &T{"foo", "bar"}
-       b.RunParallel(func(pb *testing.PB) {
-               for pb.Next() {
-                       if err := NewEncoder(io.Discard).Encode(v); err != nil {
-                               b.Fatal(err)
-                       }
-               }
-       })
-}
-
 type tokenStreamCase struct {
        json      string
        expTokens []any