Merge lp:~pedronis/ubuntu-push/broker-testing into lp:ubuntu-push

[Samuele Pedroni]

introduce reusable TestBrokerConfig and TestBrokerSession

introduce reusable TestBrokerConfig and TestBrokerSession

[John Lenton (chipaca)]

You know me, I like this kind of branch.
Only thing that would've made it sweeter would've been a testing/impls_test.go

review: Approve

=== modified file 'server/broker/broker.go'
--- server/broker/broker.go	2014-01-24 08:01:44 +0000
+++ server/broker/broker.go	2014-01-24 08:01:44 +0000
@@ -52,8 +52,8 @@
 	// SessionChannel returns the session control channel
 	// on which the session gets exchanges to perform.
 	SessionChannel() <-chan Exchange
-	// DeviceId returns the device id string.
-	DeviceId() string
+	// DeviceIdentifier returns the device id string.
+	DeviceIdentifier() string
 	// Levels returns the current channel levels for the session
 	Levels() LevelsMap
 	// ExchangeScratchArea returns the scratch area for exchanges.
 
=== modified file 'server/broker/broker_test.go'
--- server/broker/broker_test.go	2014-01-15 08:39:04 +0000
+++ server/broker/broker_test.go	2014-01-24 08:01:44 +0000
@@ -19,11 +19,8 @@
 import (
 	"fmt"
 	. "launchpad.net/gocheck"
-	"testing"
 )
 
-func TestBroker(t *testing.T) { TestingT(t) }
-
 type brokerSuite struct{}
 
 var _ = Suite(&brokerSuite{})
 
=== modified file 'server/broker/exchanges_test.go'
--- server/broker/exchanges_test.go	2014-01-24 08:01:44 +0000
+++ server/broker/exchanges_test.go	2014-01-24 08:01:44 +0000
@@ -14,47 +14,29 @@
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package broker
+package broker_test // use a package test to avoid cyclic imports
 
 import (
 	"encoding/json"
 	. "launchpad.net/gocheck"
+	"launchpad.net/ubuntu-push/server/broker"
+	"launchpad.net/ubuntu-push/server/broker/testing"
 	"launchpad.net/ubuntu-push/server/store"
 	// "log"
+	gotesting "testing"
 )
 
+func TestBroker(t *gotesting.T) { TestingT(t) }
+
 type exchangesSuite struct{}
 
 var _ = Suite(&exchangesSuite{})
 
-type testBrokerSession struct {
-	deviceId     string
-	exchanges    chan Exchange
-	levels       LevelsMap
-	exchgScratch ExchangesScratchArea
-}
-
-func (tbs *testBrokerSession) SessionChannel() <-chan Exchange {
-	return nil
-}
-
-func (tbs *testBrokerSession) DeviceId() string {
-	return ""
-}
-
-func (tbs *testBrokerSession) Levels() LevelsMap {
-	return tbs.levels
-}
-
-func (tbs *testBrokerSession) ExchangeScratchArea() *ExchangesScratchArea {
-	return &tbs.exchgScratch
-}
-
 func (s *exchangesSuite) TestBroadcastExchange(c *C) {
-	sess := &testBrokerSession{
-		levels: map[store.InternalChannelId]int64{},
+	sess := &testing.TestBrokerSession{
+		LevelsMap: broker.LevelsMap(map[store.InternalChannelId]int64{}),
 	}
-	exchg := &BroadcastExchange{
+	exchg := &broker.BroadcastExchange{
 		ChanId:   store.SystemInternalChannelId,
 		TopLevel: 3,
 		NotificationPayloads: []json.RawMessage{
@@ -72,14 +54,14 @@
 	c.Assert(err, IsNil)
 	err = exchg.Acked(sess)
 	c.Assert(err, IsNil)
-	c.Check(sess.levels[store.SystemInternalChannelId], Equals, int64(3))
+	c.Check(sess.LevelsMap[store.SystemInternalChannelId], Equals, int64(3))
 }
 
 func (s *exchangesSuite) TestBroadcastExchangeAckMismatch(c *C) {
-	sess := &testBrokerSession{
-		levels: map[store.InternalChannelId]int64{},
+	sess := &testing.TestBrokerSession{
+		LevelsMap: broker.LevelsMap(map[store.InternalChannelId]int64{}),
 	}
-	exchg := &BroadcastExchange{
+	exchg := &broker.BroadcastExchange{
 		ChanId:   store.SystemInternalChannelId,
 		TopLevel: 3,
 		NotificationPayloads: []json.RawMessage{
@@ -96,36 +78,16 @@
 	c.Assert(err, IsNil)
 	err = exchg.Acked(sess)
 	c.Assert(err, Not(IsNil))
-	c.Check(sess.levels[store.SystemInternalChannelId], Equals, int64(0))
-}
-
-func (s *exchangesSuite) TestFilterByLevel(c *C) {
-	payloads := []json.RawMessage{
-		json.RawMessage(`{"a": 3}`),
-		json.RawMessage(`{"a": 4}`),
-		json.RawMessage(`{"a": 5}`),
-	}
-	res := filterByLevel(5, 5, payloads)
-	c.Check(len(res), Equals, 0)
-	res = filterByLevel(4, 5, payloads)
-	c.Check(len(res), Equals, 1)
-	c.Check(res[0], DeepEquals, json.RawMessage(`{"a": 5}`))
-	res = filterByLevel(3, 5, payloads)
-	c.Check(len(res), Equals, 2)
-	c.Check(res[0], DeepEquals, json.RawMessage(`{"a": 4}`))
-	res = filterByLevel(2, 5, payloads)
-	c.Check(len(res), Equals, 3)
-	res = filterByLevel(1, 5, payloads)
-	c.Check(len(res), Equals, 3)
+	c.Check(sess.LevelsMap[store.SystemInternalChannelId], Equals, int64(0))
 }
 
 func (s *exchangesSuite) TestBroadcastExchangeFilterByLevel(c *C) {
-	sess := &testBrokerSession{
-		levels: map[store.InternalChannelId]int64{
+	sess := &testing.TestBrokerSession{
+		LevelsMap: broker.LevelsMap(map[store.InternalChannelId]int64{
 			store.SystemInternalChannelId: 2,
-		},
+		}),
 	}
-	exchg := &BroadcastExchange{
+	exchg := &broker.BroadcastExchange{
 		ChanId:   store.SystemInternalChannelId,
 		TopLevel: 3,
 		NotificationPayloads: []json.RawMessage{
 
=== added file 'server/broker/exchg_impl_test.go'
--- server/broker/exchg_impl_test.go	1970-01-01 00:00:00 +0000
+++ server/broker/exchg_impl_test.go	2014-01-24 08:01:44 +0000
@@ -0,0 +1,47 @@
+/*
+ Copyright 2013-2014 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package broker
+
+import (
+	"encoding/json"
+	. "launchpad.net/gocheck"
+	// "log"
+)
+
+type exchangesImplSuite struct{}
+
+var _ = Suite(&exchangesImplSuite{})
+
+func (s *exchangesImplSuite) TestFilterByLevel(c *C) {
+	payloads := []json.RawMessage{
+		json.RawMessage(`{"a": 3}`),
+		json.RawMessage(`{"a": 4}`),
+		json.RawMessage(`{"a": 5}`),
+	}
+	res := filterByLevel(5, 5, payloads)
+	c.Check(len(res), Equals, 0)
+	res = filterByLevel(4, 5, payloads)
+	c.Check(len(res), Equals, 1)
+	c.Check(res[0], DeepEquals, json.RawMessage(`{"a": 5}`))
+	res = filterByLevel(3, 5, payloads)
+	c.Check(len(res), Equals, 2)
+	c.Check(res[0], DeepEquals, json.RawMessage(`{"a": 4}`))
+	res = filterByLevel(2, 5, payloads)
+	c.Check(len(res), Equals, 3)
+	res = filterByLevel(1, 5, payloads)
+	c.Check(len(res), Equals, 3)
+}
 
=== modified file 'server/broker/simple/simple.go'
--- server/broker/simple/simple.go	2014-01-24 08:01:44 +0000
+++ server/broker/simple/simple.go	2014-01-24 08:01:44 +0000
@@ -70,7 +70,7 @@
 	return sess.exchanges
 }
 
-func (sess *simpleBrokerSession) DeviceId() string {
+func (sess *simpleBrokerSession) DeviceIdentifier() string {
 	return sess.deviceId
 }
 
 
=== modified file 'server/broker/simple/simple_test.go'
--- server/broker/simple/simple_test.go	2014-01-24 08:01:44 +0000
+++ server/broker/simple/simple_test.go	2014-01-24 08:01:44 +0000
@@ -20,30 +20,23 @@
 	"encoding/json"
 	. "launchpad.net/gocheck"
 	"launchpad.net/ubuntu-push/server/broker"
+	"launchpad.net/ubuntu-push/server/broker/testing"
 	"launchpad.net/ubuntu-push/server/store"
 	// "log"
-	"testing"
+	gotesting "testing"
 )
 
-func TestSimple(t *testing.T) { TestingT(t) }
+func TestSimple(t *gotesting.T) { TestingT(t) }
 
 type simpleSuite struct{}
 
 var _ = Suite(&simpleSuite{})
 
-type testBrokerConfig struct{}
-
-func (tbc *testBrokerConfig) SessionQueueSize() uint {
-	return 10
-}
-
-func (tbc *testBrokerConfig) BrokerQueueSize() uint {
-	return 5
-}
+var testBrokerConfig = &testing.TestBrokerConfig{10, 5}
 
 func (s *simpleSuite) TestNew(c *C) {
 	sto := store.NewInMemoryPendingStore()
-	b := NewSimpleBroker(sto, &testBrokerConfig{}, nil)
+	b := NewSimpleBroker(sto, testBrokerConfig, nil)
 	c.Check(cap(b.sessionCh), Equals, 5)
 	c.Check(len(b.registry), Equals, 0)
 	c.Check(b.sto, Equals, sto)
@@ -53,7 +46,7 @@
 	sto := store.NewInMemoryPendingStore()
 	notification1 := json.RawMessage(`{"m": "M"}`)
 	sto.AppendToChannel(store.SystemInternalChannelId, notification1)
-	b := NewSimpleBroker(sto, &testBrokerConfig{}, nil)
+	b := NewSimpleBroker(sto, testBrokerConfig, nil)
 	sess := &simpleBrokerSession{
 		exchanges: make(chan broker.Exchange, 1),
 	}
@@ -71,7 +64,7 @@
 	sto := store.NewInMemoryPendingStore()
 	notification1 := json.RawMessage(`{"m": "M"}`)
 	sto.AppendToChannel(store.SystemInternalChannelId, notification1)
-	b := NewSimpleBroker(sto, &testBrokerConfig{}, nil)
+	b := NewSimpleBroker(sto, testBrokerConfig, nil)
 	sess := &simpleBrokerSession{
 		exchanges: make(chan broker.Exchange, 1),
 		levels: map[store.InternalChannelId]int64{
 
=== added directory 'server/broker/testing'
=== added file 'server/broker/testing/impls.go'
--- server/broker/testing/impls.go	1970-01-01 00:00:00 +0000
+++ server/broker/testing/impls.go	2014-01-24 08:01:44 +0000
@@ -0,0 +1,60 @@
+/*
+ Copyright 2013-2014 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Package testing contains simple test implementations of some broker interfaces.
+package testing
+
+import (
+	"launchpad.net/ubuntu-push/server/broker"
+)
+
+// Test implementation of BrokerSession.
+type TestBrokerSession struct {
+	DeviceId     string
+	Exchanges    chan broker.Exchange
+	LevelsMap    broker.LevelsMap
+	exchgScratch broker.ExchangesScratchArea
+}
+
+func (tbs *TestBrokerSession) DeviceIdentifier() string {
+	return tbs.DeviceId
+}
+
+func (tbs *TestBrokerSession) SessionChannel() <-chan broker.Exchange {
+	return tbs.Exchanges
+}
+
+func (tbs *TestBrokerSession) Levels() broker.LevelsMap {
+	return tbs.LevelsMap
+}
+
+func (tbs *TestBrokerSession) ExchangeScratchArea() *broker.ExchangesScratchArea {
+	return &tbs.exchgScratch
+}
+
+// Test implementation of BrokerConfig.
+type TestBrokerConfig struct {
+	ConfigSessionQueueSize uint
+	ConfigBrokerQueueSize  uint
+}
+
+func (tbc *TestBrokerConfig) SessionQueueSize() uint {
+	return tbc.ConfigSessionQueueSize
+}
+
+func (tbc *TestBrokerConfig) BrokerQueueSize() uint {
+	return tbc.ConfigBrokerQueueSize
+}
 
=== modified file 'server/broker/testsuite/suite.go'
--- server/broker/testsuite/suite.go	2014-01-24 08:01:44 +0000
+++ server/broker/testsuite/suite.go	2014-01-24 08:01:44 +0000
@@ -24,6 +24,7 @@
 	"launchpad.net/ubuntu-push/logger"
 	"launchpad.net/ubuntu-push/protocol"
 	"launchpad.net/ubuntu-push/server/broker"
+	"launchpad.net/ubuntu-push/server/broker/testing"
 	"launchpad.net/ubuntu-push/server/store"
 	helpers "launchpad.net/ubuntu-push/testing"
 	// "log"
@@ -47,24 +48,16 @@
 	RevealSession func(broker.Broker, string) broker.BrokerSession
 }
 
-type testBrokerConfig struct{}
-
-func (tbc *testBrokerConfig) SessionQueueSize() uint {
-	return 10
-}
-
-func (tbc *testBrokerConfig) BrokerQueueSize() uint {
-	return 5
-}
+var testBrokerConfig = &testing.TestBrokerConfig{10, 5}
 
 func (s *CommonBrokerSuite) TestSanity(c *C) {
 	sto := store.NewInMemoryPendingStore()
-	b := s.MakeBroker(sto, &testBrokerConfig{}, nil)
+	b := s.MakeBroker(sto, testBrokerConfig, nil)
 	c.Check(s.RevealSession(b, "FOO"), IsNil)
 }
 
 func (s *CommonBrokerSuite) TestStartStop(c *C) {
-	b := s.MakeBroker(nil, &testBrokerConfig{}, nil)
+	b := s.MakeBroker(nil, testBrokerConfig, nil)
 	b.Start()
 	c.Check(b.Running(), Equals, true)
 	b.Start()
@@ -75,13 +68,14 @@
 
 func (s *CommonBrokerSuite) TestRegistration(c *C) {
 	sto := store.NewInMemoryPendingStore()
-	b := s.MakeBroker(sto, &testBrokerConfig{}, nil)
+	b := s.MakeBroker(sto, testBrokerConfig, nil)
 	b.Start()
 	defer b.Stop()
 	sess, err := b.Register(&protocol.ConnectMsg{Type: "connect", DeviceId: "dev-1", Levels: map[string]int64{"0": 5}})
 	c.Assert(err, IsNil)
 	c.Assert(s.RevealSession(b, "dev-1"), Equals, sess)
-	c.Assert(sess.DeviceId(), Equals, "dev-1")
+	c.Assert(sess.DeviceIdentifier(), Equals, "dev-1")
+	c.Assert(sess.ExchangeScratchArea(), Not(IsNil))
 	c.Check(sess.Levels(), DeepEquals, broker.LevelsMap(map[store.InternalChannelId]int64{
 		store.SystemInternalChannelId: 5,
 	}))
@@ -94,7 +88,7 @@
 
 func (s *CommonBrokerSuite) TestRegistrationBrokenLevels(c *C) {
 	sto := store.NewInMemoryPendingStore()
-	b := s.MakeBroker(sto, &testBrokerConfig{}, nil)
+	b := s.MakeBroker(sto, testBrokerConfig, nil)
 	b.Start()
 	defer b.Stop()
 	_, err := b.Register(&protocol.ConnectMsg{Type: "connect", DeviceId: "dev-1", Levels: map[string]int64{"z": 5}})
@@ -105,7 +99,7 @@
 	sto := store.NewInMemoryPendingStore()
 	notification1 := json.RawMessage(`{"m": "M"}`)
 	sto.AppendToChannel(store.SystemInternalChannelId, notification1)
-	b := s.MakeBroker(sto, &testBrokerConfig{}, nil)
+	b := s.MakeBroker(sto, testBrokerConfig, nil)
 	b.Start()
 	defer b.Stop()
 	sess, err := b.Register(&protocol.ConnectMsg{Type: "connect", DeviceId: "dev-1"})
@@ -117,7 +111,7 @@
 	buf := &helpers.SyncedLogBuffer{}
 	logger := logger.NewSimpleLogger(buf, "error")
 	sto := &testFailingStore{}
-	b := s.MakeBroker(sto, &testBrokerConfig{}, logger)
+	b := s.MakeBroker(sto, testBrokerConfig, logger)
 	b.Start()
 	defer b.Stop()
 	_, err := b.Register(&protocol.ConnectMsg{Type: "connect", DeviceId: "dev-1"})
@@ -128,7 +122,7 @@
 
 func (s *CommonBrokerSuite) TestRegistrationLastWins(c *C) {
 	sto := store.NewInMemoryPendingStore()
-	b := s.MakeBroker(sto, &testBrokerConfig{}, nil)
+	b := s.MakeBroker(sto, testBrokerConfig, nil)
 	b.Start()
 	defer b.Stop()
 	sess1, err := b.Register(&protocol.ConnectMsg{Type: "connect", DeviceId: "dev-1"})
@@ -146,7 +140,7 @@
 func (s *CommonBrokerSuite) TestBroadcast(c *C) {
 	sto := store.NewInMemoryPendingStore()
 	notification1 := json.RawMessage(`{"m": "M"}`)
-	b := s.MakeBroker(sto, &testBrokerConfig{}, nil)
+	b := s.MakeBroker(sto, testBrokerConfig, nil)
 	b.Start()
 	defer b.Stop()
 	sess1, err := b.Register(&protocol.ConnectMsg{Type: "connect", DeviceId: "dev-1"})
@@ -195,7 +189,7 @@
 	buf := &helpers.SyncedLogBuffer{Written: make(chan bool, 1)}
 	logger := logger.NewSimpleLogger(buf, "error")
 	sto := &testFailingStore{countdownToFail: 1}
-	b := s.MakeBroker(sto, &testBrokerConfig{}, logger)
+	b := s.MakeBroker(sto, testBrokerConfig, logger)
 	b.Start()
 	defer b.Stop()
 	_, err := b.Register(&protocol.ConnectMsg{Type: "connect", DeviceId: "dev-1"})
 
=== modified file 'server/session/session_test.go'
--- server/session/session_test.go	2014-01-24 08:01:44 +0000
+++ server/session/session_test.go	2014-01-24 08:01:44 +0000
@@ -28,13 +28,14 @@
 	"launchpad.net/ubuntu-push/logger"
 	"launchpad.net/ubuntu-push/protocol"
 	"launchpad.net/ubuntu-push/server/broker"
+	"launchpad.net/ubuntu-push/server/broker/testing"
 	"net"
 	"reflect"
-	"testing"
+	gotesting "testing"
 	"time"
 )
 
-func TestSession(t *testing.T) { TestingT(t) }
+func TestSession(t *gotesting.T) { TestingT(t) }
 
 type sessionSuite struct{}
 
@@ -123,34 +124,13 @@
 	return &testBroker{registration: make(chan interface{}, 2)}
 }
 
-type testBrokerSession struct {
-	deviceId  string
-	exchanges chan broker.Exchange
-}
-
-func (tbs *testBrokerSession) SessionChannel() <-chan broker.Exchange {
-	return tbs.exchanges
-}
-
-func (tbs *testBrokerSession) DeviceId() string {
-	return tbs.deviceId
-}
-
-func (tbs *testBrokerSession) Levels() broker.LevelsMap {
-	return nil
-}
-
-func (tbs *testBrokerSession) ExchangeScratchArea() *broker.ExchangesScratchArea {
-	return nil
-}
-
 func (tb *testBroker) Register(connect *protocol.ConnectMsg) (broker.BrokerSession, error) {
 	tb.registration <- "register " + connect.DeviceId
-	return &testBrokerSession{connect.DeviceId, nil}, tb.err
+	return &testing.TestBrokerSession{DeviceId: connect.DeviceId}, tb.err
 }
 
 func (tb *testBroker) Unregister(sess broker.BrokerSession) {
-	tb.registration <- "unregister " + sess.(*testBrokerSession).deviceId
+	tb.registration <- "unregister " + sess.DeviceIdentifier()
 }
 
 func (s *sessionSuite) TestSessionStart(c *C) {
@@ -176,7 +156,7 @@
 	err := <-errCh
 	c.Check(err, IsNil)
 	c.Check(takeNext(brkr.registration), Equals, "register dev-1")
-	c.Check(sess.(*testBrokerSession).deviceId, Equals, "dev-1")
+	c.Check(sess.DeviceIdentifier(), Equals, "dev-1")
 }
 
 func (s *sessionSuite) TestSessionRegisterError(c *C) {
@@ -242,7 +222,7 @@
 	up := make(chan interface{}, 5)
 	down := make(chan interface{}, 5)
 	tp := &testProtocol{up, down}
-	sess := &testBrokerSession{}
+	sess := &testing.TestBrokerSession{}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -263,7 +243,7 @@
 	up := make(chan interface{}, 5)
 	down := make(chan interface{}, 5)
 	tp := &testProtocol{up, down}
-	sess := &testBrokerSession{}
+	sess := &testing.TestBrokerSession{}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -279,7 +259,7 @@
 	up := make(chan interface{}, 5)
 	down := make(chan interface{}, 5)
 	tp := &testProtocol{up, down}
-	sess := &testBrokerSession{}
+	sess := &testing.TestBrokerSession{}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -332,7 +312,7 @@
 	tp := &testProtocol{up, down}
 	exchanges := make(chan broker.Exchange, 1)
 	exchanges <- &testExchange{}
-	sess := &testBrokerSession{exchanges: exchanges}
+	sess := &testing.TestBrokerSession{Exchanges: exchanges}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -355,7 +335,7 @@
 	tp := &testProtocol{up, down}
 	exchanges := make(chan broker.Exchange, 1)
 	exchanges <- &testExchange{nParts: 2}
-	sess := &testBrokerSession{exchanges: exchanges}
+	sess := &testing.TestBrokerSession{Exchanges: exchanges}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -383,7 +363,7 @@
 	exchanges := make(chan broker.Exchange, 1)
 	prepErr := errors.New("prepare failure")
 	exchanges <- &testExchange{prepErr: prepErr}
-	sess := &testBrokerSession{exchanges: exchanges}
+	sess := &testing.TestBrokerSession{Exchanges: exchanges}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -399,7 +379,7 @@
 	exchanges := make(chan broker.Exchange, 1)
 	finErr := errors.New("finish error")
 	exchanges <- &testExchange{finErr: finErr}
-	sess := &testBrokerSession{exchanges: exchanges}
+	sess := &testing.TestBrokerSession{Exchanges: exchanges}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -418,7 +398,7 @@
 	tp := &testProtocol{up, down}
 	exchanges := make(chan broker.Exchange, 1)
 	exchanges <- &testExchange{}
-	sess := &testBrokerSession{exchanges: exchanges}
+	sess := &testing.TestBrokerSession{Exchanges: exchanges}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
@@ -436,7 +416,7 @@
 	tp := &testProtocol{up, down}
 	exchanges := make(chan broker.Exchange, 1)
 	exchanges <- &testExchange{finSleep: 3 * time.Millisecond}
-	sess := &testBrokerSession{exchanges: exchanges}
+	sess := &testing.TestBrokerSession{Exchanges: exchanges}
 	go func() {
 		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout)
 	}()
 
=== modified file 'server/session/tracker.go'
--- server/session/tracker.go	2014-01-15 08:55:54 +0000
+++ server/session/tracker.go	2014-01-24 08:01:44 +0000
@@ -57,7 +57,7 @@
 }
 
 func (trk *tracker) Registered(sess broker.BrokerSession) {
-	trk.Infof("session(%x) registered %v", trk.sessionId, sess.DeviceId())
+	trk.Infof("session(%x) registered %v", trk.sessionId, sess.DeviceIdentifier())
 }
 
 func (trk *tracker) End(err error) error {
 
=== modified file 'server/session/tracker_test.go'
--- server/session/tracker_test.go	2014-01-15 08:55:54 +0000
+++ server/session/tracker_test.go	2014-01-24 08:01:44 +0000
@@ -22,6 +22,7 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/ubuntu-push/logger"
 	"launchpad.net/ubuntu-push/server/broker"
+	"launchpad.net/ubuntu-push/server/broker/testing"
 	"net"
 )
 
@@ -50,7 +51,7 @@
 	logger := logger.NewSimpleLogger(buf, "debug")
 	track := NewTracker(logger)
 	track.Start(&testRemoteAddrable{})
-	track.Registered(&testBrokerSession{deviceId: "DEV-ID"})
+	track.Registered(&testing.TestBrokerSession{DeviceId: "DEV-ID"})
 	regExpected := fmt.Sprintf(`.*connected.*\n.* INFO session\(%x\) registered DEV-ID\n`, track.(*tracker).sessionId)
 	c.Check(buf.String(), Matches, regExpected)
 }