Skip to content

Commit

Permalink
[FAB-7869] event mock should not import testing
Browse files Browse the repository at this point in the history 
Change-Id: Ib0c5a801de96ea59a76f298be9f1b64a16ac32c0
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
@troyronda
troyronda committed Jan 23, 2018
1 parent 48a3c93 commit 7c5c1bd
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 36 deletions.
60 changes: 30 additions & 30 deletions pkg/fabric-client/events/eventhub_test.go
View file
Expand Up @@ -30,8 +30,8 @@ func TestDeadlock(t *testing.T) {
channelID := "mychannel"
ccID := "testccid"

eventHub, clientFactory := createMockedEventHub(t)
if t.Failed() {
eventHub, clientFactory, err := createMockedEventHub()
if err != nil {
return
}

Expand Down Expand Up @@ -115,8 +115,8 @@ func TestChaincodeEvent(t *testing.T) {
ccID := "someccid"
eventName := "someevent"

eventHub, clientFactory := createMockedEventHub(t)
if t.Failed() {
eventHub, clientFactory, err := createMockedEventHub()
if err != nil {
return
}

Expand Down Expand Up @@ -166,8 +166,8 @@ func TestChaincodeBlockEvent(t *testing.T) {
eventName := "someevent"
txID := generateTxID()

eventHub, clientFactory := createMockedEventHub(t)
if t.Failed() {
eventHub, clientFactory, err := createMockedEventHub()
if err != nil {
return
}

Expand Down Expand Up @@ -223,8 +223,8 @@ func TestChaincodeBlockEventWithInvalidTx(t *testing.T) {
eventName := "someevent"
txID := generateTxID()

eventHub, clientFactory := createMockedEventHub(t)
if t.Failed() {
eventHub, clientFactory, err := createMockedEventHub()
if err != nil {
return
}

Expand Down Expand Up @@ -271,8 +271,8 @@ func TestInvalidTxStatusError(t *testing.T) {
channelID := "somechannelid"
txID := generateTxID()

eventHub, clientFactory := createMockedEventHub(t)
if t.Failed() {
eventHub, clientFactory, err := createMockedEventHub()
if err != nil {
return
}

Expand Down Expand Up @@ -379,8 +379,8 @@ func flood(invocationsPerThread int, threads int, f func()) {
}

func TestRegisterBlockEvent(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}

Expand Down Expand Up @@ -435,8 +435,8 @@ func (w *callbackWrapper) testCallback(block *common.Block) {
}

func TestRegisterChaincodeEvent(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}

Expand Down Expand Up @@ -483,17 +483,17 @@ func (w *callbackWrapper) testChaincodeCallback(ce *fab.ChaincodeEvent) {
}

func TestDisconnect(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}
eventHub.Disconnect()
verifyDisconnectedEventHub(eventHub, t)
}

func TestDisconnectWhenDisconnected(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}
eventHub.connected = false
Expand All @@ -508,27 +508,27 @@ func verifyDisconnectedEventHub(eventHub *EventHub, t *testing.T) {
}

func TestConnectWhenConnected(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}

eventHub.connected = true
err := eventHub.Connect()
err = eventHub.Connect()
if err != nil {
t.Fatalf("EventHub failed to connect after Connect call %s", err)
}
}

func TestConnectWhenPeerAddrEmpty(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}

eventHub.connected = false // need to reset connected in order to reach peerAddr check
eventHub.peerAddr = ""
err := eventHub.Connect()
err = eventHub.Connect()

if err == nil {
t.Fatal("peerAddr empty, failed to get expected connect error")
Expand All @@ -537,14 +537,14 @@ func TestConnectWhenPeerAddrEmpty(t *testing.T) {
}

func TestConnectWithInterestsTrueAndGetInterests(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}

eventHub.connected = false
eventHub.SetInterests(true)
err := eventHub.Connect()
err = eventHub.Connect()

if err != nil {
t.Fatalf("InterestedEvents must not be empty. Error received: %s", err)
Expand All @@ -557,14 +557,14 @@ func TestConnectWithInterestsTrueAndGetInterests(t *testing.T) {
}

func TestConnectWithInterestsFalseAndGetInterests(t *testing.T) {
eventHub, _ := createMockedEventHub(t)
if t.Failed() {
eventHub, _, err := createMockedEventHub()
if err != nil {
return
}

eventHub.connected = false
eventHub.SetInterests(false)
err := eventHub.Connect()
err = eventHub.Connect()

if err == nil {
t.Fatalf("InterestedEvents must not be empty. Error received: %s", err)
Expand Down
10 changes: 4 additions & 6 deletions pkg/fabric-client/events/eventmocks.go
View file
Expand Up @@ -8,7 +8,6 @@ package events

import (
"encoding/hex"
"testing"
"time"

fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
Expand Down Expand Up @@ -110,10 +109,10 @@ func (mec *mockEventClient) Stop() error {
return nil
}

func createMockedEventHub(t *testing.T) (*EventHub, *mockEventClientFactory) {
func createMockedEventHub() (*EventHub, *mockEventClientFactory, error) {
eventHub, err := NewEventHub(client.NewClient(mocks.NewMockConfig()))
if err != nil {
t.Fatalf("Error creating event hub: %v", err)
return nil, nil, errors.WithMessage(err, "Error creating event hub")
}

var clientFactory mockEventClientFactory
Expand All @@ -123,11 +122,10 @@ func createMockedEventHub(t *testing.T) (*EventHub, *mockEventClientFactory) {

err = eventHub.Connect()
if err != nil {
t.Fatalf("Failed to connect: %v", err)
return nil, nil
return nil, nil, errors.WithMessage(err, "Failed to connect")
}

return eventHub, &clientFactory
return eventHub, &clientFactory, nil
}

// MockTxEventBuilder builds a mock TX event block
Expand Down

0 comments on commit 7c5c1bd

Please sign in to comment.