refactor: cleanup

Author: natesales

cmd/optimizer_test.go

@@ -5,6 +5,8 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestOptimizer(t *testing.T) {
@@ -13,36 +15,27 @@ func TestOptimizer(t *testing.T) {
 		"--dry-run",
 	}
 	files, err := filepath.Glob("../tests/probe-*.yml")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(files) < 1 {
-		t.Fatal("No test files found")
-	}
+	assert.Nil(t, err)
+	assert.GreaterOrEqual(t, 1, len(files))
+
 	for _, testFile := range files {
 		// Run pathvector to generate config first, so there is a config to modify
 		rootCmd.SetArgs(append(args, []string{
 			"--config", testFile,
 		}...))
-		if err := rootCmd.Execute(); err != nil {
-			t.Error(err)
-		}
+		assert.Nil(t, rootCmd.Execute())
 
 		args = append(args, []string{
 			"optimizer",
 			"--config", testFile,
 		}...)
 		t.Logf("running probe integration with args %v", args)
 		rootCmd.SetArgs(args)
-		if err := rootCmd.Execute(); err != nil {
-			t.Error(err)
-		}
+		assert.Nil(t, rootCmd.Execute())
 
 		// Check if local pref is lowered
 		checkFile, err := os.ReadFile("test-cache/AS65510_EXAMPLE.conf")
-		if err != nil {
-			t.Error(err)
-		}
+		assert.Nil(t, err)
 		if !strings.Contains(string(checkFile), "bgp_local_pref = 80; # pathvector:localpref") {
 			t.Errorf("expected bgp_local_pref = 80 but not found in file")
 		}

pkg/autodoc/documentation_test.go

@@ -2,6 +2,8 @@ package autodoc
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 // TODO: lint the resulting markdown files
@@ -20,8 +22,6 @@ func TestSanitizeConfigName(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		out := sanitizeConfigName(tc.input)
-		if out != tc.expected {
-			t.Errorf("expected %s got %s", tc.expected, tc.input)
-		}
+		assert.Equal(t, tc.expected, out)
 	}
 }

pkg/bird/bird_test.go

@@ -45,9 +45,7 @@ func TestBirdConn(t *testing.T) {
 	buf := make([]byte, 1024)
 	n, err := conn.Read(buf[:])
 	assert.Nil(t, err)
-	if string(buf[:n]) != "bird command test\n" {
-		t.Errorf("expected 'bird command test' got %s", string(buf[:n]))
-	}
+	assert.Equal(t, "bird command test\n", string(buf[:n]))
 
 	_, err = conn.Write([]byte("0001 Fake BIRD response 2"))
 	assert.Nil(t, err)

pkg/irr/irr_test.go

@@ -1,12 +1,13 @@
 package irr
 
 import (
-	"github.com/natesales/pathvector/pkg/util"
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/natesales/pathvector/pkg/config"
+	"github.com/natesales/pathvector/pkg/util"
 )
 
 const irrQueryTimeout = 10
@@ -31,7 +32,7 @@ func TestGetIRRPrefixSet(t *testing.T) {
 			t.Errorf("as-set %s family %d should error but didn't", tc.asSet, tc.family)
 		}
 		if err == nil && !reflect.DeepEqual(out, tc.expectedOutput) {
-			t.Errorf("as-set %s family %d failed. expected '%s' got '%s'", tc.asSet, tc.family, tc.expectedOutput, out)
+			assert.Equalf(t, tc.expectedOutput, out, "as-set %s family %d failed. expected '%s' got '%s'", tc.asSet, tc.family, tc.expectedOutput, out)
 		}
 	}
 }
@@ -57,12 +58,8 @@ func TestBuildIRRPrefixSet(t *testing.T) {
 		} else if err == nil && tc.shouldError {
 			t.Errorf("as-set %s should error but didn't", tc.asSet)
 		}
-		if !reflect.DeepEqual(tc.prefixSet4, *peer.PrefixSet4) {
-			t.Errorf("as-set %s IPv4 prefix set expected %v got %v", tc.asSet, tc.prefixSet4, peer.PrefixSet4)
-		}
-		if !reflect.DeepEqual(tc.prefixSet6, *peer.PrefixSet6) {
-			t.Errorf("as-set %s IPv6 prefix set expected %v got %v", tc.asSet, tc.prefixSet6, peer.PrefixSet6)
-		}
+		assert.Equal(t, tc.prefixSet4, *peer.PrefixSet4)
+		assert.Equal(t, tc.prefixSet6, *peer.PrefixSet6)
 	}
 }
 

pkg/peeringdb/peeringdb_test.go

@@ -91,9 +91,6 @@ func TestSanitizeASSet(t *testing.T) {
 		{"RADB::AS-HURRICANE RADB::AS-HURRICANEV6", "AS-HURRICANE"},
 	}
 	for _, tc := range testCases {
-		out := sanitizeASSet(tc.asSet)
-		if out != tc.expected {
-			t.Errorf("expected %s got %s", tc.expected, out)
-		}
+		assert.Equal(t, tc.expected, sanitizeASSet(tc.asSet))
 	}
 }