From 7632584b02680f594a067db0684a86b8b9ff5c07 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Mon, 8 Sep 2025 15:49:41 +0200 Subject: [PATCH] Remove testify --- cmd/filesystem_test.go | 15 +++-- cmd/memory_test.go | 18 +++-- go.mod | 5 +- go.sum | 1 - internal/common/filter/filter_test.go | 27 +++++--- internal/common/thresholds/thresholds_test.go | 6 +- internal/filesystem/filesystem_test.go | 65 ++++++++++++------- internal/psi/psi_test.go | 23 +++++-- internal/sensors/sensors_test.go | 40 +++++++++--- 9 files changed, 138 insertions(+), 62 deletions(-) diff --git a/cmd/filesystem_test.go b/cmd/filesystem_test.go index 4b6489c..e7891e3 100644 --- a/cmd/filesystem_test.go +++ b/cmd/filesystem_test.go @@ -5,9 +5,9 @@ import ( "github.com/NETWAYS/check_system_basics/internal/common/thresholds" "github.com/NETWAYS/check_system_basics/internal/filesystem" + "github.com/NETWAYS/go-check" "github.com/shirou/gopsutil/v3/disk" - "github.com/stretchr/testify/assert" ) var ( @@ -39,8 +39,13 @@ func TestFsCheckResult0(t *testing.T) { result := computeFsCheckResult(&testFsHalfFull, &config) - assert.Equal(t, check.OK, result.GetStatus()) - assert.Equal(t, "/testMountpoint", result.Output) + if check.OK != result.GetStatus() { + t.Fatalf("expected %v, got %v", check.OK, result.GetStatus()) + } + + if "/testMountpoint" != result.Output { + t.Fatalf("expected %v, got %v", "/testMountpoint", result.Output) + } } func TestFsCheckResult1(t *testing.T) { @@ -63,5 +68,7 @@ func TestFsCheckResult1(t *testing.T) { result := computeFsCheckResult(&testFsHalfFull, &config) - assert.Equal(t, check.Warning, result.GetStatus()) + if check.Warning != result.GetStatus() { + t.Fatalf("expected %v, got %v", check.Warning, result.GetStatus()) + } } diff --git a/cmd/memory_test.go b/cmd/memory_test.go index 415ac67..91af729 100644 --- a/cmd/memory_test.go +++ b/cmd/memory_test.go @@ -5,9 +5,9 @@ import ( "github.com/NETWAYS/check_system_basics/internal/common/thresholds" "github.com/NETWAYS/check_system_basics/internal/memory" + "github.com/NETWAYS/go-check" "github.com/shirou/gopsutil/v3/mem" - "github.com/stretchr/testify/assert" ) var ( @@ -34,9 +34,13 @@ func TestComputeMemResultsWithoutThresholds(t *testing.T) { memPartial := computeMemResults(&config, &testMemStats) - assert.Equal(t, check.OK, memPartial.GetStatus()) + if check.OK != memPartial.GetStatus() { + t.Fatalf("expected %v, got %v", check.OK, memPartial.GetStatus()) + } - assert.Equal(t, 3, len(memPartial.PartialResults)) + if 3 != len(memPartial.PartialResults) { + t.Fatalf("expected %v, got %v", 3, len(memPartial.PartialResults)) + } } func TestComputeMemResultsWithThresholds(t *testing.T) { @@ -56,7 +60,11 @@ func TestComputeMemResultsWithThresholds(t *testing.T) { memPartial := computeMemResults(&testConfig, &testMemStats) - assert.Equal(t, check.Warning, memPartial.GetStatus()) + if check.Warning != memPartial.GetStatus() { + t.Fatalf("expected %v, got %v", check.Warning, memPartial.GetStatus()) + } - assert.Equal(t, 3, len(memPartial.PartialResults)) + if 3 != len(memPartial.PartialResults) { + t.Fatalf("expected %v, got %v", 3, len(memPartial.PartialResults)) + } } diff --git a/go.mod b/go.mod index 60bac58..b543b82 100644 --- a/go.mod +++ b/go.mod @@ -9,20 +9,17 @@ require ( github.com/shirou/gopsutil/v3 v3.24.5 github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.7 - github.com/stretchr/testify v1.11.0 ) require ( - github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/stretchr/testify v1.11.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect golang.org/x/sys v0.20.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 71e70e1..afbc23b 100644 --- a/go.sum +++ b/go.sum @@ -58,7 +58,6 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/internal/common/filter/filter_test.go b/internal/common/filter/filter_test.go index 40efb88..9bee184 100644 --- a/internal/common/filter/filter_test.go +++ b/internal/common/filter/filter_test.go @@ -1,9 +1,8 @@ package filter import ( + "reflect" "testing" - - "github.com/stretchr/testify/assert" ) type TestObject struct { @@ -59,9 +58,13 @@ func TestEmptyFilter(t *testing.T) { testResult1, err := Filter(objList, &filterList, Name, filterOpts) - assert.NoError(t, err) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } - assert.Equal(t, []TestObject{}, testResult1) + if !reflect.DeepEqual([]TestObject{}, testResult1) { + t.Fatalf("expected %v, got %v", []TestObject{}, testResult1) + } } func TestSimpleIncludeFilter(t *testing.T) { @@ -83,9 +86,13 @@ func TestSimpleIncludeFilter(t *testing.T) { }, } - assert.NoError(t, err) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } - assert.Equal(t, testResult1Expected, testResult1) + if !reflect.DeepEqual(testResult1Expected, testResult1) { + t.Fatalf("expected %v, got %v", testResult1Expected, testResult1) + } } func TestSimpleExcludeFilter(t *testing.T) { @@ -122,7 +129,11 @@ func TestSimpleExcludeFilter(t *testing.T) { }, } - assert.NoError(t, err) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } - assert.Equal(t, testResult1Expected, testResult1) + if !reflect.DeepEqual(testResult1Expected, testResult1) { + t.Fatalf("expected %v, got %v", testResult1Expected, testResult1) + } } diff --git a/internal/common/thresholds/thresholds_test.go b/internal/common/thresholds/thresholds_test.go index 347b010..e54d348 100644 --- a/internal/common/thresholds/thresholds_test.go +++ b/internal/common/thresholds/thresholds_test.go @@ -1,10 +1,10 @@ package thresholds import ( + "reflect" "testing" "github.com/NETWAYS/go-check" - "github.com/stretchr/testify/assert" ) func TestThresholdSet(t *testing.T) { @@ -21,5 +21,7 @@ func TestThresholdSet(t *testing.T) { tw2.Set(tw.String()) - assert.Equal(t, tw, tw2) + if !reflect.DeepEqual(tw, tw2) { + t.Fatalf("expected %v, got %v", tw, tw2) + } } diff --git a/internal/filesystem/filesystem_test.go b/internal/filesystem/filesystem_test.go index 890625a..1f13913 100644 --- a/internal/filesystem/filesystem_test.go +++ b/internal/filesystem/filesystem_test.go @@ -1,10 +1,10 @@ package filesystem import ( + "reflect" "testing" "github.com/shirou/gopsutil/v3/disk" - "github.com/stretchr/testify/assert" ) var ( @@ -62,10 +62,13 @@ func TestFilterSDA(t *testing.T) { result, err := FilterFileSystem(fileSystemSet, &filters) - assert.Nil(t, err) - - assert.Equal(t, result, []FilesystemType{testSda}) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } + if !reflect.DeepEqual(result, []FilesystemType{testSda}) { + t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda}) + } } func TestFilterHalfFull(t *testing.T) { @@ -75,10 +78,13 @@ func TestFilterHalfFull(t *testing.T) { result, err := FilterFileSystem(fileSystemSet, &filters) - assert.Nil(t, err) - - assert.Equal(t, result, []FilesystemType{testFsHalfFull}) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } + if !reflect.DeepEqual(result, []FilesystemType{testFsHalfFull}) { + t.Fatalf("expected %v, got %v", result, []FilesystemType{testFsHalfFull}) + } } func TestFilterNoFilter(t *testing.T) { @@ -86,10 +92,13 @@ func TestFilterNoFilter(t *testing.T) { result, err := FilterFileSystem(fileSystemSet, &filters) - assert.Nil(t, err) - - assert.Equal(t, result, []FilesystemType{testSda, testFsHalfFull}) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } + if !reflect.DeepEqual(result, []FilesystemType{testSda, testFsHalfFull}) { + t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda, testFsHalfFull}) + } } func TestFilterIncludeDevicePaths(t *testing.T) { @@ -99,10 +108,13 @@ func TestFilterIncludeDevicePaths(t *testing.T) { result, err := FilterFileSystem(fileSystemSet, &filters) - assert.Nil(t, err) - - assert.Equal(t, result, []FilesystemType{testSda, testFsHalfFull}) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } + if !reflect.DeepEqual(result, []FilesystemType{testSda, testFsHalfFull}) { + t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda, testFsHalfFull}) + } } func TestFilterExcludeDevicePaths(t *testing.T) { @@ -112,10 +124,13 @@ func TestFilterExcludeDevicePaths(t *testing.T) { result, err := FilterFileSystem(fileSystemSet, &filters) - assert.Nil(t, err) - - assert.Equal(t, result, []FilesystemType{testFsHalfFull}) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } + if !reflect.DeepEqual(result, []FilesystemType{testFsHalfFull}) { + t.Fatalf("expected %v, got %v", result, []FilesystemType{testFsHalfFull}) + } } func TestFilterRegexFilter(t *testing.T) { @@ -125,10 +140,13 @@ func TestFilterRegexFilter(t *testing.T) { result, err := FilterFileSystem(fileSystemSet, &filters) - assert.Nil(t, err) - - assert.Equal(t, result, []FilesystemType{testSda}) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } + if !reflect.DeepEqual(result, []FilesystemType{testSda}) { + t.Fatalf("expected %v, got %v", result, []FilesystemType{testSda}) + } } func TestFilterRegexFilterAll(t *testing.T) { @@ -138,8 +156,11 @@ func TestFilterRegexFilterAll(t *testing.T) { result, err := FilterFileSystem(fileSystemSet, &filters) - assert.Nil(t, err) - - assert.Equal(t, result, []FilesystemType{}) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } + if !reflect.DeepEqual(result, []FilesystemType{}) { + t.Fatalf("expected %v, got %v", result, []FilesystemType{}) + } } diff --git a/internal/psi/psi_test.go b/internal/psi/psi_test.go index 7303828..671c188 100644 --- a/internal/psi/psi_test.go +++ b/internal/psi/psi_test.go @@ -1,10 +1,10 @@ package psi import ( + "reflect" "testing" "github.com/NETWAYS/go-check/perfdata" - "github.com/stretchr/testify/assert" ) func TestPressureValueString(t *testing.T) { @@ -21,7 +21,9 @@ func TestPressureValueString(t *testing.T) { expected.Add(&perfdata.Perfdata{Label: "preavg300", Value: 3.5, Min: 0, Max: 100, Uom: "%"}) expected.Add(&perfdata.Perfdata{Label: "pretotal", Value: uint64(0), Min: 0, Uom: "c"}) - assert.Equal(t, &expected, pv.Perfdata("pre")) + if !reflect.DeepEqual(&expected, pv.Perfdata("pre")) { + t.Fatalf("expected %v, got %v", &expected, pv.Perfdata("pre")) + } } func TestPressureElementString(t *testing.T) { @@ -43,7 +45,9 @@ func TestPressureElementString(t *testing.T) { pecpuexpected.Add(&perfdata.Perfdata{Label: "cpu-full-avg300", Value: float64(0.3), Min: 0, Max: 100, Uom: "%"}) pecpuexpected.Add(&perfdata.Perfdata{Label: "cpu-full-total", Value: uint64(0), Min: 0, Uom: "c"}) - assert.Equal(t, &pecpuexpected, pecpu.Perfdata()) + if !reflect.DeepEqual(&pecpuexpected, pecpu.Perfdata()) { + t.Fatalf("expected %v, got %v", &pecpuexpected, pecpu.Perfdata()) + } peio := PressureElement{ Some: PressureValue{Avg10: 0.1, Avg60: 0.6, Avg300: 0.3, Total: 0}, @@ -59,14 +63,17 @@ func TestPressureElementString(t *testing.T) { peioexpected.Add(&perfdata.Perfdata{Label: "io-some-avg300", Value: float64(0.3), Min: 0, Max: 100, Uom: "%"}) peioexpected.Add(&perfdata.Perfdata{Label: "io-some-total", Value: uint64(0), Min: 0, Uom: "c"}) - assert.Equal(t, &peioexpected, peio.Perfdata()) - + if !reflect.DeepEqual(&peioexpected, peio.Perfdata()) { + t.Fatalf("expected %v, got %v", &peioexpected, peio.Perfdata()) + } } func TestReadPressureFile(t *testing.T) { cpuPressure, err := readPressureFile("testdata/cpu") - assert.Equal(t, nil, err) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } expectedResult := PressureElement{ Some: PressureValue{Avg10: 0.0, Avg60: 0.08, Avg300: 0.05, Total: 3391622}, @@ -74,5 +81,7 @@ func TestReadPressureFile(t *testing.T) { FullPresent: true, } - assert.Equal(t, &expectedResult, cpuPressure) + if !reflect.DeepEqual(&expectedResult, cpuPressure) { + t.Fatalf("expected %v, got %v", &expectedResult, cpuPressure) + } } diff --git a/internal/sensors/sensors_test.go b/internal/sensors/sensors_test.go index 1288624..8c7d1bc 100644 --- a/internal/sensors/sensors_test.go +++ b/internal/sensors/sensors_test.go @@ -5,7 +5,6 @@ import ( "github.com/NETWAYS/go-check" "github.com/NETWAYS/go-check/perfdata" - "github.com/stretchr/testify/assert" ) func TestSensorAndDeviceString(t *testing.T) { @@ -24,29 +23,52 @@ func TestSensorAndDeviceString(t *testing.T) { }, } - assert.Equal(t, "testname - 10%", s.String()) + if "testname - 10%" != s.String() { + t.Fatalf("expected %v, got %v", "testname - 10%", s.String()) + } d := Device{ Name: "test", Sensors: []Sensor{s}, } - assert.Equal(t, "test: testname - 10%;", d.String()) + expected := "test: testname - 10%;" + if expected != d.String() { + t.Fatalf("expected %v, got %v", expected, d.String()) + } } func TestReadSensorDataSingle(t *testing.T) { sensors, err := readSensorData("testdata/01") - assert.Equal(t, nil, err) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } - assert.Equal(t, "tempSensor=20C", sensors[0].Perfdata.String()) + expected := "tempSensor=20C" + if expected != sensors[0].Perfdata.String() { + t.Fatalf("expected %v, got %v", expected, sensors[0].Perfdata.String()) + } } func TestReadSensorDataMultiple(t *testing.T) { sensors, err := readSensorData("testdata/02") - assert.Equal(t, nil, err) + if err != nil { + t.Fatalf("expected no error, got %v", err) + } - assert.Equal(t, "tempSensor=20C", sensors[0].Perfdata.String()) - assert.Equal(t, "testDevice2_temp2=20C;~:30;~:40", sensors[1].Perfdata.String()) - assert.Equal(t, "tempSensor3=20C;~:30;~:60", sensors[2].Perfdata.String()) + expected := "tempSensor=20C" + if expected != sensors[0].Perfdata.String() { + t.Fatalf("expected %v, got %v", expected, sensors[0].Perfdata.String()) + } + + expected = "testDevice2_temp2=20C;~:30;~:40" + if expected != sensors[1].Perfdata.String() { + t.Fatalf("expected %v, got %v", expected, sensors[1].Perfdata.String()) + } + + expected = "tempSensor3=20C;~:30;~:60" + if expected != sensors[2].Perfdata.String() { + t.Fatalf("expected %v, got %v", expected, sensors[2].Perfdata.String()) + } }