zishuo/ice
1
0
Fork 0
mirror of https://github.com/pion/ice.git synced 2025-10-05 15:37:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace t.(Error/Fatal) with require.NoError

Browse Source 
Make tests easier to read
This commit is contained in:
Steffen Vogel
2024-03-23 21:01:58 -04:00
committed by Sean DuBois
parent b2e40ad7fa
commit 52f2075c2e
9 changed files with 58 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
active_tcp_test.go
View File

@@ -170,14 +170,10 @@ func TestActiveTCP_NonBlocking(t *testing.T) {
} }
aAgent, err := NewAgent(cfg) aAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Error(err)
}
bAgent, err := NewAgent(cfg) bAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Error(err)
}
isConnected := make(chan interface{}) isConnected := make(chan interface{})
err = aAgent.OnConnectionStateChange(func(c ConnectionState) { err = aAgent.OnConnectionStateChange(func(c ConnectionState) {
@@ -185,15 +181,11 @@ func TestActiveTCP_NonBlocking(t *testing.T) {
close(isConnected) close(isConnected)
} }
}) })
if err != nil { require.NoError(t, err)
t.Error(err)
}
// Add a invalid ice-tcp candidate to each // Add a invalid ice-tcp candidate to each
invalidCandidate, err := UnmarshalCandidate("1052353102 1 tcp 1675624447 192.0.2.1 8080 typ host tcptype passive") invalidCandidate, err := UnmarshalCandidate("1052353102 1 tcp 1675624447 192.0.2.1 8080 typ host tcptype passive")
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
require.NoError(t, aAgent.AddRemoteCandidate(invalidCandidate)) require.NoError(t, aAgent.AddRemoteCandidate(invalidCandidate))
require.NoError(t, bAgent.AddRemoteCandidate(invalidCandidate)) require.NoError(t, bAgent.AddRemoteCandidate(invalidCandidate))

48
agent_test.go
View File

@@ -68,9 +68,7 @@ func TestHandlePeerReflexive(t *testing.T) {
stun.NewShortTermIntegrity(a.localPwd), stun.NewShortTermIntegrity(a.localPwd),
stun.Fingerprint, stun.Fingerprint,
) )
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
// nolint: contextcheck // nolint: contextcheck
a.handleInbound(msg, local, remote) a.handleInbound(msg, local, remote)
@@ -163,9 +161,7 @@ func TestHandlePeerReflexive(t *testing.T) {
stun.NewShortTermIntegrity(a.remotePwd), stun.NewShortTermIntegrity(a.remotePwd),
stun.Fingerprint, stun.Fingerprint,
) )
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
// nolint: contextcheck // nolint: contextcheck
a.handleInbound(msg, local, remote) a.handleInbound(msg, local, remote)
@@ -353,9 +349,7 @@ func TestInboundValidity(t *testing.T) {
stun.NewShortTermIntegrity(key), stun.NewShortTermIntegrity(key),
stun.Fingerprint, stun.Fingerprint,
) )
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
return msg return msg
} }
@@ -449,9 +443,7 @@ func TestInboundValidity(t *testing.T) {
stun.NewUsername(a.localUfrag+":"+a.remoteUfrag), stun.NewUsername(a.localUfrag+":"+a.remoteUfrag),
stun.NewShortTermIntegrity(a.localPwd), stun.NewShortTermIntegrity(a.localPwd),
) )
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
// nolint: contextcheck // nolint: contextcheck
a.handleInbound(msg, local, remote) a.handleInbound(msg, local, remote)
@@ -547,14 +539,10 @@ func TestConnectionStateCallback(t *testing.T) {
} }
aAgent, err := NewAgent(cfg) aAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Error(err)
}
bAgent, err := NewAgent(cfg) bAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Error(err)
}
isChecking := make(chan interface{}) isChecking := make(chan interface{})
isConnected := make(chan interface{}) isConnected := make(chan interface{})
@@ -576,9 +564,7 @@ func TestConnectionStateCallback(t *testing.T) {
default: default:
} }
}) })
if err != nil { require.NoError(t, err)
t.Error(err)
}
connect(aAgent, bAgent) connect(aAgent, bAgent)
@@ -1385,14 +1371,10 @@ func TestCloseInConnectionStateCallback(t *testing.T) {
} }
aAgent, err := NewAgent(cfg) aAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Error(err)
}
bAgent, err := NewAgent(cfg) bAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Error(err)
}
isClosed := make(chan interface{}) isClosed := make(chan interface{})
isConnected := make(chan interface{}) isConnected := make(chan interface{})
@@ -1406,9 +1388,7 @@ func TestCloseInConnectionStateCallback(t *testing.T) {
default: default:
} }
}) })
if err != nil { require.NoError(t, err)
t.Error(err)
}
connect(aAgent, bAgent) connect(aAgent, bAgent)
close(isConnected) close(isConnected)
@@ -1449,9 +1429,7 @@ func TestRunTaskInConnectionStateCallback(t *testing.T) {
close(isComplete) close(isComplete)
} }
}) })
if err != nil { require.NoError(t, err)
t.Error(err)
}
connect(aAgent, bAgent) connect(aAgent, bAgent)
@@ -1713,9 +1691,7 @@ func TestAcceptAggressiveNomination(t *testing.T) {
PriorityAttr(priority), PriorityAttr(priority),
stun.Fingerprint, stun.Fingerprint,
) )
if err1 != nil { require.NoError(t, err1)
t.Fatal(err1)
}
return msg return msg
} }

16
candidate_relay_test.go
View File

@@ -60,24 +60,16 @@ func TestRelayOnlyConnection(t *testing.T) {
} }
aAgent, err := NewAgent(cfg) aAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
aNotifier, aConnected := onConnected() aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil { require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))
t.Fatal(err)
}
bAgent, err := NewAgent(cfg) bAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
bNotifier, bConnected := onConnected() bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil { require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))
t.Fatal(err)
}
connect(aAgent, bAgent) connect(aAgent, bAgent)
<-aConnected <-aConnected

16
candidate_server_reflexive_test.go
View File

@@ -53,24 +53,16 @@ func TestServerReflexiveOnlyConnection(t *testing.T) {
} }
aAgent, err := NewAgent(cfg) aAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
aNotifier, aConnected := onConnected() aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil { require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))
t.Fatal(err)
}
bAgent, err := NewAgent(cfg) bAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
bNotifier, bConnected := onConnected() bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil { require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))
t.Fatal(err)
}
connect(aAgent, bAgent) connect(aAgent, bAgent)
<-aConnected <-aConnected

5
gather_test.go
View File

@@ -66,9 +66,8 @@ func TestListenUDP(t *testing.T) {
require.NotNil(t, conn, "listenUDP error with no port restriction return a nil conn") require.NotNil(t, conn, "listenUDP error with no port restriction return a nil conn")
_, port, err = net.SplitHostPort(conn.LocalAddr().String()) _, port, err = net.SplitHostPort(conn.LocalAddr().String())
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
p, _ := strconv.Atoi(port) p, _ := strconv.Atoi(port)
if p < portMin || p > portMax { if p < portMin || p > portMax {
t.Fatalf("listenUDP with port restriction [%d, %d] listened on incorrect port (%s)", portMin, portMax, port) t.Fatalf("listenUDP with port restriction [%d, %d] listened on incorrect port (%s)", portMin, portMax, port)

33
gather_vnet_test.go
View File

@@ -37,9 +37,8 @@ func TestVNetGather(t *testing.T) {
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false) localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if len(localIPs) > 0 { if len(localIPs) > 0 {
t.Fatal("should return no local IP") t.Fatal("should return no local IP")
} else if err != nil {
t.Fatal(err)
} }
require.NoError(t, err)
require.NoError(t, a.Close()) require.NoError(t, a.Close())
}) })
@@ -77,9 +76,8 @@ func TestVNetGather(t *testing.T) {
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false) localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if len(localIPs) == 0 { if len(localIPs) == 0 {
t.Fatal("should have one local IP") t.Fatal("should have one local IP")
} else if err != nil {
t.Fatal(err)
} }
require.NoError(t, err)
for _, ip := range localIPs { for _, ip := range localIPs {
if ip.IsLoopback() { if ip.IsLoopback() {
@@ -120,9 +118,8 @@ func TestVNetGather(t *testing.T) {
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false) localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if len(localIPs) == 0 { if len(localIPs) == 0 {
t.Fatal("localInterfaces found no interfaces, unable to test") t.Fatal("localInterfaces found no interfaces, unable to test")
} else if err != nil {
t.Fatal(err)
} }
require.NoError(t, err)
ip := localIPs[0] ip := localIPs[0]
@@ -150,9 +147,9 @@ func TestVNetGather(t *testing.T) {
} }
_, port, err := net.SplitHostPort(conn.LocalAddr().String()) _, port, err := net.SplitHostPort(conn.LocalAddr().String())
if err != nil {
t.Fatal(err) require.NoError(t, err)
} else if port != "5000" { if port != "5000" {
t.Fatalf("listenUDP with port restriction of 5000 listened on incorrect port (%s)", port) t.Fatalf("listenUDP with port restriction of 5000 listened on incorrect port (%s)", port)
} }
@@ -389,9 +386,9 @@ func TestVNetGatherWithInterfaceFilter(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false) localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if err != nil { require.NoError(t, err)
t.Fatal(err)
} else if len(localIPs) != 0 { if len(localIPs) != 0 {
t.Fatal("InterfaceFilter should have excluded everything") t.Fatal("InterfaceFilter should have excluded everything")
} }
@@ -409,9 +406,9 @@ func TestVNetGatherWithInterfaceFilter(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false) localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if err != nil { require.NoError(t, err)
t.Fatal(err)
} else if len(localIPs) != 0 { if len(localIPs) != 0 {
t.Fatal("IPFilter should have excluded everything") t.Fatal("IPFilter should have excluded everything")
} }
@@ -429,9 +426,9 @@ func TestVNetGatherWithInterfaceFilter(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false) localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if err != nil { require.NoError(t, err)
t.Fatal(err)
} else if len(localIPs) == 0 { if len(localIPs) == 0 {
t.Fatal("InterfaceFilter should not have excluded anything") t.Fatal("InterfaceFilter should not have excluded anything")
} }

36
mdns_test.go
View File

@@ -29,24 +29,16 @@ func TestMulticastDNSOnlyConnection(t *testing.T) {
} }
aAgent, err := NewAgent(cfg) aAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
aNotifier, aConnected := onConnected() aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil { require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))
t.Fatal(err)
}
bAgent, err := NewAgent(cfg) bAgent, err := NewAgent(cfg)
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
bNotifier, bConnected := onConnected() bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil { require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))
t.Fatal(err)
}
connect(aAgent, bAgent) connect(aAgent, bAgent)
<-aConnected <-aConnected
@@ -67,28 +59,20 @@ func TestMulticastDNSMixedConnection(t *testing.T) {
CandidateTypes: []CandidateType{CandidateTypeHost}, CandidateTypes: []CandidateType{CandidateTypeHost},
MulticastDNSMode: MulticastDNSModeQueryAndGather, MulticastDNSMode: MulticastDNSModeQueryAndGather,
}) })
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
aNotifier, aConnected := onConnected() aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil { require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))
t.Fatal(err)
}
bAgent, err := NewAgent(&AgentConfig{ bAgent, err := NewAgent(&AgentConfig{
NetworkTypes: []NetworkType{NetworkTypeUDP4}, NetworkTypes: []NetworkType{NetworkTypeUDP4},
CandidateTypes: []CandidateType{CandidateTypeHost}, CandidateTypes: []CandidateType{CandidateTypeHost},
MulticastDNSMode: MulticastDNSModeQueryOnly, MulticastDNSMode: MulticastDNSModeQueryOnly,
}) })
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
bNotifier, bConnected := onConnected() bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil { require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))
t.Fatal(err)
}
connect(aAgent, bAgent) connect(aAgent, bAgent)
<-aConnected <-aConnected
@@ -133,9 +117,7 @@ func TestMulticastDNSStaticHostName(t *testing.T) {
func TestGenerateMulticastDNSName(t *testing.T) { func TestGenerateMulticastDNSName(t *testing.T) {
name, err := generateMulticastDNSName() name, err := generateMulticastDNSName()
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
isMDNSName := regexp.MustCompile( isMDNSName := regexp.MustCompile(
`^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}.local+$`, `^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}.local+$`,
).MatchString ).MatchString

10
rand_test.go
View File

@@ -6,6 +6,8 @@ package ice
import ( import (
"sync" "sync"
"testing" "testing"
"github.com/stretchr/testify/require"
) )
func TestRandomGeneratorCollision(t *testing.T) { func TestRandomGeneratorCollision(t *testing.T) {
@@ -22,18 +24,14 @@ func TestRandomGeneratorCollision(t *testing.T) {
"PWD": { "PWD": {
gen: func(t *testing.T) string { gen: func(t *testing.T) string {
s, err := generatePwd() s, err := generatePwd()
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
return s return s
}, },
}, },
"Ufrag": { "Ufrag": {
gen: func(t *testing.T) string { gen: func(t *testing.T) string {
s, err := generateUFrag() s, err := generateUFrag()
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
return s return s
}, },
}, },

16
transport_test.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/pion/stun/v2" "github.com/pion/stun/v2"
"github.com/pion/transport/v3/test" "github.com/pion/transport/v3/test"
"github.com/stretchr/testify/require"
) )
func TestStressDuplex(t *testing.T) { func TestStressDuplex(t *testing.T) {
@@ -134,14 +135,8 @@ func stressDuplex(t *testing.T) {
ca, cb := pipe(nil) ca, cb := pipe(nil)
defer func() { defer func() {
err := ca.Close() require.NoError(t, ca.Close())
if err != nil { require.NoError(t, cb.Close())
t.Fatal(err)
}
err = cb.Close()
if err != nil {
t.Fatal(err)
}
}() }()
opt := test.Options{ opt := test.Options{
@@ -149,10 +144,7 @@ func stressDuplex(t *testing.T) {
MsgCount: 1, // Order not reliable due to UDP & potentially multiple candidate pairs. MsgCount: 1, // Order not reliable due to UDP & potentially multiple candidate pairs.
} }
err := test.StressDuplex(ca, cb, opt) require.NoError(t, test.StressDuplex(ca, cb, opt))
if err != nil {
t.Fatal(err)
}
} }
func check(err error) { func check(err error) {