Merge branch 'stream-features'

The added code provides a structured way to handle features offered by
the server.

1 files changed, 7 insertions, 6 deletions

diff --git a/xmpp/router_test.go b/xmpp/router_test.go
index ea13712..b490778 100644
--- a/xmpp/router_test.go
+++ b/xmpp/router_test.go
@@ -2,8 +2,8 @@ package xmpp
 
 import (
 	"encoding/xml"
-	"testing"
 	"strings"
+	"testing"
 )
 
 // routerTest contains a single test case for the xmpp.router. The XML element
@@ -11,8 +11,8 @@ import (
 // test variable inside the corresponding unit test. See TestRouter for
 // details.
 type routerTest struct {
-	xml     string
-	value   int
+	xml   string
+	value int
 }
 
 // TestRouter tests the xmpp/router.go file. The central functionality is the
@@ -23,9 +23,10 @@ type routerTest struct {
 // validated.
 func TestRouter(t *testing.T) {
 	var testpoint int
+	var s session
 
-	factory := func(tp *int, i int) func([]xml.Token) {
-		return func([]xml.Token) {
+	factory := func(tp *int, i int) func(*session, []xml.Token) {
+		return func(*session, []xml.Token) {
 			*tp = i
 		}
 	}
@@ -60,7 +61,7 @@ func TestRouter(t *testing.T) {
 			tokens = append(tokens, xml.CopyToken(token))
 		}
 
-		route(tokens, testRouting)
+		route(&s, tokens, testRouting)
 
 		if testpoint != v.value {
 			t.Fatalf("XML element was not routed correctly!\n")