Skip to content

Commit

Permalink
Replace t.(Error/Fatal) with require.NoError
Browse files Browse the repository at this point in the history 
Make tests easier to read
  • Loading branch information
@stv0g @Sean-Der
stv0g authored and Sean-Der committed Mar 24, 2024
1 parent b2e40ad commit 52f2075
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 138 deletions.
16 changes: 4 additions & 12 deletions active_tcp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,30 +170,22 @@ func TestActiveTCP_NonBlocking(t *testing.T) {
}

aAgent, err := NewAgent(cfg)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

bAgent, err := NewAgent(cfg)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

isConnected := make(chan interface{})
err = aAgent.OnConnectionStateChange(func(c ConnectionState) {
if c == ConnectionStateConnected {
close(isConnected)
}
})
if err != nil {
t.Error(err)
}
require.NoError(t, err)

// Add a invalid ice-tcp candidate to each
invalidCandidate, err := UnmarshalCandidate("1052353102 1 tcp 1675624447 192.0.2.1 8080 typ host tcptype passive")
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)
require.NoError(t, aAgent.AddRemoteCandidate(invalidCandidate))
require.NoError(t, bAgent.AddRemoteCandidate(invalidCandidate))

Expand Down
48 changes: 12 additions & 36 deletions agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ func TestHandlePeerReflexive(t *testing.T) {
stun.NewShortTermIntegrity(a.localPwd),
stun.Fingerprint,
)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

// nolint: contextcheck
a.handleInbound(msg, local, remote)
Expand Down Expand Up @@ -163,9 +161,7 @@ func TestHandlePeerReflexive(t *testing.T) {
stun.NewShortTermIntegrity(a.remotePwd),
stun.Fingerprint,
)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

// nolint: contextcheck
a.handleInbound(msg, local, remote)
Expand Down Expand Up @@ -353,9 +349,7 @@ func TestInboundValidity(t *testing.T) {
stun.NewShortTermIntegrity(key),
stun.Fingerprint,
)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

return msg
}
Expand Down Expand Up @@ -449,9 +443,7 @@ func TestInboundValidity(t *testing.T) {
stun.NewUsername(a.localUfrag+":"+a.remoteUfrag),
stun.NewShortTermIntegrity(a.localPwd),
)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

// nolint: contextcheck
a.handleInbound(msg, local, remote)
Expand Down Expand Up @@ -547,14 +539,10 @@ func TestConnectionStateCallback(t *testing.T) {
}

aAgent, err := NewAgent(cfg)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

bAgent, err := NewAgent(cfg)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

isChecking := make(chan interface{})
isConnected := make(chan interface{})
Expand All @@ -576,9 +564,7 @@ func TestConnectionStateCallback(t *testing.T) {
default:
}
})
if err != nil {
t.Error(err)
}
require.NoError(t, err)

connect(aAgent, bAgent)

Expand Down Expand Up @@ -1385,14 +1371,10 @@ func TestCloseInConnectionStateCallback(t *testing.T) {
}

aAgent, err := NewAgent(cfg)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

bAgent, err := NewAgent(cfg)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

isClosed := make(chan interface{})
isConnected := make(chan interface{})
Expand All @@ -1406,9 +1388,7 @@ func TestCloseInConnectionStateCallback(t *testing.T) {
default:
}
})
if err != nil {
t.Error(err)
}
require.NoError(t, err)

connect(aAgent, bAgent)
close(isConnected)
Expand Down Expand Up @@ -1449,9 +1429,7 @@ func TestRunTaskInConnectionStateCallback(t *testing.T) {
close(isComplete)
}
})
if err != nil {
t.Error(err)
}
require.NoError(t, err)

connect(aAgent, bAgent)

Expand Down Expand Up @@ -1713,9 +1691,7 @@ func TestAcceptAggressiveNomination(t *testing.T) {
PriorityAttr(priority),
stun.Fingerprint,
)
if err1 != nil {
t.Fatal(err1)
}
require.NoError(t, err1)

return msg
}
Expand Down
16 changes: 4 additions & 12 deletions candidate_relay_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,16 @@ func TestRelayOnlyConnection(t *testing.T) {
}

aAgent, err := NewAgent(cfg)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))

bAgent, err := NewAgent(cfg)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))

connect(aAgent, bAgent)
<-aConnected
Expand Down
16 changes: 4 additions & 12 deletions candidate_server_reflexive_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,16 @@ func TestServerReflexiveOnlyConnection(t *testing.T) {
}

aAgent, err := NewAgent(cfg)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))

bAgent, err := NewAgent(cfg)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))

connect(aAgent, bAgent)
<-aConnected
Expand Down
5 changes: 2 additions & 3 deletions gather_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ func TestListenUDP(t *testing.T) {
require.NotNil(t, conn, "listenUDP error with no port restriction return a nil conn")

_, port, err = net.SplitHostPort(conn.LocalAddr().String())
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

p, _ := strconv.Atoi(port)
if p < portMin || p > portMax {
t.Fatalf("listenUDP with port restriction [%d, %d] listened on incorrect port (%s)", portMin, portMax, port)
Expand Down
33 changes: 15 additions & 18 deletions gather_vnet_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ func TestVNetGather(t *testing.T) {
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if len(localIPs) > 0 {
t.Fatal("should return no local IP")
} else if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

require.NoError(t, a.Close())
})
Expand Down Expand Up @@ -77,9 +76,8 @@ func TestVNetGather(t *testing.T) {
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if len(localIPs) == 0 {
t.Fatal("should have one local IP")
} else if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

for _, ip := range localIPs {
if ip.IsLoopback() {
Expand Down Expand Up @@ -120,9 +118,8 @@ func TestVNetGather(t *testing.T) {
localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if len(localIPs) == 0 {
t.Fatal("localInterfaces found no interfaces, unable to test")
} else if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

ip := localIPs[0]

Expand Down Expand Up @@ -150,9 +147,9 @@ func TestVNetGather(t *testing.T) {
}

_, port, err := net.SplitHostPort(conn.LocalAddr().String())
if err != nil {
t.Fatal(err)
} else if port != "5000" {

require.NoError(t, err)
if port != "5000" {
t.Fatalf("listenUDP with port restriction of 5000 listened on incorrect port (%s)", port)
}

Expand Down Expand Up @@ -389,9 +386,9 @@ func TestVNetGatherWithInterfaceFilter(t *testing.T) {
require.NoError(t, err)

localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if err != nil {
t.Fatal(err)
} else if len(localIPs) != 0 {
require.NoError(t, err)

if len(localIPs) != 0 {
t.Fatal("InterfaceFilter should have excluded everything")
}

Expand All @@ -409,9 +406,9 @@ func TestVNetGatherWithInterfaceFilter(t *testing.T) {
require.NoError(t, err)

localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if err != nil {
t.Fatal(err)
} else if len(localIPs) != 0 {
require.NoError(t, err)

if len(localIPs) != 0 {
t.Fatal("IPFilter should have excluded everything")
}

Expand All @@ -429,9 +426,9 @@ func TestVNetGatherWithInterfaceFilter(t *testing.T) {
require.NoError(t, err)

localIPs, err := localInterfaces(a.net, a.interfaceFilter, a.ipFilter, []NetworkType{NetworkTypeUDP4}, false)
if err != nil {
t.Fatal(err)
} else if len(localIPs) == 0 {
require.NoError(t, err)

if len(localIPs) == 0 {
t.Fatal("InterfaceFilter should not have excluded anything")
}

Expand Down
36 changes: 9 additions & 27 deletions mdns_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,16 @@ func TestMulticastDNSOnlyConnection(t *testing.T) {
}

aAgent, err := NewAgent(cfg)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))

bAgent, err := NewAgent(cfg)
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))

connect(aAgent, bAgent)
<-aConnected
Expand All @@ -67,28 +59,20 @@ func TestMulticastDNSMixedConnection(t *testing.T) {
CandidateTypes: []CandidateType{CandidateTypeHost},
MulticastDNSMode: MulticastDNSModeQueryAndGather,
})
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

aNotifier, aConnected := onConnected()
if err = aAgent.OnConnectionStateChange(aNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, aAgent.OnConnectionStateChange(aNotifier))

bAgent, err := NewAgent(&AgentConfig{
NetworkTypes: []NetworkType{NetworkTypeUDP4},
CandidateTypes: []CandidateType{CandidateTypeHost},
MulticastDNSMode: MulticastDNSModeQueryOnly,
})
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)

bNotifier, bConnected := onConnected()
if err = bAgent.OnConnectionStateChange(bNotifier); err != nil {
t.Fatal(err)
}
require.NoError(t, bAgent.OnConnectionStateChange(bNotifier))

connect(aAgent, bAgent)
<-aConnected
Expand Down Expand Up @@ -133,9 +117,7 @@ func TestMulticastDNSStaticHostName(t *testing.T) {

func TestGenerateMulticastDNSName(t *testing.T) {
name, err := generateMulticastDNSName()
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)
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+$`,
).MatchString
Expand Down

0 comments on commit 52f2075

Please sign in to comment.