diff --git a/announce_test.go b/announce_test.go index ae6991a17..a614348dd 100644 --- a/announce_test.go +++ b/announce_test.go @@ -4,12 +4,13 @@ import ( "context" "crypto/rand" "net" + "regexp" "testing" "time" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "golang.org/x/time/rate" + + "github.com/go-quicktest/qt" ) func TestAnnounceNoStartingNodes(t *testing.T) { @@ -17,12 +18,12 @@ func TestAnnounceNoStartingNodes(t *testing.T) { Conn: mustListen(":0"), NoSecurity: true, }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer s.Close() var ih [20]byte copy(ih[:], "blah") _, err = s.Announce(ih, 0, true) - require.EqualError(t, err, "no initial nodes") + qt.Assert(t, qt.ErrorMatches(err, regexp.QuoteMeta("no initial nodes"))) } func randomInfohash() (ih [20]byte) { @@ -37,9 +38,9 @@ func TestAnnounceStopsNoPending(t *testing.T) { return []Addr{NewAddr(&net.TCPAddr{})}, nil }, }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) a, err := s.Announce(randomInfohash(), 0, true) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer a.Close() <-a.Peers } @@ -49,10 +50,10 @@ func TestAnnounceStopsNoPending(t *testing.T) { // are successful. func TestRateLimiterInadequate(t *testing.T) { rl := rate.NewLimiter(rate.Every(time.Hour), 1) - assert.NoError(t, rl.Wait(context.Background())) + qt.Check(t, qt.IsNil(rl.Wait(context.Background()))) time.AfterFunc(time.Millisecond, func() { rl.AllowN(time.Now(), -1) }) ctx, cancel := context.WithCancel(context.Background()) defer cancel() time.AfterFunc(2*time.Millisecond, cancel) - assert.EqualValues(t, context.Canceled, rl.Wait(ctx)) + qt.Check(t, qt.Equals(rl.Wait(ctx), context.Canceled)) } diff --git a/bep44/key_test.go b/bep44/key_test.go index 61cefe693..c0080267e 100644 --- a/bep44/key_test.go +++ b/bep44/key_test.go @@ -7,32 +7,27 @@ import ( "testing" "filippo.io/edwards25519" - qt "github.com/frankban/quicktest" + "github.com/go-quicktest/qt" ) func TestPrivateKeyIsSeed(t *testing.T) { _, priv, err := ed25519.GenerateKey(nil) - c := qt.New(t) - c.Assert(err, qt.IsNil) + qt.Assert(t, qt.IsNil(err)) t.Logf("generated private key %x", priv) seed := priv.Seed() t.Logf("it has seed %x", seed) seedPriv := ed25519.NewKeyFromSeed(seed) t.Logf("private key from seed: %x", seedPriv) - c.Check(seedPriv.Equal(priv), qt.IsTrue) - c.Check( - seedPriv.Public().(ed25519.PublicKey), - qt.ContentEquals, - priv.Public().(ed25519.PublicKey)) + qt.Check(t, qt.IsTrue(seedPriv.Equal(priv))) + qt.Check(t, qt.ContentEquals(seedPriv.Public().(ed25519.PublicKey), priv.Public().(ed25519.PublicKey))) t.Logf("public keys:\n%x\n%x", seedPriv.Public(), priv.Public()) } func TestPublicKeyCopy(t *testing.T) { pub, _, err := ed25519.GenerateKey(nil) - c := qt.New(t) - c.Assert(err, qt.IsNil) + qt.Assert(t, qt.IsNil(err)) b := (*[32]byte)(pub) - c.Check(b[:], qt.DeepEquals, []byte(pub)) + qt.Check(t, qt.DeepEquals(b[:], []byte(pub))) } func mustDecodeHex(s string) []byte { @@ -44,14 +39,10 @@ func mustDecodeHex(s string) []byte { } func TestVectorMutableWithSalt(t *testing.T) { - c := qt.New(t) salt := []byte("foobar") bv := []byte("12:Hello World!") var seq int64 = 1 - c.Check( - bufferToSign(salt, bv, seq), - qt.DeepEquals, - []byte("4:salt6:foobar3:seqi1e1:v12:Hello World!")) + qt.Check(t, qt.DeepEquals(bufferToSign(salt, bv, seq), []byte("4:salt6:foobar3:seqi1e1:v12:Hello World!"))) edwardsPrivateKey := mustDecodeHex( "e06d3183d14159228433ed599221b80bd0a5ce8352e4bdf0262f76786ef1c74d" + "b7e7a9fea2c0eb269d61e3b38e450a22e754941ac78479d6c54e1faf6037881d") @@ -59,10 +50,7 @@ func TestVectorMutableWithSalt(t *testing.T) { "6834284b6b24c3204eb2fea824d82f88883a3d95e8b4a21b8c0ded553d17d17d" + "df9a8a7104b1258f30bed3787e6cb896fca78c58f8e03b5f18f14951a87d9a08") pubKey := mustDecodeHex("77ff84905a91936367c01360803104f92432fcd904a43511876df5cdf3e7e548") - c.Check( - EdwardsSignSha512(*(*[64]byte)(edwardsPrivateKey), pubKey, bufferToSign(salt, bv, seq)), - qt.DeepEquals, - sig) + qt.Check(t, qt.DeepEquals(EdwardsSignSha512(*(*[64]byte)(edwardsPrivateKey), pubKey, bufferToSign(salt, bv, seq)), sig)) expectedTargetId := mustDecodeHex("411eba73b6f087ca51a3795d9c8c938d365e32c1") put := Put{ V: "Hello World!", @@ -73,18 +61,14 @@ func TestVectorMutableWithSalt(t *testing.T) { Seq: 0, } target := put.Target() - c.Check(target[:], qt.DeepEquals, expectedTargetId) + qt.Check(t, qt.DeepEquals(target[:], expectedTargetId)) } func TestVectorMutable(t *testing.T) { - c := qt.New(t) var salt []byte bv := []byte("12:Hello World!") var seq int64 = 1 - c.Check( - bufferToSign(salt, bv, seq), - qt.DeepEquals, - []byte("3:seqi1e1:v12:Hello World!")) + qt.Check(t, qt.DeepEquals(bufferToSign(salt, bv, seq), []byte("3:seqi1e1:v12:Hello World!"))) edwardsPrivateKey := mustDecodeHex( "e06d3183d14159228433ed599221b80bd0a5ce8352e4bdf0262f76786ef1c74d" + "b7e7a9fea2c0eb269d61e3b38e450a22e754941ac78479d6c54e1faf6037881d") @@ -92,10 +76,7 @@ func TestVectorMutable(t *testing.T) { "305ac8aeb6c9c151fa120f120ea2cfb923564e11552d06a5d856091e5e853cff" + "1260d3f39e4999684aa92eb73ffd136e6f4f3ecbfda0ce53a1608ecd7ae21f01") pubKey := mustDecodeHex("77ff84905a91936367c01360803104f92432fcd904a43511876df5cdf3e7e548") - c.Check( - EdwardsSignSha512(*(*[64]byte)(edwardsPrivateKey), pubKey, bufferToSign(salt, bv, seq)), - qt.DeepEquals, - sig) + qt.Check(t, qt.DeepEquals(EdwardsSignSha512(*(*[64]byte)(edwardsPrivateKey), pubKey, bufferToSign(salt, bv, seq)), sig)) expectedTargetId := mustDecodeHex("4a533d47ec9c7d95b1ad75f576cffc641853b750") put := Put{ V: "Hello World!", @@ -106,7 +87,7 @@ func TestVectorMutable(t *testing.T) { Seq: 0, } target := put.Target() - c.Check(target[:], qt.DeepEquals, expectedTargetId) + qt.Check(t, qt.DeepEquals(target[:], expectedTargetId)) } // ed25519 sign with pre-sha512-summed private key. I believe this means we also need the public key diff --git a/bep44/store_test.go b/bep44/store_test.go index 5aa762c5f..64cc79352 100644 --- a/bep44/store_test.go +++ b/bep44/store_test.go @@ -5,38 +5,36 @@ import ( "testing" "time" - "github.com/stretchr/testify/require" + "github.com/go-quicktest/qt" ) func TestWrapper(t *testing.T) { - require := require.New(t) w := NewWrapper(NewMemory(), 10*time.Hour) i, err := NewItem([]byte("Hello World!"), nil, 0, 0, nil) - require.NoError(err) + qt.Assert(t, qt.IsNil(err)) err = w.Put(i) - require.NoError(err) + qt.Assert(t, qt.IsNil(err)) target := i.Target() targetStr := hex.EncodeToString(target[:]) - require.Equal("e5f96f6f38320f0f33959cb4d3d656452117aadb", targetStr) + qt.Assert(t, qt.Equals(targetStr, "e5f96f6f38320f0f33959cb4d3d656452117aadb")) i2, err := w.Get(target) - require.NoError(err) - require.Equal(i, i2) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.Equals(i2, i)) } func TestWrapperTimeout(t *testing.T) { - require := require.New(t) w := NewWrapper(NewMemory(), 0*time.Second) i, err := NewItem([]byte("Hello World!"), nil, 0, 0, nil) - require.NoError(err) + qt.Assert(t, qt.IsNil(err)) err = w.Put(i) - require.NoError(err) + qt.Assert(t, qt.IsNil(err)) _, err = w.Get(i.Target()) - require.Equal(ErrItemNotFound, err) + qt.Assert(t, qt.Equals(err, ErrItemNotFound)) } diff --git a/containers/addr-maybe-ids-by-distance_test.go b/containers/addr-maybe-ids-by-distance_test.go index aa430fe16..22828b6ff 100644 --- a/containers/addr-maybe-ids-by-distance_test.go +++ b/containers/addr-maybe-ids-by-distance_test.go @@ -3,19 +3,16 @@ package containers import ( "testing" - qt "github.com/frankban/quicktest" - "github.com/stretchr/testify/assert" + "github.com/go-quicktest/qt" "github.com/anacrolix/dht/v2/int160" "github.com/anacrolix/dht/v2/internal/testutil" ) func TestSampleAddrsDiffer(t *testing.T) { - c := qt.New(t) for i, a := range testutil.SampleAddrMaybeIds { for j, b := range testutil.SampleAddrMaybeIds[i+1:] { - c.Assert(a, qt.Not(qt.Equals), b, - qt.Commentf("%v, %v", i, j+i+1)) + qt.Assert(t, qt.Not(qt.Equals(a, b)), qt.Commentf("%v, %v", i, j+i+1)) } } } @@ -26,28 +23,27 @@ func TestNodesByDistance(t *testing.T) { a = a.Add(testutil.SampleAddrMaybeIds[i]) } push(4) - c := qt.New(t) - c.Assert(a.Len(), qt.Equals, 1) + qt.Assert(t, qt.Equals(a.Len(), 1)) push(2) - c.Assert(a.Len(), qt.Equals, 2) + qt.Assert(t, qt.Equals(a.Len(), 2)) push(0) - c.Assert(a.Len(), qt.Equals, 3) + qt.Assert(t, qt.Equals(a.Len(), 3)) push(3) - c.Assert(a.Len(), qt.Equals, 4) + qt.Assert(t, qt.Equals(a.Len(), 4)) push(0) - c.Assert(a.Len(), qt.Equals, 4) + qt.Assert(t, qt.Equals(a.Len(), 4)) push(1) - c.Assert(a.Len(), qt.Equals, 5) + qt.Assert(t, qt.Equals(a.Len(), 5)) pop := func(is ...int) { ok := a.Len() != 0 - assert.True(t, ok) + qt.Check(t, qt.IsTrue(ok)) first := a.Next() - assert.Contains(t, func() (ret []addrMaybeId) { + qt.Check(t, qt.SliceContains(func() (ret []addrMaybeId) { for _, i := range is { ret = append(ret, testutil.SampleAddrMaybeIds[i]) } return - }(), first) + }(), first)) a = a.Delete(first) } pop(1) @@ -56,5 +52,5 @@ func TestNodesByDistance(t *testing.T) { pop(0, 4) pop(0, 4) // pop(0, 4) - assert.EqualValues(t, 0, a.Len()) + qt.Check(t, qt.Equals(a.Len(), 0)) } diff --git a/dht_test.go b/dht_test.go index 0849f3ff2..97a84200b 100644 --- a/dht_test.go +++ b/dht_test.go @@ -14,11 +14,11 @@ import ( "github.com/anacrolix/missinggo/v2/inproc" "github.com/anacrolix/sync" "github.com/anacrolix/torrent/bencode" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "github.com/anacrolix/dht/v2/int160" "github.com/anacrolix/dht/v2/krpc" + + "github.com/go-quicktest/qt" ) func TestSetNilBigInt(t *testing.T) { @@ -31,15 +31,15 @@ func TestMarshalCompactNodeInfo(t *testing.T) { ID: [20]byte{'a', 'b', 'c'}, }} addr, err := net.ResolveUDPAddr("udp4", "1.2.3.4:5") - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) cni[0].Addr.FromUDPAddr(addr) cni[0].Addr.IP = cni[0].Addr.IP.To4() b, err := cni.MarshalBinary() - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) var bb [26]byte copy(bb[:], []byte("abc")) copy(bb[20:], []byte("\x01\x02\x03\x04\x00\x05")) - assert.EqualValues(t, string(bb[:]), string(b)) + qt.Check(t, qt.Equals(string(b), string(bb[:]))) } const zeroID = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" @@ -73,7 +73,7 @@ func TestDistances(t *testing.T) { func TestMaxDistanceString(t *testing.T) { var max int160.T max.SetMax() - require.EqualValues(t, "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff", max.Bytes()) + qt.Assert(t, qt.Equals(string(max.Bytes()), "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff")) } // func TestClosestNodes(t *testing.T) { @@ -82,19 +82,19 @@ func TestMaxDistanceString(t *testing.T) { // cn.Push(testIDs[i]) // } // ids := iter.ToSlice(cn.IDs()) -// assert.Len(t, ids, 2) +// qt.Check(t, qt.HasLen(ids, 2)) // m := map[string]bool{} // for _, id := range ids { // m[id.(nodeID).ByteString()] = true // } // log.Printf("%q", m) -// assert.True(t, m[testIDs[3].ByteString()]) -// assert.True(t, m[testIDs[4].ByteString()]) +// qt.Check(t, qt.IsTrue(m[testIDs[3].ByteString()])) +// qt.Check(t, qt.IsTrue(m[testIDs[4].ByteString()])) // } func TestDHTDefaultConfig(t *testing.T) { s, err := NewServer(nil) - assert.NoError(t, err) + qt.Check(t, qt.IsNil(err)) s.Close() } @@ -112,7 +112,7 @@ func TestPing(t *testing.T) { Port: s.Addr().(*net.UDPAddr).Port, } } - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer srv.Close() srv0, err := NewServer(&ServerConfig{ Conn: mustListen("127.0.0.1:0"), @@ -120,29 +120,29 @@ func TestPing(t *testing.T) { Logger: log.Default, WaitToReply: true, }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer srv0.Close() res := srv.Ping(srvUdpAddr(srv0)) - require.NoError(t, res.Err) - require.EqualValues(t, srv0.ID(), *res.Reply.SenderID()) + qt.Assert(t, qt.IsNil(res.Err)) + qt.Assert(t, qt.Equals(*res.Reply.SenderID(), srv0.ID())) } func TestServerCustomNodeId(t *testing.T) { idHex := "5a3ce1c14e7a08645677bbd1cfe7d8f956d53256" idBytes, err := hex.DecodeString(idHex) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) var id [20]byte n := copy(id[:], idBytes) - require.Equal(t, 20, n) + qt.Assert(t, qt.Equals(n, 20)) // How to test custom *secure* ID when tester computers will have // different IDs? Generate custom ids for local IPs and use mini-ID? s, err := NewServer(&ServerConfig{ NodeId: id, Conn: mustListen(":0"), }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer s.Close() - assert.Equal(t, id, s.ID()) + qt.Check(t, qt.Equals(s.ID(), id)) } func TestAnnounceTimeout(t *testing.T) { @@ -153,18 +153,18 @@ func TestAnnounceTimeout(t *testing.T) { return 0 }, }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) var ih [20]byte copy(ih[:], "12341234123412341234") a, err := s.Announce(ih, 0, true) - assert.NoError(t, err) + qt.Check(t, qt.IsNil(err)) <-a.Peers a.Close() s.Close() } func TestEqualPointers(t *testing.T) { - assert.EqualValues(t, &krpc.Msg{R: &krpc.Return{}}, &krpc.Msg{R: &krpc.Return{}}) + qt.Check(t, qt.DeepEquals(&krpc.Msg{R: &krpc.Return{}}, &krpc.Msg{R: &krpc.Return{}})) } func TestHook(t *testing.T) { @@ -172,7 +172,7 @@ func TestHook(t *testing.T) { Conn: mustListen("127.0.0.1:5678"), PublicIP: net.IPv4(127, 0, 0, 1), }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer pinger.Close() // Establish server with a hook attached to "ping" hookCalled := make(chan struct{}, 1) @@ -192,7 +192,7 @@ func TestHook(t *testing.T) { }, WaitToReply: true, }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer receiver.Close() // Ping receiver from pinger to trigger hook. Should also receive a response. t.Log("TestHook: Servers created, hook for ping established. Calling Ping.") @@ -200,7 +200,7 @@ func TestHook(t *testing.T) { IP: []byte{127, 0, 0, 1}, Port: receiver.Addr().(*net.UDPAddr).Port, }) - assert.NoError(t, res.Err) + qt.Check(t, qt.IsNil(res.Err)) // Await signal that hook has been called. select { case <-hookCalled: @@ -217,8 +217,8 @@ func TestHook(t *testing.T) { // arguments. func TestResolveBadAddr(t *testing.T) { ua, err := net.ResolveUDPAddr("udp", "0.131.255.145:33085") - require.NoError(t, err) - assert.False(t, validNodeAddr(ua)) + qt.Assert(t, qt.IsNil(err)) + qt.Check(t, qt.IsFalse(validNodeAddr(ua))) } func TestGlobalBootstrapAddrs(t *testing.T) { @@ -234,7 +234,7 @@ func TestGlobalBootstrapAddrs(t *testing.T) { // https://github.com/anacrolix/dht/pull/19 func TestBadGetPeersResponse(t *testing.T) { pc, err := net.ListenPacket("udp", "localhost:0") - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer pc.Close() s, err := NewServer(&ServerConfig{ StartingNodes: func() ([]Addr, error) { @@ -242,12 +242,12 @@ func TestBadGetPeersResponse(t *testing.T) { }, Conn: mustListen("localhost:0"), }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer s.Close() go func() { b := make([]byte, 1024) n, addr, err := pc.ReadFrom(b) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) var rm krpc.Msg bencode.Unmarshal(b[:n], &rm) m := krpc.Msg{ @@ -255,11 +255,11 @@ func TestBadGetPeersResponse(t *testing.T) { T: rm.T, } b, err = bencode.Marshal(m) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) pc.WriteTo(b, addr) }() a, err := s.Announce([20]byte{}, 0, true) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) // Drain the Announce until it closes. for range a.Peers { } @@ -267,7 +267,7 @@ func TestBadGetPeersResponse(t *testing.T) { func TestBootstrapRace(t *testing.T) { remotePc, err := inproc.ListenPacket("", "localhost:0") - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer remotePc.Close() serverPc := bootstrapRacePacketConn{ read: make(chan read), @@ -279,7 +279,7 @@ func TestBootstrapRace(t *testing.T) { QueryResendDelay: func() time.Duration { return 0 }, Logger: log.Default, }) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer s.Close() go func() { for i := 0; i < defaultMaxQuerySends-1; i++ { @@ -298,7 +298,7 @@ func TestBootstrapRace(t *testing.T) { }() ts, err := s.Bootstrap() t.Logf("%#v", ts) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) } type emptyNetAddr struct{} diff --git a/go.mod b/go.mod index 879dad7d5..76ce8b298 100644 --- a/go.mod +++ b/go.mod @@ -21,10 +21,9 @@ require ( github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 github.com/davecgh/go-spew v1.1.1 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 - github.com/frankban/quicktest v1.14.4 + github.com/go-quicktest/qt v1.102.0 github.com/multiformats/go-base36 v0.1.0 github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 - github.com/stretchr/testify v1.8.1 golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 golang.org/x/sys v0.6.0 golang.org/x/time v0.0.0-20220609170525-579cf78fd858 @@ -41,7 +40,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 // indirect github.com/honeycombio/honeycomb-opentelemetry-go v0.3.0 // indirect github.com/honeycombio/opentelemetry-go-contrib/launcher v0.0.0-20221031150637-a3c60ed98d54 // indirect @@ -50,9 +49,8 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/sethvargo/go-envconfig v0.8.2 // indirect github.com/shirou/gopsutil/v3 v3.22.9 // indirect github.com/tklauser/go-sysconf v0.3.10 // indirect @@ -87,5 +85,4 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect google.golang.org/grpc v1.55.0 // indirect google.golang.org/protobuf v1.30.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 147cdfd2e..9603679cd 100644 --- a/go.sum +++ b/go.sum @@ -169,6 +169,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-quicktest/qt v1.102.0 h1:HSQxCeh5YZH3EL3W39ixjtyaEhcWSXQHtHnMBzSs474= +github.com/go-quicktest/qt v1.102.0/go.mod h1:p4lGIVX+8Wa6ZPNDvqcxq36XpUDLh42FLetFU7odllI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -218,8 +220,9 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -323,8 +326,9 @@ github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 h1:Lt9DzQALzHoDwMBGJ6v8ObDPR0dzr2a6sXTB1Fq7IHs= github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= @@ -342,7 +346,6 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -706,7 +709,6 @@ google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/krpc/compact-infohashes_test.go b/krpc/compact-infohashes_test.go index c8aa6a767..3b9708c53 100644 --- a/krpc/compact-infohashes_test.go +++ b/krpc/compact-infohashes_test.go @@ -4,27 +4,25 @@ import ( "testing" "github.com/anacrolix/torrent/bencode" - qt "github.com/frankban/quicktest" + "github.com/go-quicktest/qt" ) func TestUnmarshalCompactInfohashes(t *testing.T) { - c := qt.New(t) var cihs CompactInfohashes - c.Check(bencode.Unmarshal([]byte("40:HELLOHELLOHELLOHELLOworldworldworldworld"), &cihs), qt.IsNil) + qt.Check(t, qt.IsNil(bencode.Unmarshal([]byte("40:HELLOHELLOHELLOHELLOworldworldworldworld"), &cihs))) var expected [2][20]byte copy(expected[0][:], "HELLOHELLOHELLOHELLO") copy(expected[1][:], "worldworldworldworld") - c.Assert(cihs, qt.DeepEquals, CompactInfohashes(expected[:])) + qt.Assert(t, qt.DeepEquals(cihs, CompactInfohashes(expected[:]))) } func TestMarshalCompactInfohashes(t *testing.T) { - c := qt.New(t) var cihs CompactInfohashes - c.Assert(bencode.Unmarshal([]byte("40:HELLOHELLOHELLOHELLOworldworldworldworld"), &cihs), qt.IsNil) + qt.Assert(t, qt.IsNil(bencode.Unmarshal([]byte("40:HELLOHELLOHELLOHELLOworldworldworldworld"), &cihs))) b, err := cihs.MarshalBinary() - c.Assert(err, qt.IsNil) - c.Check(string(b), qt.Equals, "HELLOHELLOHELLOHELLOworldworldworldworld") + qt.Assert(t, qt.IsNil(err)) + qt.Check(t, qt.Equals(string(b), "HELLOHELLOHELLOHELLOworldworldworldworld")) bb, err := cihs.MarshalBencode() - c.Assert(err, qt.IsNil) - c.Check(string(bb), qt.Equals, "40:HELLOHELLOHELLOHELLOworldworldworldworld") + qt.Assert(t, qt.IsNil(err)) + qt.Check(t, qt.Equals(string(bb), "40:HELLOHELLOHELLOHELLOworldworldworldworld")) } diff --git a/krpc/compact_test.go b/krpc/compact_test.go index 7ed995ddc..263ebe8fe 100644 --- a/krpc/compact_test.go +++ b/krpc/compact_test.go @@ -4,8 +4,7 @@ import ( "net" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-quicktest/qt" ) func TestUnmarshalSlice(t *testing.T) { @@ -13,10 +12,10 @@ func TestUnmarshalSlice(t *testing.T) { err := data.UnmarshalBencode([]byte("52:" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x03\x04\x05\x06" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x03\x04\x05\x06\x07")) - require.NoError(t, err) - require.Len(t, data, 2) - assert.Equal(t, "1.2.3.4", data[0].Addr.IP.String()) - assert.Equal(t, "2.3.4.5", data[1].Addr.IP.String()) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.HasLen(data, 2)) + qt.Check(t, qt.Equals(data[0].Addr.IP.String(), "1.2.3.4")) + qt.Check(t, qt.Equals(data[1].Addr.IP.String(), "2.3.4.5")) } var nodeAddrIndexTests4 = []struct { @@ -78,14 +77,15 @@ var marshalIPv4SliceTests = []struct { func TestMarshalCompactIPv4NodeAddrs(t *testing.T) { for _, tc := range marshalIPv4SliceTests { - runFunc := assert.NotPanics + marshal := func() { + out, err := tc.in.MarshalBinary() + qt.Assert(t, qt.IsNil(err)) + qt.Check(t, qt.DeepEquals(out, tc.out), qt.Commentf("for input %v", tc.in)) + } if tc.panics { - runFunc = assert.Panics + qt.Check(t, qt.PanicMatches(marshal, ".*")) + } else { + qt.Check(t, qt.Not(qt.PanicMatches(marshal, ".*"))) } - runFunc(t, func() { - out, err := tc.in.MarshalBinary() - require.NoError(t, err) - assert.Equal(t, tc.out, out, "for input %v, %v", tc.in) - }) } } diff --git a/krpc/error_test.go b/krpc/error_test.go index f56e88710..73f453f92 100644 --- a/krpc/error_test.go +++ b/krpc/error_test.go @@ -4,12 +4,13 @@ import ( "testing" "github.com/anacrolix/torrent/bencode" - "github.com/stretchr/testify/require" + + "github.com/go-quicktest/qt" ) // https://github.com/anacrolix/torrent/issues/166 func TestUnmarshalBadError(t *testing.T) { var e Error err := bencode.Unmarshal([]byte(`l5:helloe`), &e) - require.Error(t, err) + qt.Assert(t, qt.IsNotNil(err)) } diff --git a/krpc/fuzz_test.go b/krpc/fuzz_test.go index 1c45ddd0b..7027757fe 100644 --- a/krpc/fuzz_test.go +++ b/krpc/fuzz_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/anacrolix/torrent/bencode" - qt "github.com/frankban/quicktest" + "github.com/go-quicktest/qt" ) // Check that if we can unmarshal a Msg that we can marshal it back without an error. We @@ -17,14 +17,13 @@ import ( func Fuzz(f *testing.F) { f.Add([]byte("d1:rd2:id20:\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01e1:t1:t1:y1:re")) f.Fuzz(func(t *testing.T, in []byte) { - c := qt.New(t) var m Msg err := bencode.Unmarshal(in, &m) if err != nil { t.Skip() } out, err := bencode.Marshal(m) - c.Assert(err, qt.IsNil) + qt.Assert(t, qt.IsNil(err)) if !bytes.Equal(in, out) { t.Skip() } diff --git a/krpc/id_test.go b/krpc/id_test.go index ef01ced4f..a72b749e0 100644 --- a/krpc/id_test.go +++ b/krpc/id_test.go @@ -4,11 +4,12 @@ import ( "testing" "github.com/anacrolix/torrent/bencode" - "github.com/stretchr/testify/assert" + + "github.com/go-quicktest/qt" ) func TestMarshalID(t *testing.T) { var id ID copy(id[:], []byte("012345678901234567890")) - assert.Equal(t, "20:01234567890123456789", string(bencode.MustMarshal(id))) + qt.Check(t, qt.Equals(string(bencode.MustMarshal(id)), "20:01234567890123456789")) } diff --git a/krpc/msg_test.go b/krpc/msg_test.go index 6bd49ebef..11a706c38 100644 --- a/krpc/msg_test.go +++ b/krpc/msg_test.go @@ -10,22 +10,19 @@ import ( "testing" "github.com/anacrolix/torrent/bencode" - qt "github.com/frankban/quicktest" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-quicktest/qt" ) func testMarshalUnmarshalMsg(t *testing.T, m Msg, expected string) { - c := qt.New(t) b, err := bencode.Marshal(m) - c.Assert(err, qt.IsNil) - c.Assert(string(b), qt.Equals, expected) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.Equals(string(b), expected)) var _m Msg err = bencode.Unmarshal([]byte(expected), &_m) - c.Assert(err, qt.IsNil) - c.Assert(_m, qt.ContentEquals, m) - c.Assert(_m.A, qt.ContentEquals, m.A) - c.Assert(_m.R, qt.ContentEquals, m.R) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.ContentEquals(_m, m)) + qt.Assert(t, qt.ContentEquals(_m.A, m.A)) + qt.Assert(t, qt.ContentEquals(_m.R, m.R)) } func TestMarshalUnmarshalMsg(t *testing.T) { @@ -142,21 +139,21 @@ func TestMsgReadOnly(t *testing.T) { testMarshalUnmarshalMsg(t, Msg{ReadOnly: true}, "d2:roi1e1:t0:1:y0:e") testMarshalUnmarshalMsg(t, Msg{ReadOnly: false}, "d1:t0:1:y0:e") var m Msg - require.NoError(t, bencode.Unmarshal([]byte("de"), &m)) - require.EqualValues(t, Msg{}, m) - require.NoError(t, bencode.Unmarshal([]byte("d2:roi1ee"), &m)) - require.EqualValues(t, Msg{ReadOnly: true}, m) - require.NoError(t, bencode.Unmarshal([]byte("d2:roi0ee"), &m)) - require.EqualValues(t, Msg{}, m) + qt.Assert(t, qt.IsNil(bencode.Unmarshal([]byte("de"), &m))) + qt.Assert(t, qt.DeepEquals(m, Msg{})) + qt.Assert(t, qt.IsNil(bencode.Unmarshal([]byte("d2:roi1ee"), &m))) + qt.Assert(t, qt.DeepEquals(m, Msg{ReadOnly: true})) + qt.Assert(t, qt.IsNil(bencode.Unmarshal([]byte("d2:roi0ee"), &m))) + qt.Assert(t, qt.DeepEquals(m, Msg{})) } func TestUnmarshalGetPeersResponse(t *testing.T) { var msg Msg err := bencode.Unmarshal([]byte("d1:rd6:valuesl6:\x01\x02\x03\x04\x05\x066:\x07\x08\x09\x0a\x0b\x0ce5:nodes52:\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x02\x03\x04\x05\x06\x07\x08\x09\x02\x03\x04\x05\x06\x07\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x02\x03\x04\x05\x06\x07\x08\x09\x02\x03\x04\x05\x06\x07ee"), &msg) - require.NoError(t, err) - assert.Len(t, msg.R.Values, 2) - assert.Len(t, msg.R.Nodes, 2) - assert.Nil(t, msg.E) + qt.Assert(t, qt.IsNil(err)) + qt.Check(t, qt.HasLen(msg.R.Values, 2)) + qt.Check(t, qt.HasLen(msg.R.Nodes, 2)) + qt.Check(t, qt.IsNil(msg.E)) } func unprettifyHex(s string) string { @@ -181,9 +178,9 @@ BFAF2E9E BFFFFEEC D67ADBF7 C67F17EF D5D75EBA 6FFEBA7F FF47A91E B1BFBB53 E8ABFB57 62ABE8FF 237279BF EFBFEEF5 FFC5FEBF DFE5ADFF ADFEE1FB 737FFFFB FD9F6AEF FEEE76B6 FD8F72EF `)) - require.NoError(t, err) - assert.EqualValues(t, expected, f[:]) - assert.EqualValues(t, 1224.9308, floorDecimals(f.EstimateCount(), 4)) + qt.Assert(t, qt.IsNil(err)) + qt.Check(t, qt.DeepEquals(f[:], expected)) + qt.Check(t, qt.Equals(floorDecimals(f.EstimateCount(), 4), 1224.9308)) } func floorDecimals(f float64, decimals int) float64 { @@ -193,16 +190,15 @@ func floorDecimals(f float64, decimals int) float64 { func TestEmptyScrapeBloomFilterEstimatedCount(t *testing.T) { var f ScrapeBloomFilter - assert.EqualValues(t, 0, math.Floor(f.EstimateCount())) + qt.Check(t, qt.Equals(math.Floor(f.EstimateCount()), 0)) } func marshalAndReturnUnmarshaledMsg(t *testing.T, m Msg, expected string) (ret Msg) { - c := qt.New(t) b, err := bencode.Marshal(m) - c.Assert(err, qt.IsNil) - c.Assert(string(b), qt.Equals, expected) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.Equals(string(b), expected)) err = bencode.Unmarshal([]byte(expected), &ret) - c.Assert(err, qt.IsNil) + qt.Assert(t, qt.IsNil(err)) return } @@ -223,7 +219,6 @@ func TestBep51EmptySampleField(t *testing.T) { }, "d1:rd2:id20:\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x007:samples0:e1:t0:1:y0:e", ).R.Samples - c := qt.New(t) - c.Assert(samples, qt.Not(qt.IsNil)) - c.Assert(*samples, qt.HasLen, 0) + qt.Assert(t, qt.Not(qt.IsNil(samples))) + qt.Assert(t, qt.HasLen(*samples, 0)) } diff --git a/krpc/nodeaddr_test.go b/krpc/nodeaddr_test.go index 5d36050c3..1a55b676d 100644 --- a/krpc/nodeaddr_test.go +++ b/krpc/nodeaddr_test.go @@ -6,8 +6,7 @@ import ( "net" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-quicktest/qt" ) var ( @@ -31,12 +30,12 @@ func TestNodeAddrBinaryRoundTrip(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { encoded, err := test.addr.MarshalBinary() - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) var got NodeAddr - require.NoError(t, got.UnmarshalBinary(encoded)) - assert.True(t, bytes.Equal(got.IP, test.addr.IP), "IP = %x, want %x", got.IP, test.addr.IP) - assert.Equal(t, test.addr.Port, got.Port) + qt.Assert(t, qt.IsNil(got.UnmarshalBinary(encoded))) + qt.Check(t, qt.IsTrue(bytes.Equal(got.IP, test.addr.IP)), qt.Commentf("IP = %x, want %x", got.IP, test.addr.IP)) + qt.Check(t, qt.Equals(got.Port, test.addr.Port)) }) } } @@ -54,15 +53,15 @@ func FuzzNodeAddrUnmarshalBinary(f *testing.F) { err := got.UnmarshalBinary(b) if len(b) < 2 { - require.Error(t, err) - assert.True(t, bytes.Equal(got.IP, original.IP), "receiver IP changed from %x to %x", original.IP, got.IP) - assert.Equal(t, original.Port, got.Port) + qt.Assert(t, qt.IsNotNil(err)) + qt.Check(t, qt.IsTrue(bytes.Equal(got.IP, original.IP)), qt.Commentf("receiver IP changed from %x to %x", original.IP, got.IP)) + qt.Check(t, qt.Equals(got.Port, original.Port)) return } - require.NoError(t, err) - assert.True(t, bytes.Equal(got.IP, b[:len(b)-2]), "IP = %x, want %x", got.IP, b[:len(b)-2]) - assert.Equal(t, int(binary.BigEndian.Uint16(b[len(b)-2:])), got.Port) + qt.Assert(t, qt.IsNil(err)) + qt.Check(t, qt.IsTrue(bytes.Equal(got.IP, b[:len(b)-2])), qt.Commentf("IP = %x, want %x", got.IP, b[:len(b)-2])) + qt.Check(t, qt.Equals(got.Port, int(binary.BigEndian.Uint16(b[len(b)-2:])))) }) } diff --git a/nodes_file_test.go b/nodes_file_test.go index 33a089c6b..544970317 100644 --- a/nodes_file_test.go +++ b/nodes_file_test.go @@ -5,21 +5,20 @@ import ( "os" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/anacrolix/dht/v2/krpc" + + "github.com/go-quicktest/qt" ) func TestSaveLoadNodesFile(t *testing.T) { f, err := ioutil.TempFile("", "") - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) defer os.Remove(f.Name()) f.Close() ns := []krpc.NodeInfo{krpc.RandomNodeInfo(4), krpc.RandomNodeInfo(16)} - require.NoError(t, WriteNodesToFile(ns, f.Name())) + qt.Assert(t, qt.IsNil(WriteNodesToFile(ns, f.Name()))) _ns, err := ReadNodesFromFile(f.Name()) - assert.NoError(t, err) + qt.Check(t, qt.IsNil(err)) _ns[0].Addr.IP = _ns[0].Addr.IP.To4() - assert.EqualValues(t, ns, _ns) + qt.Check(t, qt.DeepEquals(_ns, ns)) } diff --git a/security_test.go b/security_test.go index 9daa174ed..146e245e5 100644 --- a/security_test.go +++ b/security_test.go @@ -6,10 +6,9 @@ import ( "net" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/anacrolix/dht/v2/krpc" + + "github.com/go-quicktest/qt" ) func TestDHTSec(t *testing.T) { @@ -43,15 +42,15 @@ func TestDHTSec(t *testing.T) { } { ip := net.ParseIP(case_.ipStr) _id, err := hex.DecodeString(case_.nodeIDHex) - require.NoError(t, err) + qt.Assert(t, qt.IsNil(err)) var id krpc.ID - require.Equal(t, 20, copy(id[:], _id)) + qt.Assert(t, qt.Equals(copy(id[:], _id), 20)) secure := NodeIdSecure(id, ip) - assert.Equal(t, case_.valid, secure, "%v", case_) + qt.Check(t, qt.Equals(secure, case_.valid), qt.Commentf("%v", case_)) if !secure { // It's not secure, so secure it in place and then check it again. SecureNodeId(&id, ip) - assert.True(t, NodeIdSecure(id, ip), "%v", case_) + qt.Check(t, qt.IsTrue(NodeIdSecure(id, ip)), qt.Commentf("%v", case_)) } } } @@ -75,12 +74,12 @@ func TestSecureNodeIdMultipleIps(t *testing.T) { getInsecureIp(id, ip6) t.Logf("random ip4 address: %s", ip4) t.Logf("random ip6 address: %s", ip6) - require.False(t, NodeIdSecure(id, ip4)) - require.False(t, NodeIdSecure(id, ip6)) + qt.Assert(t, qt.IsFalse(NodeIdSecure(id, ip4))) + qt.Assert(t, qt.IsFalse(NodeIdSecure(id, ip6))) SecureNodeId(&id, ip4) - assert.True(t, NodeIdSecure(id, ip4)) - assert.False(t, NodeIdSecure(id, ip6)) + qt.Check(t, qt.IsTrue(NodeIdSecure(id, ip4))) + qt.Check(t, qt.IsFalse(NodeIdSecure(id, ip6))) SecureNodeId(&id, ip6) - assert.True(t, NodeIdSecure(id, ip6)) - assert.False(t, NodeIdSecure(id, ip4)) + qt.Check(t, qt.IsTrue(NodeIdSecure(id, ip6))) + qt.Check(t, qt.IsFalse(NodeIdSecure(id, ip4))) } diff --git a/server_test.go b/server_test.go index 5fb9a8042..736a3e149 100644 --- a/server_test.go +++ b/server_test.go @@ -7,14 +7,12 @@ import ( "github.com/anacrolix/log" "github.com/anacrolix/torrent/bencode" - "github.com/stretchr/testify/require" + "github.com/go-quicktest/qt" "github.com/anacrolix/dht/v2/bep44" ) func TestPutGet(t *testing.T) { - require := require.New(t) - l := log.Default.WithNames(t.Name()) s1 := newServer(t, l.WithNames("s1")) s2 := newServer(t, l.WithNames("s2")) @@ -22,76 +20,76 @@ func TestPutGet(t *testing.T) { s2Addr := NewAddr(s2.Addr()) immuItem, err := bep44.NewItem("Hello World! immu", nil, 1, 1, nil) - require.NoError(err) + qt.Assert(t, qt.IsNil(err)) // send get request to s2, we need a write token to put data qr := s1.Get(context.TODO(), s2Addr, immuItem.Target(), nil, QueryRateLimiting{}) - require.NoError(qr.ToError()) - require.NotNil(qr.Reply.R) - require.NotNil(qr.Reply.R.Token) + qt.Assert(t, qt.IsNil(qr.ToError())) + qt.Assert(t, qt.IsNotNil(qr.Reply.R)) + qt.Assert(t, qt.IsNotNil(qr.Reply.R.Token)) // send put request to s2 qr = s1.Put(context.TODO(), s2Addr, immuItem.ToPut(), *qr.Reply.R.Token, QueryRateLimiting{}) - require.NoError(qr.ToError()) + qt.Assert(t, qt.IsNil(qr.ToError())) qr = s1.Get(context.TODO(), s2Addr, immuItem.Target(), nil, QueryRateLimiting{}) - require.NoError(qr.ToError()) + qt.Assert(t, qt.IsNil(qr.ToError())) var vStr string // heueahea - require.NoError(bencode.Unmarshal(qr.Reply.R.V, &vStr)) - require.Equal("Hello World! immu", vStr) + qt.Assert(t, qt.IsNil(bencode.Unmarshal(qr.Reply.R.V, &vStr))) + qt.Assert(t, qt.Equals(vStr, "Hello World! immu")) _, priv, err := ed25519.GenerateKey(nil) - require.NoError(err) + qt.Assert(t, qt.IsNil(err)) mutItem, err := bep44.NewItem("Hello World!", []byte("s1"), 1, 1, priv) - require.NoError(err) + qt.Assert(t, qt.IsNil(err)) // send get request to s2, we need a write token to put data qr = s1.Get(context.TODO(), s2Addr, mutItem.Target(), nil, QueryRateLimiting{}) - require.NoError(qr.ToError()) - require.NotNil(qr.Reply.R) + qt.Assert(t, qt.IsNil(qr.ToError())) + qt.Assert(t, qt.IsNotNil(qr.Reply.R)) mutToken := qr.Reply.R.Token - require.NotNil(mutToken) + qt.Assert(t, qt.IsNotNil(mutToken)) // send put request to s2 qr = s1.Put(context.TODO(), s2Addr, mutItem.ToPut(), *mutToken, QueryRateLimiting{}) - require.NoError(qr.ToError()) + qt.Assert(t, qt.IsNil(qr.ToError())) qr = s1.Get(context.TODO(), s2Addr, mutItem.Target(), nil, QueryRateLimiting{}) - require.NoError(qr.ToError()) - require.NoError(bencode.Unmarshal(qr.Reply.R.V, &vStr)) - require.Equal("Hello World!", vStr) + qt.Assert(t, qt.IsNil(qr.ToError())) + qt.Assert(t, qt.IsNil(bencode.Unmarshal(qr.Reply.R.V, &vStr))) + qt.Assert(t, qt.Equals(vStr, "Hello World!")) ii, err := s2.store.Get(immuItem.Target()) - require.NoError(err) - require.Equal("Hello World! immu", ii.V) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.Equals(ii.V, "Hello World! immu")) mi, err := s2.store.Get(mutItem.Target()) - require.NoError(err) - require.Equal("Hello World!", mi.V) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.Equals(mi.V, "Hello World!")) // change mutable item ok := mutItem.Modify("Bye World!", priv) - require.True(ok) + qt.Assert(t, qt.IsTrue(ok)) qr = s1.Put(context.TODO(), s2Addr, mutItem.ToPut(), *mutToken, QueryRateLimiting{}) - require.NoError(qr.ToError()) + qt.Assert(t, qt.IsNil(qr.ToError())) mi, err = s2.store.Get(mutItem.Target()) - require.NoError(err) - require.Equal("Bye World!", mi.V) + qt.Assert(t, qt.IsNil(err)) + qt.Assert(t, qt.Equals(mi.V, "Bye World!")) qr = s1.Get(context.TODO(), s2Addr, mutItem.Target(), nil, QueryRateLimiting{}) - require.NoError(qr.ToError()) - require.NoError(bencode.Unmarshal(qr.Reply.R.V, &vStr)) - require.Equal("Bye World!", vStr) + qt.Assert(t, qt.IsNil(qr.ToError())) + qt.Assert(t, qt.IsNil(bencode.Unmarshal(qr.Reply.R.V, &vStr))) + qt.Assert(t, qt.Equals(vStr, "Bye World!")) seqPtr := new(int64) *seqPtr = 3 qr = s1.Get(context.TODO(), s2Addr, mutItem.Target(), seqPtr, QueryRateLimiting{}) - require.NoError(qr.ToError()) - require.Nil(qr.Reply.R.V) - require.Equal(int64(2), *qr.Reply.R.Seq) + qt.Assert(t, qt.IsNil(qr.ToError())) + qt.Assert(t, qt.IsNil(qr.Reply.R.V)) + qt.Assert(t, qt.Equals(*qr.Reply.R.Seq, int64(2))) } func newServer(t *testing.T, l log.Logger) *Server { diff --git a/table_test.go b/table_test.go index 26fbe8294..96efcb41e 100644 --- a/table_test.go +++ b/table_test.go @@ -4,8 +4,7 @@ import ( "net" "testing" - qt "github.com/frankban/quicktest" - "github.com/stretchr/testify/assert" + "github.com/go-quicktest/qt" "github.com/anacrolix/dht/v2/int160" ) @@ -14,11 +13,11 @@ func TestTable(t *testing.T) { tbl := table{k: 8} var maxFar int160.T maxFar.SetMax() - assert.Equal(t, 0, tbl.bucketIndex(maxFar)) - assert.Panics(t, func() { tbl.bucketIndex(tbl.rootID) }) + qt.Check(t, qt.Equals(tbl.bucketIndex(maxFar), 0)) + qt.Check(t, qt.PanicMatches(func() { tbl.bucketIndex(tbl.rootID) }, ".*")) - assert.Error(t, tbl.addNode(&node{})) - assert.Equal(t, 0, tbl.buckets[0].Len()) + qt.Check(t, qt.IsNotNil(tbl.addNode(&node{}))) + qt.Check(t, qt.Equals(tbl.buckets[0].Len(), 0)) id0 := int160.FromByteString("\x2f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00") id1 := int160.FromByteString("\x2e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00") @@ -31,24 +30,24 @@ func TestTable(t *testing.T) { Addr: NewAddr(&net.UDPAddr{}), }} - assert.NoError(t, tbl.addNode(n0)) - assert.Equal(t, 1, tbl.buckets[2].Len()) + qt.Check(t, qt.IsNil(tbl.addNode(n0))) + qt.Check(t, qt.Equals(tbl.buckets[2].Len(), 1)) - assert.Error(t, tbl.addNode(n0)) - assert.Equal(t, 1, tbl.buckets[2].Len()) - assert.Equal(t, 1, tbl.numNodes()) + qt.Check(t, qt.IsNotNil(tbl.addNode(n0))) + qt.Check(t, qt.Equals(tbl.buckets[2].Len(), 1)) + qt.Check(t, qt.Equals(tbl.numNodes(), 1)) - assert.NoError(t, tbl.addNode(n1)) - assert.Equal(t, 2, tbl.buckets[2].Len()) - assert.Equal(t, 2, tbl.numNodes()) + qt.Check(t, qt.IsNil(tbl.addNode(n1))) + qt.Check(t, qt.Equals(tbl.buckets[2].Len(), 2)) + qt.Check(t, qt.Equals(tbl.numNodes(), 2)) tbl.dropNode(n0) - assert.Equal(t, 1, tbl.buckets[2].Len()) - assert.Equal(t, 1, tbl.numNodes()) + qt.Check(t, qt.Equals(tbl.buckets[2].Len(), 1)) + qt.Check(t, qt.Equals(tbl.numNodes(), 1)) tbl.dropNode(n1) - assert.Equal(t, 0, tbl.buckets[2].Len()) - assert.Equal(t, 0, tbl.numNodes()) + qt.Check(t, qt.Equals(tbl.buckets[2].Len(), 0)) + qt.Check(t, qt.Equals(tbl.numNodes(), 0)) } func TestRandomIdInBucket(t *testing.T) { @@ -59,6 +58,6 @@ func TestRandomIdInBucket(t *testing.T) { for i := range tbl.buckets { id := tbl.randomIdForBucket(i) t.Logf("%v: random id for bucket index %v", id, i) - qt.Assert(t, tbl.bucketIndex(id), qt.Equals, i) + qt.Assert(t, qt.Equals(tbl.bucketIndex(id), i)) } } diff --git a/tokens_test.go b/tokens_test.go index ae19e6630..76113a150 100644 --- a/tokens_test.go +++ b/tokens_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/stretchr/testify/assert" + "github.com/go-quicktest/qt" ) func TestTokenServer(t *testing.T) { @@ -21,14 +21,14 @@ func TestTokenServer(t *testing.T) { maxIntervalDelta: 2, } tok := ts.CreateToken(addr1) - assert.Len(t, tok, 20) - assert.True(t, ts.ValidToken(tok, addr1)) - assert.False(t, ts.ValidToken(tok[1:], addr1)) - assert.False(t, ts.ValidToken(tok, addr2)) + qt.Check(t, qt.HasLen(tok, 20)) + qt.Check(t, qt.IsTrue(ts.ValidToken(tok, addr1))) + qt.Check(t, qt.IsFalse(ts.ValidToken(tok[1:], addr1))) + qt.Check(t, qt.IsFalse(ts.ValidToken(tok, addr2))) func() { ts0 := ts ts0.secret = nil - assert.False(t, ts0.ValidToken(tok, addr1)) + qt.Check(t, qt.IsFalse(ts0.ValidToken(tok, addr1))) }() now := time.Now() setTime := func(t time.Time) { @@ -38,17 +38,17 @@ func TestTokenServer(t *testing.T) { } setTime(now) tok = ts.CreateToken(addr1) - assert.True(t, ts.ValidToken(tok, addr1)) + qt.Check(t, qt.IsTrue(ts.ValidToken(tok, addr1))) setTime(time.Time{}) - assert.False(t, ts.ValidToken(tok, addr1)) + qt.Check(t, qt.IsFalse(ts.ValidToken(tok, addr1))) setTime(now.Add(-5 * time.Minute)) - assert.False(t, ts.ValidToken(tok, addr1)) + qt.Check(t, qt.IsFalse(ts.ValidToken(tok, addr1))) setTime(now) - assert.True(t, ts.ValidToken(tok, addr1)) + qt.Check(t, qt.IsTrue(ts.ValidToken(tok, addr1))) setTime(now.Add(5 * time.Minute)) - assert.True(t, ts.ValidToken(tok, addr1)) + qt.Check(t, qt.IsTrue(ts.ValidToken(tok, addr1))) setTime(now.Add(2 * 5 * time.Minute)) - assert.True(t, ts.ValidToken(tok, addr1)) + qt.Check(t, qt.IsTrue(ts.ValidToken(tok, addr1))) setTime(now.Add(3 * 5 * time.Minute)) - assert.False(t, ts.ValidToken(tok, addr1)) + qt.Check(t, qt.IsFalse(ts.ValidToken(tok, addr1))) } diff --git a/types/addr-maybe-id_test.go b/types/addr-maybe-id_test.go index b90d4e96b..a0f0ebdd3 100644 --- a/types/addr-maybe-id_test.go +++ b/types/addr-maybe-id_test.go @@ -6,25 +6,24 @@ import ( "testing" "github.com/bradfitz/iter" - qt "github.com/frankban/quicktest" + "github.com/go-quicktest/qt" "github.com/anacrolix/dht/v2/krpc" ) func TestNoIdFarther(tb *testing.T) { - c := qt.New(tb) var a AddrMaybeId a.FromNodeInfo(krpc.RandomNodeInfo(16)) target := krpc.RandomNodeID().Int160() b := a - c.Assert(a.CloserThan(b, target), qt.IsFalse) + qt.Assert(tb, qt.IsFalse(a.CloserThan(b, target))) b.Id.SetNone() - c.Assert(a.CloserThan(b, target), qt.IsTrue) - c.Assert(b.CloserThan(a, target), qt.IsFalse) - c.Assert(b.CloserThan(b, target), qt.IsFalse) + qt.Assert(tb, qt.IsTrue(a.CloserThan(b, target))) + qt.Assert(tb, qt.IsFalse(b.CloserThan(a, target))) + qt.Assert(tb, qt.IsFalse(b.CloserThan(b, target))) b.Id.SetSomeZeroValue() b.Id = a.Id - c.Assert(a.CloserThan(b, target), qt.IsFalse) + qt.Assert(tb, qt.IsFalse(a.CloserThan(b, target))) id := a.Id.UnwrapPtr() for i := range iter.N(160) { if target.GetBit(i) != id.GetBit(i) { @@ -35,19 +34,18 @@ func TestNoIdFarther(tb *testing.T) { tb.Log(a) tb.Log(b) tb.Log(target) - c.Assert(a.CloserThan(b, target), qt.IsTrue) + qt.Assert(tb, qt.IsTrue(a.CloserThan(b, target))) } func TestCloserThanId(tb *testing.T) { - c := qt.New(tb) var a AddrMaybeId a.FromNodeInfo(krpc.RandomNodeInfo(16)) target := krpc.RandomNodeID().Int160() - c.Assert(a.CloserThan(a, target), qt.IsFalse) + qt.Assert(tb, qt.IsFalse(a.CloserThan(a, target))) b := a b.Id.SetSomeZeroValue() b.Id = a.Id - c.Assert(a.CloserThan(b, target), qt.IsFalse) + qt.Assert(tb, qt.IsFalse(a.CloserThan(b, target))) for i := range iter.N(160) { if target.GetBit(i) != a.Id.UnwrapPtr().GetBit(i) { a.Id.UnwrapPtr().SetBit(i, target.GetBit(i)) @@ -57,7 +55,7 @@ func TestCloserThanId(tb *testing.T) { tb.Log(a) tb.Log(b) tb.Log(target) - c.Assert(a.CloserThan(b, target), qt.IsTrue) + qt.Assert(tb, qt.IsTrue(a.CloserThan(b, target))) } func BenchmarkDeterministicAddr(tb *testing.B) {