66 "testing"
77
88 "github.com/Azure/azure-container-networking/cns/cniconflist"
9- "github.com/stretchr/testify/assert "
9+ "github.com/stretchr/testify/require "
1010)
1111
1212type bufferWriteCloser struct {
@@ -23,13 +23,13 @@ func TestGenerateV4OverlayConflist(t *testing.T) {
2323 buffer := new (bytes.Buffer )
2424 g := cniconflist.V4OverlayGenerator {Writer : & bufferWriteCloser {buffer }}
2525 err := g .Generate ()
26- assert .NoError (t , err )
26+ require .NoError (t , err )
2727
2828 fixtureBytes , err := os .ReadFile (fixture )
29- assert .NoError (t , err )
29+ require .NoError (t , err )
3030
3131 // remove newlines and carriage returns in case these UTs are running on Windows
32- assert .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
32+ require .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
3333}
3434
3535func TestGenerateDualStackOverlayConflist (t * testing.T ) {
@@ -38,13 +38,13 @@ func TestGenerateDualStackOverlayConflist(t *testing.T) {
3838 buffer := new (bytes.Buffer )
3939 g := cniconflist.DualStackOverlayGenerator {Writer : & bufferWriteCloser {buffer }}
4040 err := g .Generate ()
41- assert .NoError (t , err )
41+ require .NoError (t , err )
4242
4343 fixtureBytes , err := os .ReadFile (fixture )
44- assert .NoError (t , err )
44+ require .NoError (t , err )
4545
4646 // remove newlines and carriage returns in case these UTs are running on Windows
47- assert .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
47+ require .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
4848}
4949
5050func TestGenerateOverlayConflist (t * testing.T ) {
@@ -53,13 +53,13 @@ func TestGenerateOverlayConflist(t *testing.T) {
5353 buffer := new (bytes.Buffer )
5454 g := cniconflist.OverlayGenerator {Writer : & bufferWriteCloser {buffer }}
5555 err := g .Generate ()
56- assert .NoError (t , err )
56+ require .NoError (t , err )
5757
5858 fixtureBytes , err := os .ReadFile (fixture )
59- assert .NoError (t , err )
59+ require .NoError (t , err )
6060
6161 // remove newlines and carriage returns in case these UTs are running on Windows
62- assert .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
62+ require .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
6363}
6464
6565func TestGenerateCiliumConflist (t * testing.T ) {
@@ -68,13 +68,13 @@ func TestGenerateCiliumConflist(t *testing.T) {
6868 buffer := new (bytes.Buffer )
6969 g := cniconflist.CiliumGenerator {Writer : & bufferWriteCloser {buffer }}
7070 err := g .Generate ()
71- assert .NoError (t , err )
71+ require .NoError (t , err )
7272
7373 fixtureBytes , err := os .ReadFile (fixture )
74- assert .NoError (t , err )
74+ require .NoError (t , err )
7575
7676 // remove newlines and carriage returns in case these UTs are running on Windows
77- assert .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
77+ require .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
7878}
7979
8080func TestGenerateSWIFTConflist (t * testing.T ) {
@@ -83,13 +83,13 @@ func TestGenerateSWIFTConflist(t *testing.T) {
8383 buffer := new (bytes.Buffer )
8484 g := cniconflist.SWIFTGenerator {Writer : & bufferWriteCloser {buffer }}
8585 err := g .Generate ()
86- assert .NoError (t , err )
86+ require .NoError (t , err )
8787
8888 fixtureBytes , err := os .ReadFile (fixture )
89- assert .NoError (t , err )
89+ require .NoError (t , err )
9090
9191 // remove newlines and carriage returns in case these UTs are running on Windows
92- assert .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
92+ require .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
9393}
9494
9595func TestGenerateAzurecniCiliumConflist (t * testing.T ) {
@@ -98,13 +98,13 @@ func TestGenerateAzurecniCiliumConflist(t *testing.T) {
9898 buffer := new (bytes.Buffer )
9999 g := cniconflist.AzureCNIChainedCiliumGenerator {Writer : & bufferWriteCloser {buffer }}
100100 err := g .Generate ()
101- assert .NoError (t , err )
101+ require .NoError (t , err )
102102
103103 fixtureBytes , err := os .ReadFile (fixture )
104- assert .NoError (t , err )
104+ require .NoError (t , err )
105105
106106 // remove newlines and carriage returns in case these UTs are running on Windows
107- assert .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
107+ require .Equal (t , removeNewLines (fixtureBytes ), removeNewLines (buffer .Bytes ()))
108108}
109109
110110// removeNewLines will remove the newlines and carriage returns from the byte slice
0 commit comments