From b784c34d4df5596583940692919f9e9f3befb887 Mon Sep 17 00:00:00 2001
From: mappu <mappu04@gmail.com>
Date: Sat, 25 Nov 2017 13:45:10 +1300
Subject: [PATCH] fix tests post-refactor

--HG--
branch : adc
---
 Example_test.go                          | 16 ++++++++--------
 UserInfo_test.go => NmdcProtocol_test.go | 17 +++++++++--------
 2 files changed, 17 insertions(+), 16 deletions(-)
 rename UserInfo_test.go => NmdcProtocol_test.go (92%)

diff --git a/Example_test.go b/Example_test.go
index 1bc54d3..9f98b4c 100644
--- a/Example_test.go
+++ b/Example_test.go
@@ -7,12 +7,13 @@ import (
 func ExampleHubConnectionOptions_Connect() {
 	opts := HubConnectionOptions{
 		Address: "127.0.0.1",
-		Self:    *NewUserInfo("slowpoke9"),
+		Self:    NewUserInfo("slowpoke9"),
 	}
-	hub := opts.Connect()
 
-	for {
-		event := <-hub.OnEvent
+	events := make(chan HubEvent, 0)
+	hub := ConnectAsync(&opts, events)
+
+	for event := range events {
 		switch event.EventType {
 		case EVENT_CONNECTION_STATE_CHANGED:
 			fmt.Printf("Connection -- %s (%s)\n", event.StateChange, event.Message)
@@ -49,10 +50,9 @@ func ExampleHubConnectionOptions_ConnectSync() {
 	}
 
 	opts := HubConnectionOptions{
-		Address:     "127.0.0.1",
-		Self:        *NewUserInfo("slowpoke9"),
-		OnEventSync: cb,
+		Address: "127.0.0.1",
+		Self:    NewUserInfo("slowpoke9"),
 	}
 
-	opts.ConnectSync() // blocking
+	ConnectSync(&opts, cb) // blocking
 }
diff --git a/UserInfo_test.go b/NmdcProtocol_test.go
similarity index 92%
rename from UserInfo_test.go
rename to NmdcProtocol_test.go
index 72b4c9a..0b513c5 100644
--- a/UserInfo_test.go
+++ b/NmdcProtocol_test.go
@@ -4,13 +4,15 @@ import (
 	"testing"
 )
 
-type myInfoTestPair struct {
-	in     string
-	expect UserInfo
-}
-
 func TestMyINFOParse(t *testing.T) {
 
+	np := NewNmdcProtocol(nil).(*NmdcProtocol)
+
+	type myInfoTestPair struct {
+		in     string
+		expect UserInfo
+	}
+
 	cases := []myInfoTestPair{
 
 		myInfoTestPair{
@@ -71,15 +73,14 @@ func TestMyINFOParse(t *testing.T) {
 
 	for _, v := range cases {
 
-		got := UserInfo{}
-		err := got.fromMyINFO(v.in)
+		got, err := np.parseMyINFO(v.in)
 
 		if err != nil {
 			t.Errorf("MyINFO parse warning (%s)", err.Error())
 			continue
 		}
 
-		if got != v.expect {
+		if *got != v.expect {
 			t.Errorf("MyINFO parse failure\nExpected:\n%+v\nGot:\n%+v\n", v.expect, got)
 			continue
 		}