Merge lp:~chipaca/ubuntu-push/levelmap into lp:ubuntu-push

[John Lenton]

The client session level map. Interesting as an interface and not much more, right now.

The client session level map. Interesting as an interface and not much more, right now.

[lp:~chipaca/ubuntu-push/levelmap]

34. By John Lenton on 2014-01-30

s/sessionSuite/trackerSuite/ in server/session/tracker_test.go

[Samuele Pedroni (pedronis)]

review: Approve

=== added directory 'client'
=== added directory 'client/session'
=== added directory 'client/session/levelmap'
=== added file 'client/session/levelmap/levelmap.go'
--- client/session/levelmap/levelmap.go	1970-01-01 00:00:00 +0000
+++ client/session/levelmap/levelmap.go	2014-01-30 12:56:19 +0000
@@ -0,0 +1,46 @@
+/*
+ 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/>.
+*/
+
+// levelmap holds an implementation of the LevelMap that the client
+// session uses to keep track of what messages it has seen.
+package levelmap
+
+// This implementation is memory-based and does not save state. There
+// is another one that stores the levels in sqlite that is missing a
+// few dependencies still.
+
+type LevelMap interface {
+	// Set() (re)sets the given level to the given value.
+	Set(level string, top int64)
+	// GetAll() returns a "simple" map of the current levels.
+	GetAll() map[string]int64
+}
+
+type mapLevelMap map[string]int64
+
+func (m *mapLevelMap) Set(level string, top int64) {
+	(*m)[level] = top
+}
+func (m *mapLevelMap) GetAll() map[string]int64 {
+	return map[string]int64(*m)
+}
+
+var _ LevelMap = &mapLevelMap{}
+
+// default constructor
+func NewLevelMap() LevelMap {
+	return &mapLevelMap{}
+}

=== added file 'client/session/levelmap/levelmap_test.go'
--- client/session/levelmap/levelmap_test.go	1970-01-01 00:00:00 +0000
+++ client/session/levelmap/levelmap_test.go	2014-01-30 12:56:19 +0000
@@ -0,0 +1,41 @@
+/*
+ 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 levelmap
+
+import (
+	. "launchpad.net/gocheck"
+	"testing"
+)
+
+func TestLevelMap(t *testing.T) { TestingT(t) }
+
+type lmSuite struct{}
+
+var _ = Suite(&lmSuite{})
+
+func (cs *lmSuite) TestAllTheThings(c *C) {
+	// checks NewLevelMap returns a LevelMap
+	var lm LevelMap = NewLevelMap()
+	// setting a couple of things, sets them
+	lm.Set("this", 12)
+	lm.Set("that", 42)
+	c.Check(lm.GetAll(), DeepEquals, map[string]int64{"this": 12, "that": 42})
+	// re-setting one of them, resets it
+	lm.Set("this", 999)
+	c.Check(lm.GetAll(), DeepEquals, map[string]int64{"this": 999, "that": 42})
+	// huzzah
+}

=== modified file 'server/session/tracker_test.go'
--- server/session/tracker_test.go	2014-01-23 20:13:22 +0000
+++ server/session/tracker_test.go	2014-01-30 12:56:19 +0000
@@ -36,7 +36,7 @@
 	return &net.TCPAddr{net.IPv4(127, 0, 0, 1), 9999, ""}
 }
 
-func (s *sessionSuite) TestSessionTrackStart(c *C) {
+func (s *trackerSuite) TestSessionTrackStart(c *C) {
 	buf := &bytes.Buffer{}
 	logger := logger.NewSimpleLogger(buf, "debug")
 	track := NewTracker(logger)
@@ -46,7 +46,7 @@
 	c.Check(buf.String(), Matches, regExpected)
 }
 
-func (s *sessionSuite) TestSessionTrackRegistered(c *C) {
+func (s *trackerSuite) TestSessionTrackRegistered(c *C) {
 	buf := &bytes.Buffer{}
 	logger := logger.NewSimpleLogger(buf, "debug")
 	track := NewTracker(logger)
@@ -56,7 +56,7 @@
 	c.Check(buf.String(), Matches, regExpected)
 }
 
-func (s *sessionSuite) TestSessionTrackEnd(c *C) {
+func (s *trackerSuite) TestSessionTrackEnd(c *C) {
 	buf := &bytes.Buffer{}
 	logger := logger.NewSimpleLogger(buf, "debug")
 	track := NewTracker(logger)