Merge lp:~pedronis/ubuntu-push/improve-coverage into lp:ubuntu-push

[Samuele Pedroni]

couple of extra tests and changes to improve test coverage

couple of extra tests and changes to improve test coverage

[John Lenton (chipaca)]

review: Approve

=== modified file 'server/api/handlers.go'
--- server/api/handlers.go	2014-01-13 15:21:11 +0000
+++ server/api/handlers.go	2014-01-14 19:03:52 +0000
@@ -161,7 +161,7 @@
 	return nil
 }
 
-func readBody(writer http.ResponseWriter, request *http.Request) ([]byte, *APIError) {
+func readBody(request *http.Request) ([]byte, *APIError) {
 	if err := checkRequestAsPost(request); err != nil {
 		return nil, err
 	}
@@ -207,7 +207,7 @@
 }
 
 func (h *BroadcastHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
-	body, apiErr := readBody(writer, request)
+	body, apiErr := readBody(request)
 
 	if apiErr != nil {
 		respondError(writer, apiErr)

=== modified file 'server/api/handlers_test.go'
--- server/api/handlers_test.go	2014-01-13 15:21:11 +0000
+++ server/api/handlers_test.go	2014-01-14 19:03:52 +0000
@@ -53,6 +53,16 @@
 	c.Check(string(wire), Equals, `{"error":"invalid-request","message":"Message"}`)
 }
 
+func (s *handlersSuite) TestReadyBodyReadError(c *C) {
+	r := bytes.NewReader([]byte{}) // eof too early
+	req, err := http.NewRequest("POST", "", r)
+	req.Header.Set("Content-Type", "application/json")
+	req.ContentLength = 1000
+	c.Assert(err, IsNil)
+	_, err = readBody(req)
+	c.Check(err, Equals, ErrCouldNotReadBody)
+}
+
 type checkBrokerSending struct {
 	store    store.PendingStore
 	chanId   store.InternalChannelId

=== added file 'server/broker/broker_test.go'
--- server/broker/broker_test.go	1970-01-01 00:00:00 +0000
+++ server/broker/broker_test.go	2014-01-14 19:03:52 +0000
@@ -0,0 +1,34 @@
+/*
+ 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 (
+	"fmt"
+	. "launchpad.net/gocheck"
+	"testing"
+)
+
+func TestBroker(t *testing.T) { TestingT(t) }
+
+type brokerSuite struct{}
+
+var _ = Suite(&brokerSuite{})
+
+func (s *brokerSuite) TestErrAbort(c *C) {
+	err := &ErrAbort{"expected FOO"}
+	c.Check(fmt.Sprintf("%s", err), Equals, "session aborted (expected FOO)")
+}

=== modified file 'server/broker/simple_test.go'
--- server/broker/simple_test.go	2014-01-13 15:21:11 +0000
+++ server/broker/simple_test.go	2014-01-14 19:03:52 +0000
@@ -25,12 +25,9 @@
 	"launchpad.net/ubuntu-push/server/store"
 	helpers "launchpad.net/ubuntu-push/testing"
 	// "log"
-	"testing"
 	"time"
 )
 
-func TestSimple(t *testing.T) { TestingT(t) }
-
 type simpleSuite struct{}
 
 var _ = Suite(&simpleSuite{})

=== modified file 'server/session/session.go'
--- server/session/session.go	2014-01-13 15:21:11 +0000
+++ server/session/session.go	2014-01-14 19:03:52 +0000
@@ -107,7 +107,6 @@
 			}
 		}
 	}
-	return nil
 }
 
 var sessionsEpoch = time.Date(2013, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano()