getting test coverage up

Signed-off-by: hfuss <[email protected]>

Author: onelapahead

internal/metrics/metrics_test.go

@@ -260,3 +260,12 @@ func TestNodeIdentityDXCertMismatchSetsDefaultState(t *testing.T) {
 	gaugeValue := testutil.ToFloat64(NodeIdentityDXCertMismatchGauge.WithLabelValues("test-namespace"))
 	assert.Equal(t, -1.0, gaugeValue)
 }
+
+func TestNodeIdentityDXCertExpiry(t *testing.T) {
+	mm, cancel := newTestMetricsManager(t)
+	defer cancel()
+	now := time.Now().UTC()
+	mm.NodeIdentityDXCertExpiry("test-namespace", now)
+	gaugeValue := testutil.ToFloat64(NodeIdentityDXCertExpiryGauge.WithLabelValues("test-namespace"))
+	assert.Equal(t, float64(now.Unix()), gaugeValue)
+}

internal/networkmap/check_node_test.go

@@ -56,7 +56,6 @@ func TestCheckNodeIdentityStatusSuccess(t *testing.T) {
 }
 
 func TestCheckNodeIdentityStatusEndpointInfoFails(t *testing.T) {
-
 	nm, cancel := newTestNetworkmap(t)
 	defer cancel()
 	ctx := context.TODO()
@@ -75,6 +74,50 @@ func TestCheckNodeIdentityStatusEndpointInfoFails(t *testing.T) {
 
 	nm.exchange.(*dataexchangemocks.Plugin).On("GetEndpointInfo", ctx, "local-node").Return(nil, errors.New("endpoint info went pop"))
 
-	err := nm.CheckNodeIdentityStatus(context.TODO())
+	err := nm.CheckNodeIdentityStatus(ctx)
+	assert.Error(t, err)
+}
+
+func TestCheckNodeIdenityStatusLocalNodeNameNotSet(t *testing.T) {
+	nm, cancel := newTestNetworkmap(t)
+	defer cancel()
+	ctx := context.TODO()
+
+	nm.multiparty.(*multipartymocks.Manager).On("LocalNode").Return(multiparty.LocalNode{})
+	err := nm.CheckNodeIdentityStatus(ctx)
+	assert.Error(t, err)
+}
+
+func TestCheckNodeIdenityStatusGetLocalNodeFails(t *testing.T) {
+	nm, cancel := newTestNetworkmap(t)
+	defer cancel()
+	ctx := context.TODO()
+
+	nm.multiparty.(*multipartymocks.Manager).On("LocalNode").Return(multiparty.LocalNode{
+		Name: "local-node",
+	})
+
+	nm.identity.(*identitymanagermocks.Manager).On("GetLocalNode", ctx).Return(nil, errors.New("failed to get local node"))
+
+	err := nm.CheckNodeIdentityStatus(ctx)
+	assert.Error(t, err)
+}
+
+func TestCheckNodeIdenityStatusGetLocalNodeMissingProfile(t *testing.T) {
+	nm, cancel := newTestNetworkmap(t)
+	defer cancel()
+	ctx := context.TODO()
+
+	nm.multiparty.(*multipartymocks.Manager).On("LocalNode").Return(multiparty.LocalNode{
+		Name: "local-node",
+	})
+
+	nm.identity.(*identitymanagermocks.Manager).On("GetLocalNode", ctx).Return(&core.Identity{
+		IdentityProfile: core.IdentityProfile{
+			Profile: nil,
+		},
+	}, nil)
+
+	err := nm.CheckNodeIdentityStatus(ctx)
 	assert.Error(t, err)
 }

internal/networkmap/register_node_test.go

@@ -17,6 +17,7 @@
 package networkmap
 
 import (
+	"errors"
 	"fmt"
 	"testing"
 
@@ -126,5 +127,45 @@ func TestRegisterNodeGetOwnerFail(t *testing.T) {
 
 	_, err := nm.RegisterNode(nm.ctx, false)
 	assert.Regexp(t, "pop", err)
+}
+
+func TestRegisterNodeOkButNodeIdentityStatusFails(t *testing.T) {
+
+	nm, cancel := newTestNetworkmap(t)
+	defer cancel()
+
+	parentOrg := testOrg("org1")
+	signerRef := &core.SignerRef{Key: "0x23456"}
+
+	mim := nm.identity.(*identitymanagermocks.Manager)
+	mim.On("GetRootOrg", nm.ctx).Return(parentOrg, nil)
+	mim.On("VerifyIdentityChain", nm.ctx, mock.AnythingOfType("*core.Identity")).Return(parentOrg, false, nil)
+	mim.On("ResolveIdentitySigner", nm.ctx, parentOrg).Return(signerRef, nil)
+
+	mdx := nm.exchange.(*dataexchangemocks.Plugin)
+	dxPeer := fftypes.JSONObject{
+		"id":       "peer1",
+		"endpoint": "details",
+	}
+	mdx.On("GetEndpointInfo", nm.ctx, "node1").Return(dxPeer, nil)
+	mdx.On("CheckNodeIdentityStatus", nm.ctx, dxPeer, mock.Anything).Return(errors.New("failed to check node identity status"))
+
+	mds := nm.defsender.(*definitionsmocks.Sender)
+	mds.On("ClaimIdentity", nm.ctx,
+		mock.AnythingOfType("*core.IdentityClaim"),
+		signerRef,
+		(*core.SignerRef)(nil),
+	).Return(nil)
 
+	mmp := nm.multiparty.(*multipartymocks.Manager)
+	mmp.On("LocalNode").Return(multiparty.LocalNode{Name: "node1"})
+
+	node, err := nm.RegisterNode(nm.ctx, false)
+	assert.NoError(t, err)
+	assert.NotNil(t, node)
+
+	mim.AssertExpectations(t)
+	mdx.AssertExpectations(t)
+	mds.AssertExpectations(t)
+	mmp.AssertExpectations(t)
 }

internal/networkmap/update_identity_test.go

@@ -268,3 +268,16 @@ func TestUpdateIdentityProfileOverwrite(t *testing.T) {
 	mim.AssertExpectations(t)
 	mds.AssertExpectations(t)
 }
+
+func TestUpdateIdentityProfileNotProvided(t *testing.T) {
+	nm, cancel := newTestNetworkmap(t)
+	defer cancel()
+
+	identity := testOrg("org1")
+
+	mim := nm.identity.(*identitymanagermocks.Manager)
+	mim.On("CachedIdentityLookupByID", nm.ctx, identity.ID).Return(identity, nil)
+
+	_, err := nm.UpdateIdentity(nm.ctx, identity.ID.String(), &core.IdentityUpdateDTO{}, true)
+	assert.Regexp(t, "FF10480", err)
+}