X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftypes_test.go;h=424021b89f3c31a4e4f10ff05676146a419efef8;hb=5f8ffa07163f52d65092d63f5d173149cd5c46ad;hp=5e1cfac17dc78cd28cfcfd421dab2a9b7448fa22;hpb=a9bf76cb8dec6e52e7699edf1631c214647f8beb;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/types_test.go b/pkg/control/types_test.go index 5e1cfac..424021b 100644 --- a/pkg/control/types_test.go +++ b/pkg/control/types_test.go @@ -20,11 +20,14 @@ package control import ( + "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststub" "testing" ) func TestRmrEndpoint(t *testing.T) { + tent := teststub.NewTestWrapper("TestRmrEndpoint") + testEp := func(t *testing.T, val string, expect *RmrEndpoint) { res := NewRmrEndpoint(val) @@ -32,14 +35,14 @@ func TestRmrEndpoint(t *testing.T) { return } if res == nil { - testError(t, "Endpoint elems for value %s expected addr %s port %d got nil", val, expect.GetAddr(), expect.GetPort()) + tent.TestError(t, "Endpoint elems for value %s expected addr %s port %d got nil", val, expect.GetAddr(), expect.GetPort()) return } if expect.GetAddr() != res.GetAddr() || expect.GetPort() != res.GetPort() { - testError(t, "Endpoint elems for value %s expected addr %s port %d got addr %s port %d", val, expect.GetAddr(), expect.GetPort(), res.GetAddr(), res.GetPort()) + tent.TestError(t, "Endpoint elems for value %s expected addr %s port %d got addr %s port %d", val, expect.GetAddr(), expect.GetPort(), res.GetAddr(), res.GetPort()) } if expect.String() != res.String() { - testError(t, "Endpoint string for value %s expected %s got %s", val, expect.String(), res.String()) + tent.TestError(t, "Endpoint string for value %s expected %s got %s", val, expect.String(), res.String()) } } @@ -53,70 +56,73 @@ func TestRmrEndpoint(t *testing.T) { } func TestRmrEndpointList(t *testing.T) { + + tent := teststub.NewTestWrapper("TestRmrEndpointList") + epl := &RmrEndpointList{} // Simple add / has / delete if epl.AddEndpoint(NewRmrEndpoint("127.0.0.1:8080")) == false { - testError(t, "RmrEndpointList: 8080 add failed") + tent.TestError(t, "RmrEndpointList: 8080 add failed") } if epl.AddEndpoint(NewRmrEndpoint("127.0.0.1:8080")) == true { - testError(t, "RmrEndpointList: 8080 duplicate add success") + tent.TestError(t, "RmrEndpointList: 8080 duplicate add success") } if epl.AddEndpoint(NewRmrEndpoint("127.0.0.1:8081")) == false { - testError(t, "RmrEndpointList: 8081 add failed") + tent.TestError(t, "RmrEndpointList: 8081 add failed") } if epl.HasEndpoint(NewRmrEndpoint("127.0.0.1:8081")) == false { - testError(t, "RmrEndpointList: 8081 has failed") + tent.TestError(t, "RmrEndpointList: 8081 has failed") } if epl.DelEndpoint(NewRmrEndpoint("127.0.0.1:8081")) == false { - testError(t, "RmrEndpointList: 8081 del failed") + tent.TestError(t, "RmrEndpointList: 8081 del failed") } if epl.HasEndpoint(NewRmrEndpoint("127.0.0.1:8081")) == true { - testError(t, "RmrEndpointList: 8081 has non existing success") + tent.TestError(t, "RmrEndpointList: 8081 has non existing success") } if epl.DelEndpoint(NewRmrEndpoint("127.0.0.1:8081")) == true { - testError(t, "RmrEndpointList: 8081 del non existing success") + tent.TestError(t, "RmrEndpointList: 8081 del non existing success") } if epl.DelEndpoint(NewRmrEndpoint("127.0.0.1:8080")) == false { - testError(t, "RmrEndpointList: 8080 del failed") + tent.TestError(t, "RmrEndpointList: 8080 del failed") } // list delete if epl.AddEndpoint(NewRmrEndpoint("127.0.0.1:8080")) == false { - testError(t, "RmrEndpointList: 8080 add failed") + tent.TestError(t, "RmrEndpointList: 8080 add failed") } if epl.AddEndpoint(NewRmrEndpoint("127.0.0.1:8081")) == false { - testError(t, "RmrEndpointList: 8081 add failed") + tent.TestError(t, "RmrEndpointList: 8081 add failed") } if epl.AddEndpoint(NewRmrEndpoint("127.0.0.1:8082")) == false { - testError(t, "RmrEndpointList: 8082 add failed") + tent.TestError(t, "RmrEndpointList: 8082 add failed") } epl2 := &RmrEndpointList{} if epl2.AddEndpoint(NewRmrEndpoint("127.0.0.1:9080")) == false { - testError(t, "RmrEndpointList: othlist add 9080 failed") + tent.TestError(t, "RmrEndpointList: othlist add 9080 failed") } if epl.DelEndpoints(epl2) == true { - testError(t, "RmrEndpointList: delete list not existing successs") + tent.TestError(t, "RmrEndpointList: delete list not existing successs") } if epl2.AddEndpoint(NewRmrEndpoint("127.0.0.1:8080")) == false { - testError(t, "RmrEndpointList: othlist add 8080 failed") + tent.TestError(t, "RmrEndpointList: othlist add 8080 failed") } if epl.DelEndpoints(epl2) == false { - testError(t, "RmrEndpointList: delete list 8080,9080 failed") + tent.TestError(t, "RmrEndpointList: delete list 8080,9080 failed") } if epl2.AddEndpoint(NewRmrEndpoint("127.0.0.1:8081")) == false { - testError(t, "RmrEndpointList: othlist add 8081 failed") + tent.TestError(t, "RmrEndpointList: othlist add 8081 failed") } if epl2.AddEndpoint(NewRmrEndpoint("127.0.0.1:8082")) == false { - testError(t, "RmrEndpointList: othlist add 8082 failed") + tent.TestError(t, "RmrEndpointList: othlist add 8082 failed") } if epl.DelEndpoints(epl2) == false { - testError(t, "RmrEndpointList: delete list 8080,8081,8082,9080 failed") + tent.TestError(t, "RmrEndpointList: delete list 8080,8081,8082,9080 failed") } }