From 1bee2edfad4f8a6e87d5bce38931ea7ede8e5231 Mon Sep 17 00:00:00 2001 From: iamhlbx Date: Wed, 25 Aug 2021 21:18:04 +0800 Subject: [PATCH] structure: migrate test-infra to testify (#27219) --- structure/main_test.go | 31 ++++ structure/structure_test.go | 294 +++++++++++++++++------------------- 2 files changed, 171 insertions(+), 154 deletions(-) create mode 100644 structure/main_test.go diff --git a/structure/main_test.go b/structure/main_test.go new file mode 100644 index 0000000000000..793fae6d90647 --- /dev/null +++ b/structure/main_test.go @@ -0,0 +1,31 @@ +// Copyright 2021 PingCAP, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package structure + +import ( + "testing" + + "github.com/pingcap/tidb/util/testbridge" + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + testbridge.WorkaroundGoCheckFlags() + opts := []goleak.Option{ + goleak.IgnoreTopFunction("go.etcd.io/etcd/pkg/logutil.(*MergeLogger).outputLoop"), + goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), + } + goleak.VerifyTestMain(m, opts...) +} diff --git a/structure/structure_test.go b/structure/structure_test.go index 993483563427e..8d48f39db0141 100644 --- a/structure/structure_test.go +++ b/structure/structure_test.go @@ -18,197 +18,182 @@ import ( "context" "testing" - . "github.com/pingcap/check" "github.com/pingcap/parser/mysql" "github.com/pingcap/parser/terror" "github.com/pingcap/tidb/kv" - "github.com/pingcap/tidb/store/mockstore" "github.com/pingcap/tidb/structure" - "github.com/pingcap/tidb/util/testleak" + "github.com/pingcap/tidb/testkit" + "github.com/stretchr/testify/require" ) -func TestTxStructure(t *testing.T) { - CustomVerboseFlag = true - TestingT(t) -} - -var _ = Suite(&testTxStructureSuite{}) - -type testTxStructureSuite struct { - store kv.Storage -} - -func (s *testTxStructureSuite) SetUpSuite(c *C) { - testleak.BeforeTest() - store, err := mockstore.NewMockStore() - c.Assert(err, IsNil) - s.store = store -} - -func (s *testTxStructureSuite) TearDownSuite(c *C) { - err := s.store.Close() - c.Assert(err, IsNil) - testleak.AfterTest(c)() -} +func TestString(t *testing.T) { + store, clean := testkit.CreateMockStore(t) + defer clean() -func (s *testTxStructureSuite) TestString(c *C) { - txn, err := s.store.Begin() - c.Assert(err, IsNil) + txn, err := store.Begin() + require.NoError(t, err) tx := structure.NewStructure(txn, txn, []byte{0x00}) key := []byte("a") value := []byte("1") err = tx.Set(key, value) - c.Assert(err, IsNil) + require.NoError(t, err) v, err := tx.Get(key) - c.Assert(err, IsNil) - c.Assert(v, DeepEquals, value) + require.NoError(t, err) + require.Equal(t, value, v) n, err := tx.Inc(key, 1) - c.Assert(err, IsNil) - c.Assert(n, Equals, int64(2)) + require.NoError(t, err) + require.Equal(t, int64(2), n) v, err = tx.Get(key) - c.Assert(err, IsNil) - c.Assert(v, DeepEquals, []byte("2")) + require.NoError(t, err) + require.Equal(t, []byte("2"), v) n, err = tx.GetInt64(key) - c.Assert(err, IsNil) - c.Assert(n, Equals, int64(2)) + require.NoError(t, err) + require.Equal(t, int64(2), n) err = tx.Clear(key) - c.Assert(err, IsNil) + require.NoError(t, err) v, err = tx.Get(key) - c.Assert(err, IsNil) - c.Assert(v, IsNil) + require.NoError(t, err) + require.Nil(t, v) tx1 := structure.NewStructure(txn, nil, []byte{0x01}) err = tx1.Set(key, value) - c.Assert(err, NotNil) + require.NotNil(t, err) _, err = tx1.Inc(key, 1) - c.Assert(err, NotNil) + require.NotNil(t, err) err = tx1.Clear(key) - c.Assert(err, NotNil) + require.NotNil(t, err) err = txn.Commit(context.Background()) - c.Assert(err, IsNil) + require.NoError(t, err) } -func (s *testTxStructureSuite) TestList(c *C) { - txn, err := s.store.Begin() - c.Assert(err, IsNil) +func TestList(t *testing.T) { + store, clean := testkit.CreateMockStore(t) + defer clean() + + txn, err := store.Begin() + require.NoError(t, err) tx := structure.NewStructure(txn, txn, []byte{0x00}) key := []byte("a") err = tx.LPush(key, []byte("3"), []byte("2"), []byte("1")) - c.Assert(err, IsNil) + require.NoError(t, err) // Test LGetAll. err = tx.LPush(key, []byte("11")) - c.Assert(err, IsNil) + require.NoError(t, err) values, err := tx.LGetAll(key) - c.Assert(err, IsNil) - c.Assert(values, DeepEquals, [][]byte{[]byte("3"), []byte("2"), []byte("1"), []byte("11")}) + require.NoError(t, err) + require.Equal(t, [][]byte{[]byte("3"), []byte("2"), []byte("1"), []byte("11")}, values) value, err := tx.LPop(key) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("11")) + require.NoError(t, err) + require.Equal(t, []byte("11"), value) l, err := tx.LLen(key) - c.Assert(err, IsNil) - c.Assert(l, Equals, int64(3)) + require.NoError(t, err) + require.Equal(t, int64(3), l) value, err = tx.LIndex(key, 1) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("2")) + require.NoError(t, err) + require.Equal(t, []byte("2"), value) err = tx.LSet(key, 1, []byte("4")) - c.Assert(err, IsNil) + require.NoError(t, err) value, err = tx.LIndex(key, 1) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("4")) + require.NoError(t, err) + require.Equal(t, []byte("4"), value) err = tx.LSet(key, 1, []byte("2")) - c.Assert(err, IsNil) + require.NoError(t, err) err = tx.LSet(key, 100, []byte("2")) - c.Assert(err, NotNil) + require.NotNil(t, err) value, err = tx.LIndex(key, -1) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("3")) + require.NoError(t, err) + require.Equal(t, []byte("3"), value) value, err = tx.LPop(key) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("1")) + require.NoError(t, err) + require.Equal(t, []byte("1"), value) l, err = tx.LLen(key) - c.Assert(err, IsNil) - c.Assert(l, Equals, int64(2)) + require.NoError(t, err) + require.Equal(t, int64(2), l) err = tx.RPush(key, []byte("4")) - c.Assert(err, IsNil) + require.NoError(t, err) l, err = tx.LLen(key) - c.Assert(err, IsNil) - c.Assert(l, Equals, int64(3)) + require.NoError(t, err) + require.Equal(t, int64(3), l) value, err = tx.LIndex(key, -1) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("4")) + require.NoError(t, err) + require.Equal(t, []byte("4"), value) value, err = tx.RPop(key) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("4")) + require.NoError(t, err) + require.Equal(t, []byte("4"), value) value, err = tx.RPop(key) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("3")) + require.NoError(t, err) + require.Equal(t, []byte("3"), value) value, err = tx.RPop(key) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("2")) + require.NoError(t, err) + require.Equal(t, []byte("2"), value) l, err = tx.LLen(key) - c.Assert(err, IsNil) - c.Assert(l, Equals, int64(0)) + require.NoError(t, err) + require.Equal(t, int64(0), l) err = tx.LPush(key, []byte("1")) - c.Assert(err, IsNil) + require.NoError(t, err) err = tx.LClear(key) - c.Assert(err, IsNil) + require.NoError(t, err) l, err = tx.LLen(key) - c.Assert(err, IsNil) - c.Assert(l, Equals, int64(0)) + require.NoError(t, err) + require.Equal(t, int64(0), l) tx1 := structure.NewStructure(txn, nil, []byte{0x01}) err = tx1.LPush(key, []byte("1")) - c.Assert(err, NotNil) + require.NotNil(t, err) + require.NotNil(t, err) _, err = tx1.RPop(key) - c.Assert(err, NotNil) + require.NotNil(t, err) err = tx1.LSet(key, 1, []byte("2")) - c.Assert(err, NotNil) + require.NotNil(t, err) err = tx1.LClear(key) - c.Assert(err, NotNil) + require.NotNil(t, err) err = txn.Commit(context.Background()) - c.Assert(err, IsNil) + require.NoError(t, err) } -func (s *testTxStructureSuite) TestHash(c *C) { - txn, err := s.store.Begin() - c.Assert(err, IsNil) +func TestHash(t *testing.T) { + store, clean := testkit.CreateMockStore(t) + defer clean() + + txn, err := store.Begin() + require.NoError(t, err) tx := structure.NewStructure(txn, txn, []byte{0x00}) @@ -217,134 +202,134 @@ func (s *testTxStructureSuite) TestHash(c *C) { tx.EncodeHashAutoIDKeyValue(key, key, 5) err = tx.HSet(key, []byte("1"), []byte("1")) - c.Assert(err, IsNil) + require.NoError(t, err) err = tx.HSet(key, []byte("2"), []byte("2")) - c.Assert(err, IsNil) + require.NoError(t, err) value, err := tx.HGet(key, []byte("1")) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("1")) + require.NoError(t, err) + require.Equal(t, []byte("1"), value) value, err = tx.HGet(key, []byte("fake")) - c.Assert(err, IsNil) - c.Assert(value, IsNil) + require.NoError(t, err) + require.Nil(t, value) keys, err := tx.HKeys(key) - c.Assert(err, IsNil) - c.Assert(keys, DeepEquals, [][]byte{[]byte("1"), []byte("2")}) + require.NoError(t, err) + require.Equal(t, [][]byte{[]byte("1"), []byte("2")}, keys) res, err := tx.HGetAll(key) - c.Assert(err, IsNil) - c.Assert(res, DeepEquals, []structure.HashPair{ + require.NoError(t, err) + require.Equal(t, []structure.HashPair{ {Field: []byte("1"), Value: []byte("1")}, - {Field: []byte("2"), Value: []byte("2")}}) + {Field: []byte("2"), Value: []byte("2")}}, res) res, err = tx.HGetLastN(key, 1) - c.Assert(err, IsNil) - c.Assert(res, DeepEquals, []structure.HashPair{ - {Field: []byte("2"), Value: []byte("2")}}) + require.NoError(t, err) + require.Equal(t, []structure.HashPair{ + {Field: []byte("2"), Value: []byte("2")}}, res) res, err = tx.HGetLastN(key, 2) - c.Assert(err, IsNil) - c.Assert(res, DeepEquals, []structure.HashPair{ + require.NoError(t, err) + require.Equal(t, []structure.HashPair{ {Field: []byte("2"), Value: []byte("2")}, - {Field: []byte("1"), Value: []byte("1")}}) + {Field: []byte("1"), Value: []byte("1")}}, res) err = tx.HDel(key, []byte("1")) - c.Assert(err, IsNil) + require.NoError(t, err) value, err = tx.HGet(key, []byte("1")) - c.Assert(err, IsNil) - c.Assert(value, IsNil) + require.NoError(t, err) + require.Nil(t, value) n, err := tx.HInc(key, []byte("1"), 1) - c.Assert(err, IsNil) - c.Assert(n, Equals, int64(1)) + require.NoError(t, err) + require.Equal(t, int64(1), n) // Test set new value which equals to old value. value, err = tx.HGet(key, []byte("1")) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("1")) + require.NoError(t, err) + require.Equal(t, []byte("1"), value) err = tx.HSet(key, []byte("1"), []byte("1")) - c.Assert(err, IsNil) + require.NoError(t, err) value, err = tx.HGet(key, []byte("1")) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("1")) + require.NoError(t, err) + require.Equal(t, []byte("1"), value) n, err = tx.HInc(key, []byte("1"), 1) - c.Assert(err, IsNil) - c.Assert(n, Equals, int64(2)) + require.NoError(t, err) + require.Equal(t, int64(2), n) n, err = tx.HInc(key, []byte("1"), 1) - c.Assert(err, IsNil) - c.Assert(n, Equals, int64(3)) + require.NoError(t, err) + require.Equal(t, int64(3), n) n, err = tx.HGetInt64(key, []byte("1")) - c.Assert(err, IsNil) - c.Assert(n, Equals, int64(3)) + require.NoError(t, err) + require.Equal(t, int64(3), n) err = tx.HClear(key) - c.Assert(err, IsNil) + require.NoError(t, err) err = tx.HDel(key, []byte("fake_key")) - c.Assert(err, IsNil) + require.NoError(t, err) // Test set nil value. value, err = tx.HGet(key, []byte("nil_key")) - c.Assert(err, IsNil) - c.Assert(value, IsNil) + require.NoError(t, err) + require.Nil(t, value) err = tx.HSet(key, []byte("nil_key"), nil) - c.Assert(err, IsNil) + require.NoError(t, err) err = tx.HSet(key, []byte("nil_key"), []byte("1")) - c.Assert(err, IsNil) + require.NoError(t, err) value, err = tx.HGet(key, []byte("nil_key")) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("1")) + require.NoError(t, err) + require.Equal(t, []byte("1"), value) err = tx.HSet(key, []byte("nil_key"), nil) - c.Assert(err, NotNil) + require.NotNil(t, err) value, err = tx.HGet(key, []byte("nil_key")) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("1")) + require.NoError(t, err) + require.Equal(t, []byte("1"), value) err = tx.HSet(key, []byte("nil_key"), []byte("2")) - c.Assert(err, IsNil) + require.NoError(t, err) value, err = tx.HGet(key, []byte("nil_key")) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("2")) + require.NoError(t, err) + require.Equal(t, []byte("2"), value) tx1 := structure.NewStructure(txn, nil, []byte{0x01}) _, err = tx1.HInc(key, []byte("1"), 1) - c.Assert(err, NotNil) + require.NotNil(t, err) err = tx1.HDel(key, []byte("1")) - c.Assert(err, NotNil) + require.NotNil(t, err) err = txn.Commit(context.Background()) - c.Assert(err, IsNil) + require.NoError(t, err) - err = kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error { - t := structure.NewStructure(txn, txn, []byte{0x00}) - err = t.Set(key, []byte("abc")) - c.Assert(err, IsNil) + err = kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error { + newTxn := structure.NewStructure(txn, txn, []byte{0x00}) + err = newTxn.Set(key, []byte("abc")) + require.NoError(t, err) - value, err = t.Get(key) - c.Assert(err, IsNil) - c.Assert(value, DeepEquals, []byte("abc")) + value, err = newTxn.Get(key) + require.NoError(t, err) + require.Equal(t, []byte("abc"), value) return nil }) - c.Assert(err, IsNil) + require.NoError(t, err) } -func (*testTxStructureSuite) TestError(c *C) { +func TestError(t *testing.T) { kvErrs := []*terror.Error{ structure.ErrInvalidHashKeyFlag, structure.ErrInvalidListIndex, @@ -353,6 +338,7 @@ func (*testTxStructureSuite) TestError(c *C) { } for _, err := range kvErrs { code := terror.ToSQLError(err).Code - c.Assert(code != mysql.ErrUnknown && code == uint16(err.Code()), IsTrue, Commentf("err: %v", err)) + require.NotEqual(t, mysql.ErrUnknown, code) + require.Equal(t, uint16(err.Code()), code, "err: %v", err) } }