change mock send to use channels

testutil/mockSender.go

@@ -3,26 +3,19 @@ package testutil
 import (
 	"gitlab.com/elixxir/client/cmixproto"
 	"gitlab.com/elixxir/primitives/id"
-	"strings"
 )
 
 type MockSender struct {
-	Val     bool
-	find    string
-	exclude string
+	ch chan string
 }
 
 func (d *MockSender) Send(recipientID *id.User, msg string, msgType cmixproto.Type) {
-	if strings.Contains(msg, d.find) && (d.exclude == "" || !strings.Contains(msg, d.exclude)) {
-		d.Val = true
-	}
+	d.ch <- msg
 }
 
-func NewMockSender(find, exclude string) *MockSender {
+func NewMockSender(ch chan string) *MockSender {
 	d := MockSender{
-		Val:     false,
-		find:    find,
-		exclude: exclude,
+		ch: ch,
 	}
 	return &d
 }

udb/receive_test.go

@@ -6,12 +6,14 @@ import (
 	"gitlab.com/elixxir/primitives/id"
 	fingerprint2 "gitlab.com/elixxir/user-discovery-bot/fingerprint"
 	"gitlab.com/elixxir/user-discovery-bot/testutil"
+	"strings"
 	"testing"
 	"time"
 )
 
 func TestSearchListener_Hear(t *testing.T) {
-	mockSender := testutil.NewMockSender("FOUND", "")
+	ch := make(chan string, 1)
+	mockSender := testutil.NewMockSender(ch)
 	mockDB := testutil.GetMockDatabase("testid", "testval", "testkeyid", "testkey", false, false)
 	var listener = SearchListener{
 		Sender: mockSender,
@@ -23,15 +25,22 @@ func TestSearchListener_Hear(t *testing.T) {
 
 	listener.Hear(msg, false)
 
-	time.Sleep(3 * time.Second)
-
-	if !mockSender.Val {
-		t.Error("Did not receive search found message")
+	select {
+	case msgStr := <-ch:
+		if strings.Contains(msgStr, "SEARCH") && strings.Contains(msgStr, "FOUND") {
+			t.Log("Received found message for search")
+		} else {
+			t.Error("Did not receive found message for search")
 		}
+	case <-time.After(5 * time.Second):
+		t.Error("Test timed out")
+	}
+
 }
 
 func TestGetKeyListener_Hear(t *testing.T) {
-	mockSender := testutil.NewMockSender("GETKEY", "NOTFOUND")
+	ch := make(chan string, 1)
+	mockSender := testutil.NewMockSender(ch)
 	mockDB := testutil.GetMockDatabase("testid", "testval", "testkeyid", "testkey", false, false)
 	pubKeyBits := "S8KXBczy0jins9uS4LgBPt0bkFl8t00MnZmExQ6GcOcu8O7DKgAsNzLU7a" +
 		"+gMTbIsS995IL/kuFF8wcBaQJBY23095PMSQ/nMuetzhk9HdXxrGIiKBo3C/n4SClpq4H+PoF9XziEVKua8JxGM2o83KiCK3tNUpaZbAAElkjueY7wuD96h4oaA+WV5Nh87cnIZ+fAG0uLve2LSHZ0FBZb3glOpNAOv7PFWkvN2BO37ztOQCXTJe72Y5ReoYn7nWVNxGUh0ilal+BRuJt1GZ7whOGDRE0IXfURIoK2yjyAnyZJWWMhfGsL5S6iL4aXUs03mc8BHKRq3HRjvTE10l3YFA=="
@@ -51,13 +60,21 @@ func TestGetKeyListener_Hear(t *testing.T) {
 
 	time.Sleep(3 * time.Second)
 
-	if !mockSender.Val {
-		t.Error("Did not receive getkey found message")
+	select {
+	case msgStr := <-ch:
+		if strings.Contains(msgStr, "GETKEY") && !strings.Contains(msgStr, "NOTFOUND") {
+			t.Log("Received found message for getkey")
+		} else {
+			t.Error("Did not receive found message for search")
+		}
+	case <-time.After(5 * time.Second):
+		t.Error("Test timed out")
 	}
 }
 
 func TestPushKeyListener_Hear(t *testing.T) {
-	mockSender := testutil.NewMockSender("PUSHKEY COMPLETE", "")
+	ch := make(chan string, 1)
+	mockSender := testutil.NewMockSender(ch)
 	mockDB := testutil.GetMockDatabase("testid", "testval", "testkeyid", "testkey", false, true)
 	pubKeyBits := "S8KXBczy0jins9uS4LgBPt0bkFl8t00MnZmExQ6GcOcu8O7DKgAsNzLU7a" +
 		"+gMTbIsS995IL/kuFF8wcBaQJBY23095PMSQ/nMuetzhk9HdXxrGIiKBo3C/n4SClpq4H+PoF9XziEVKua8JxGM2o83KiCK3tNUpaZbAAElkjueY7wuD96h4oaA+WV5Nh87cnIZ+fAG0uLve2LSHZ0FBZb3glOpNAOv7PFWkvN2BO37ztOQCXTJe72Y5ReoYn7nWVNxGUh0ilal+BRuJt1GZ7whOGDRE0IXfURIoK2yjyAnyZJWWMhfGsL5S6iL4aXUs03mc8BHKRq3HRjvTE10l3YFA=="
@@ -73,14 +90,22 @@ func TestPushKeyListener_Hear(t *testing.T) {
 
 	time.Sleep(3 * time.Second)
 
-	if !mockSender.Val {
-		t.Error("Did not receive pushkey complete message")
+	select {
+	case msgStr := <-ch:
+		if strings.Contains(msgStr, "PUSHKEY COMPLETE") {
+			t.Log("Received complete message for pushkey")
+		} else {
+			t.Error("Did not receive pushkey complete")
+		}
+	case <-time.After(5 * time.Second):
+		t.Error("Test timed out")
 	}
 }
 
 func TestRegisterListener_Hear(t *testing.T) {
+	ch := make(chan string, 1)
+	mockSender := testutil.NewMockSender(ch)
 	mockDB := testutil.GetMockDatabase("testid", "testval", "testkeyid", "testkey", true, false)
-	mockSender := testutil.NewMockSender("REGISTRATION COMPLETE", "")
 	pubKeyBits := "S8KXBczy0jins9uS4LgBPt0bkFl8t00MnZmExQ6GcOcu8O7DKgAsNzLU7a" +
 		"+gMTbIsS995IL/kuFF8wcBaQJBY23095PMSQ/nMuetzhk9HdXxrGIiKBo3C/n4SClpq4H+PoF9XziEVKua8JxGM2o83KiCK3tNUpaZbAAElkjueY7wuD96h4oaA+WV5Nh87cnIZ+fAG0uLve2LSHZ0FBZb3glOpNAOv7PFWkvN2BO37ztOQCXTJe72Y5ReoYn7nWVNxGUh0ilal+BRuJt1GZ7whOGDRE0IXfURIoK2yjyAnyZJWWMhfGsL5S6iL4aXUs03mc8BHKRq3HRjvTE10l3YFA=="
 
@@ -101,8 +126,14 @@ func TestRegisterListener_Hear(t *testing.T) {
 
 	time.Sleep(3 * time.Second)
 
-	if !mockSender.Val {
-		t.Error("Did not receive register message")
+	select {
+	case msgStr := <-ch:
+		if strings.Contains(msgStr, "REGISTRATION COMPLETE") {
+			t.Log("Received registration complete message")
+		} else {
+			t.Error("Did not receive registration complete")
+		}
+	case <-time.After(5 * time.Second):
+		t.Error("Test timed out")
 	}
-
 }

udb/register_test.go

@@ -28,22 +28,22 @@ import (
 )
 
 var db = storage.NewDatabase("test", "password", "regCodes", "0.0.0.0:6969")
-
+var ch = make(chan string)
 var rl = RegisterListener{
-	Sender:    &testutil.MockSender{},
+	Sender:    testutil.NewMockSender(ch),
 	db:        db,
 	blacklist: *InitBlackList("./blacklists/bannedNames.txt"),
 }
 var sl = SearchListener{
-	Sender: &testutil.MockSender{},
+	Sender: testutil.NewMockSender(ch),
 	db:     db,
 }
 var pl = PushKeyListener{
-	Sender: &testutil.MockSender{},
+	Sender: testutil.NewMockSender(ch),
 	db:     db,
 }
 var gl = GetKeyListener{
-	Sender: &testutil.MockSender{},
+	Sender: testutil.NewMockSender(ch),
 	db:     db,
 }
 
@@ -83,6 +83,15 @@ func NewMessage(msg string, msgType cmixproto.Type, sender *id.User) *parse.Mess
 // NOTE: The send function defaults to a no-op when client is not set up. I am
 //       not sure how I feel about it.
 func TestRegisterHappyPath(t *testing.T) {
+	go func() {
+		for {
+			select {
+			case m := <-ch:
+				t.Logf("received message: %s", m)
+			default:
+			}
+		}
+	}()
 	pubKeyBits := "S8KXBczy0jins9uS4LgBPt0bkFl8t00MnZmExQ6GcOcu8O7DKgAsNzLU7a" +
 		"+gMTbIsS995IL/kuFF8wcBaQJBY23095PMSQ/nMuetzhk9HdXxrGIiKBo3C/n4SClpq4H+PoF9XziEVKua8JxGM2o83KiCK3tNUpaZbAAElkjueY7wuD96h4oaA+WV5Nh87cnIZ+fAG0uLve2LSHZ0FBZb3glOpNAOv7PFWkvN2BO37ztOQCXTJe72Y5ReoYn7nWVNxGUh0ilal+BRuJt1GZ7whOGDRE0IXfURIoK2yjyAnyZJWWMhfGsL5S6iL4aXUs03mc8BHKRq3HRjvTE10l3YFA=="