Add unit test for xmpp.username() and fix it

The second unit test detected a bug - they are worth the effort!

2 files changed, 19 insertions, 10 deletions

diff --git a/xmpp/jid.go b/xmpp/jid.go
index 672e934..90c1509 100644
--- a/xmpp/jid.go
+++ b/xmpp/jid.go
@@ -26,18 +26,10 @@ func username(jid string) string {
 	list := []rune(jid)
 
 	for i, v := range list {
-		if v == '/' {
-			list = list[:i]
-			break
-		}
-	}
-
-	for i, v := range list {
 		if v == '@' {
-			list = list[:i]
-			break
+			return string(list[:i])
 		}
 	}
 
-	return string(list)
+	return ""
 }
diff --git a/xmpp/jid_test.go b/xmpp/jid_test.go
index b900b9c..6f8b9fd 100644
--- a/xmpp/jid_test.go
+++ b/xmpp/jid_test.go
@@ -19,3 +19,20 @@ func TestDomainpart(t *testing.T) {
 		}
 	}
 }
+
+func TestUsername(t *testing.T) {
+	var data = map[string]string{
+		"user@example.org/ressource": "user",
+		"example.org/ressource": "",
+		"user@example.org": "user",
+		"df%§df?LÖ@example.org": "df%§df?LÖ",
+		"example.org": "",
+		"test.eu": "",
+	}
+
+	for k, v := range(data) {
+		if username(k) != v {
+			t.Fatalf("Username of JID '%s' is not '%s'!", k, v)
+		}
+	}
+}