X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=internal%2Fcli%2Fnamespaces_test.go;h=7bff846a1cbf230be1cb160bffb09bd126523398;hb=59c60ebc4ca8edd65fd9cdc1e833309f3e8bc8fe;hp=28b6343b6414789a578757483b9bfbff32603e5a;hpb=277f322e53bb123783c0945a78a263ca79c5dd2a;p=ric-plt%2Fsdlgo.git diff --git a/internal/cli/namespaces_test.go b/internal/cli/namespaces_test.go index 28b6343..7bff846 100644 --- a/internal/cli/namespaces_test.go +++ b/internal/cli/namespaces_test.go @@ -45,10 +45,10 @@ type nsMock struct { func setupNamespacesCliMock(keys []string, addr string, keysErr, stateErr error) { mNs = new(nsMock) mNs.dbKeys = keys - mNs.dbState.MasterDbState.Fields.Role = "Master" - mNs.dbState.MasterDbState.Fields.Ip = addr + mNs.dbState.PrimaryDbState.Fields.Role = "Primary" + mNs.dbState.PrimaryDbState.Fields.Ip = addr if addr != "" { - mNs.dbState.MasterDbState.Fields.Port = "6379" + mNs.dbState.PrimaryDbState.Fields.Port = "6379" } mNs.dbKeysErr = keysErr mNs.dbStateErr = stateErr @@ -112,8 +112,12 @@ func TestNamespacesCmdSuccess(t *testing.T) { mNs.dbIface.AssertExpectations(t) } -func TestNamespacesCmdWithPerDbFlagSuccess(t *testing.T) { - expOut := "1.2.3.4:6379: ns1\n" + "1.2.3.4:6379: ns2\n" + "1.2.3.4:6379: ns3\n" +func TestNamespacesCmdWithWideFlagSuccess(t *testing.T) { + expOut := + "ADDRESS NAMESPACE KEYS \n" + + "1.2.3.4:6379 ns1 2 \n" + + "1.2.3.4:6379 ns2 1 \n" + + "1.2.3.4:6379 ns3 1 \n" buf := new(bytes.Buffer) setupNamespacesCliMock([]string{ "{ns1},key1", @@ -124,7 +128,7 @@ func TestNamespacesCmdWithPerDbFlagSuccess(t *testing.T) { cmd := cli.NewNamespacesCmdForTest(newNsMockDatabase) cmd.SetOut(buf) cmd.SetErr(buf) - cmd.SetArgs([]string{"--group"}) + cmd.SetArgs([]string{"--wide"}) err := cmd.Execute() result := buf.String() @@ -150,14 +154,14 @@ func TestNamespacesCmdNoKeysInDbSuccess(t *testing.T) { mNs.dbIface.AssertExpectations(t) } -func TestNamespacesCmdWithPerDbFlagNoKeysInDbSuccess(t *testing.T) { - expOut := "" +func TestNamespacesCmdWithWideFlagNoKeysInDbSuccess(t *testing.T) { + expOut := "ADDRESS NAMESPACE KEYS \n" buf := new(bytes.Buffer) setupNamespacesCliMock([]string{}, "1.2.3.4", nil, nil) cmd := cli.NewNamespacesCmdForTest(newNsMockDatabase) cmd.SetOut(buf) cmd.SetErr(buf) - cmd.SetArgs([]string{"--group"}) + cmd.SetArgs([]string{"-w"}) err := cmd.Execute() result := buf.String() @@ -167,8 +171,12 @@ func TestNamespacesCmdWithPerDbFlagNoKeysInDbSuccess(t *testing.T) { mNs.dbIface.AssertExpectations(t) } -func TestNamespacesCmdWithPerDbFlagStandaloneRedisAddressMissingSuccess(t *testing.T) { - expOut := "ns1\n" + "ns2\n" + "ns3\n" +func TestNamespacesCmdWithWideFlagStandaloneRedisAddressMissingSuccess(t *testing.T) { + expOut := + "ADDRESS NAMESPACE KEYS \n" + + " ns1 2 \n" + + " ns2 1 \n" + + " ns3 1 \n" buf := new(bytes.Buffer) setupNamespacesCliMock([]string{ "{ns1},key1", @@ -179,7 +187,7 @@ func TestNamespacesCmdWithPerDbFlagStandaloneRedisAddressMissingSuccess(t *testi cmd := cli.NewNamespacesCmdForTest(newNsMockDatabase) cmd.SetOut(buf) cmd.SetErr(buf) - cmd.SetArgs([]string{"--group"}) + cmd.SetArgs([]string{"--wide"}) err := cmd.Execute() result := buf.String()