Rename leftover references of "papo" -> "papod"

1 files changed, 82 insertions, 57 deletions

diff --git a/tests/lib_test.go b/tests/lib_test.go
index fdc663b..1ec2208 100644
--- a/tests/lib_test.go
+++ b/tests/lib_test.go
@@ -1,4 +1,4 @@
-package papo_test
+package papod_test
 
 import (
 	"bufio"
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"euandre.org/papo/src"
+	"euandre.org/papod/src"
 )
 
 
@@ -67,7 +67,7 @@ func TestSplitOnCRLF(t *testing.T) {
 	for i, entry := range table {
 		var given []string
 		scanner := bufio.NewScanner(strings.NewReader(entry.input))
-		scanner.Split(papo.SplitOnCRLF)
+		scanner.Split(papod.SplitOnCRLF)
 		for scanner.Scan() {
 			given = append(given, scanner.Text())
 		}
@@ -98,7 +98,7 @@ func TestSplitOnRawMessage(t *testing.T) {
 	for i, entry := range table {
 		var given []string
 		scanner := bufio.NewScanner(strings.NewReader(entry.input))
-		scanner.Split(papo.SplitOnRawMessage)
+		scanner.Split(papod.SplitOnRawMessage)
 		for scanner.Scan() {
 			given = append(given, scanner.Text())
 		}
@@ -112,180 +112,180 @@ func TestSplitOnRawMessage(t *testing.T) {
 func TestParseMessageParams(t *testing.T) {
 	type tableT struct {
 		input string
-		expected papo.MessageParams
+		expected papod.MessageParams
 	}
 	table := []tableT {
 		{
 			"",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { },
 				Trailing: "",
 			},
 		},
 		{
 			" ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { },
 				Trailing: "",
 			},
 		},
 		{
 			" :",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { },
 				Trailing: "",
 			},
 		},
 		{
 			" : ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { },
 				Trailing: " ",
 			},
 		},
 		{
 			": ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { ":" },
 				Trailing: "",
 			},
 		},
 		{
 			":   ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { ":" },
 				Trailing: "",
 			},
 		},
 		{
 			" :  ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { },
 				Trailing: "  ",
 			},
 		},
 		{
 			"  :",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { },
 				Trailing: "",
 			},
 		},
 		{
 			"   :",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { },
 				Trailing: "",
 			},
 		},
 		{
 			"a",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a" },
 				Trailing: "",
 			},
 		},
 		{
 			"ab",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "ab" },
 				Trailing: "",
 			},
 		},
 		{
 			"a b",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: "",
 			},
 		},
 		{
 			"a b c",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b", "c" },
 				Trailing: "",
 			},
 		},
 		{
 			"a b:c",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b:c" },
 				Trailing: "",
 			},
 		},
 		{
 			"a b:c:",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b:c:" },
 				Trailing: "",
 			},
 		},
 		{
 			"a b :c",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: "c",
 			},
 		},
 		{
 			"a b :c:",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: "c:",
 			},
 		},
 		{
 			"a b :c ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: "c ",
 			},
 		},
 		{
 			"a b : c",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: " c",
 			},
 		},
 		{
 			"a b : c ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: " c ",
 			},
 		},
 		{
 			"a b : c :",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: " c :",
 			},
 		},
 		{
 			"a b : c : ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: " c : ",
 			},
 		},
 		{
 			"a b : c :d",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: " c :d",
 			},
 		},
 		{
 			"a b : c :d ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: " c :d ",
 			},
 		},
 		{
 			"a b : c : d ",
-			papo.MessageParams {
+			papod.MessageParams {
 				Middle: []string { "a", "b" },
 				Trailing: " c : d ",
 			},
@@ -293,23 +293,23 @@ func TestParseMessageParams(t *testing.T) {
 	}
 
 	for i, entry := range table {
-		given := papo.ParseMessageParams(entry.input)
+		given := papod.ParseMessageParams(entry.input)
 		assertEqualI(t, i, given, entry.expected)
 	}
 }
 
 func TestParseMessage(t *testing.T) {
-	type tableT struct {
+	type tableTOK struct {
 		input string
-		expected papo.Message
+		expected papod.Message
 	}
-	table := []tableT {
+	tableOK := []tableTOK {
 		{
 			"NICK joebloe ",
-			papo.Message {
+			papod.Message {
 				Prefix:  "",
 				Command: "NICK",
-				Params:  papo.MessageParams {
+				Params:  papod.MessageParams {
 					Middle: []string { "joebloe" },
 					Trailing: "",
 				},
@@ -318,10 +318,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			"USER joebloe 0.0.0.0 joe :Joe Bloe",
-			papo.Message {
+			papod.Message {
 				Prefix:  "",
 				Command: "USER",
-				Params:  papo.MessageParams {
+				Params:  papod.MessageParams {
 					Middle: []string {
 						"joebloe", "0.0.0.0", "joe",
 					},
@@ -332,10 +332,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre USER joebloe 0.0.0.0 joe :Joe Bloe",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params:  papo.MessageParams {
+				Params:  papod.MessageParams {
 					Middle: []string {
 						"joebloe", "0.0.0.0", "joe",
 					},
@@ -346,10 +346,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre  USER   joebloe    0.0.0.0      joe      : Joe Bloe ",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params:  papo.MessageParams {
+				Params:  papod.MessageParams {
 					Middle: []string {
 						"joebloe", "0.0.0.0", "joe",
 					},
@@ -360,10 +360,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre  USER   joebloe:   0:0:0:0      joe::a:  : Joe Bloe ",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params:  papo.MessageParams {
+				Params:  papod.MessageParams {
 					Middle: []string {
 						"joebloe:", "0:0:0:0", "joe::a:",
 					},
@@ -374,10 +374,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre  USER   :Joe Bloe",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params: papo.MessageParams {
+				Params: papod.MessageParams {
 					Middle: []string { },
 					Trailing: "Joe Bloe",
 				},
@@ -386,10 +386,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre  USER   : Joe Bloe",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params: papo.MessageParams {
+				Params: papod.MessageParams {
 					Middle: []string { },
 					Trailing: " Joe Bloe",
 				},
@@ -398,10 +398,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre  USER   :     Joe Bloe",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params: papo.MessageParams {
+				Params: papod.MessageParams {
 					Middle: []string { },
 					Trailing: "     Joe Bloe",
 				},
@@ -410,10 +410,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre  USER   :         ",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params: papo.MessageParams {
+				Params: papod.MessageParams {
 					Middle: []string { },
 					Trailing: "         ",
 				},
@@ -422,10 +422,10 @@ func TestParseMessage(t *testing.T) {
 		},
 		{
 			":pre  USER   :",
-			papo.Message {
+			papod.Message {
 				Prefix:  "pre",
 				Command: "USER",
-				Params: papo.MessageParams {
+				Params: papod.MessageParams {
 					Middle: []string { },
 					Trailing: "",
 				},
@@ -434,10 +434,35 @@ func TestParseMessage(t *testing.T) {
 		},
 	}
 
-	for i, entry := range table {
-		parsed, err := papo.ParseMessage(entry.input)
+	for i, entry := range tableOK {
+		given, err := papod.ParseMessage(entry.input)
 		errorIf(t, err)
-		given := parsed
+		assertEqualI(t, i, given, entry.expected)
+	}
+
+
+	type tableErrorT struct {
+		input string
+		expected error 
+	}
+	parseErr := errors.New("Can't parse message")
+	tableError := []tableErrorT {
+		{
+			":pre",
+			parseErr,
+		},
+		{
+			": pre",
+			parseErr,
+		},
+		{
+			":pre N1CK",
+			parseErr,
+		},
+	}
+
+	for i, entry := range tableError {
+		_, given := papod.ParseMessage(entry.input)
 		assertEqualI(t, i, given, entry.expected)
 	}
 }