[FAB-8828] Cleanup enrollment test cases

Change-Id: I8ed4ff726d48d3146206c1cc21bf7596672efbf0
Signed-off-by: Aleksandar Likic <aleksandar.likic@securekey.com>

Author: Aleksandar Likic

pkg/client/msp/msp_test.go

@@ -83,7 +83,7 @@ func TestMSP(t *testing.T) {
 		t.Fatalf("Enrolled user name doesn't match")
 	}
 
-	if enrolledUser.MspID() != myMSPID(t, sdk.Config()) {
+	if enrolledUser.MspID() != "Org1MSP" {
 		t.Fatalf("Enrolled user mspID doesn't match")
 	}
 
@@ -101,6 +101,33 @@ func TestMSP(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Reenroll return error %v", err)
 	}
+
+	// Try with a non-default org
+	msp, err = New(ctxProvider, WithOrg("Org2"))
+	if err != nil {
+		t.Fatalf("failed to create CA client: %v", err)
+	}
+
+	org2lUserName := randomUserName()
+
+	err = msp.Enroll(org2lUserName, "enrollmentSecret")
+	if err != nil {
+		t.Fatalf("Enroll return error %v", err)
+	}
+
+	org2EnrolledUser, err := msp.GetUser(org2lUserName)
+	if err != nil {
+		t.Fatalf("Expected to find user")
+	}
+
+	if org2EnrolledUser.Name() != org2lUserName {
+		t.Fatalf("Enrolled user name doesn't match")
+	}
+
+	if org2EnrolledUser.MspID() != "Org2MSP" {
+		t.Fatalf("Enrolled user mspID doesn't match")
+	}
+
 }
 
 type textFixture struct {

pkg/common/context/context.go

@@ -12,11 +12,6 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/msp"
 )
 
-// MSP provides context for MSP services
-type MSP interface {
-	Providers
-}
-
 // Client supplies the configuration and signing identity to client objects.
 type Client interface {
 	Providers
@@ -39,9 +34,6 @@ type Channel interface {
 	ChannelID() string
 }
 
-// MSPProvider returns MSP context
-type MSPProvider func() (MSP, error)
-
 // ClientProvider returns client context
 type ClientProvider func() (Client, error)
 

test/integration/fab/fabric_ca_test.go

@@ -21,6 +21,10 @@ var mainSDK *fabsdk.FabricSDK
 var mainTestSetup *integration.BaseSetupImpl
 var mainChaincodeID string
 
+const (
+	org1Name = "Org1"
+)
+
 func TestMain(m *testing.M) {
 	setup()
 	r := m.Run()