state/apiserver: Split Machiner into subpackage

state/apiserver/errors_test.go

Index: state/apiserver/errors_test.go
=== modified file 'state/apiserver/errors_test.go'
--- state/apiserver/errors_test.go	2013-06-05 09:07:49 +0000
+++ state/apiserver/errors_test.go	2013-06-06 17:09:49 +0000
@@ -9,7 +9,7 @@
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
-	"launchpad.net/juju-core/state/apiserver"
+	"launchpad.net/juju-core/state/apiserver/common"
 	"launchpad.net/juju-core/testing"
 )
 
@@ -41,25 +41,25 @@
 	err:  state.ErrUnitHasSubordinates,
 	code: api.CodeUnitHasSubordinates,
 }, {
-	err:  apiserver.ErrBadId,
+	err:  common.ErrBadId,
 	code: api.CodeNotFound,
 }, {
-	err:  apiserver.ErrBadCreds,
-	code: api.CodeUnauthorized,
-}, {
-	err:  apiserver.ErrPerm,
-	code: api.CodeUnauthorized,
-}, {
-	err:  apiserver.ErrNotLoggedIn,
-	code: api.CodeUnauthorized,
-}, {
-	err:  apiserver.ErrUnknownWatcher,
+	err:  common.ErrBadCreds,
+	code: api.CodeUnauthorized,
+}, {
+	err:  common.ErrPerm,
+	code: api.CodeUnauthorized,
+}, {
+	err:  common.ErrNotLoggedIn,
+	code: api.CodeUnauthorized,
+}, {
+	err:  common.ErrUnknownWatcher,
 	code: api.CodeNotFound,
 }, {
 	err:  &state.NotAssignedError{&state.Unit{}}, // too sleazy?! nah..
 	code: api.CodeNotAssigned,
 }, {
-	err:  apiserver.ErrStoppedWatcher,
+	err:  common.ErrStoppedWatcher,
 	code: api.CodeStopped,
 }, {
 	err:  &state.HasAssignedUnitsError{"42", []string{"a"}},
@@ -67,16 +67,19 @@
 }, {
 	err:  stderrors.New("an error"),
 	code: "",
+}, {
+	err:  nil,
+	code: "",
 }}
 
 func (s *errorsSuite) TestErrorTransform(c *C) {
 	for _, t := range errorTransformTests {
-		err1 := apiserver.ServerError(t.err)
-		c.Assert(err1.Error(), Equals, t.err.Error())
-		if t.code != "" {
-			c.Assert(api.ErrCode(err1), Equals, t.code)
+		err1 := common.ServerError(t.err)
+		if t.err == nil {
+			c.Assert(err1, IsNil)
 		} else {
-			c.Assert(err1, Equals, t.err)
+			c.Assert(err1.Message, Equals, t.err.Error())
+			c.Assert(err1.Code, Equals, t.code)
 		}
 	}
 }