jujuc: move from cmd/jujuc/server

worker/uniter/jujuc/relation-ids_test.go

-package server_test
+package jujuc_test
 
 import (
         "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/cmd"
-        "launchpad.net/juju-core/cmd/jujuc/server"
         "launchpad.net/juju-core/juju/testing"
         "launchpad.net/juju-core/state"
+        "launchpad.net/juju-core/worker/uniter/jujuc"
 )
 
 type RelationIdsSuite struct {
         testing.JujuConnSuite
         ch      *state.Charm
         service *state.Service
         unit    *state.Unit
-        relctxs map[int]*server.RelationContext
+        relctxs map[int]*jujuc.RelationContext
 }
 
 var _ = Suite(&RelationIdsSuite{})
 
 func (s *RelationIdsSuite) SetUpTest(c *C) {
         s.JujuConnSuite.SetUpTest(c)
         s.ch = s.AddTestingCharm(c, "dummy")
         var err error
         s.service, err = s.State.AddService("main", s.ch)
         c.Assert(err, IsNil)
         s.unit, err = s.service.AddUnit()
         c.Assert(err, IsNil)
-        s.relctxs = map[int]*server.RelationContext{}
+        s.relctxs = map[int]*jujuc.RelationContext{}
         s.AddRelatedServices(c, "x", 3)
         s.AddRelatedServices(c, "y", 1)
 }
 
 func (s *RelationIdsSuite) AddRelatedServices(c *C, relname string, count int) {
         mainep := state.RelationEndpoint{
                 "main", "ifce", relname, state.RoleProvider, charm.ScopeGlobal,
         }
         for i := 0; i < count; i++ {
                 service, err := s.State.AddService(fmt.Sprintf("%s%d", relname, i), s.ch)
                 c.Assert(err, IsNil)
                 otherep := state.RelationEndpoint{
                         service.Name(), "ifce", relname, state.RoleRequirer, charm.ScopeGlobal,
                 }
                 rel, err := s.State.AddRelation(mainep, otherep)
                 c.Assert(err, IsNil)
                 ru, err := rel.Unit(s.unit)
                 c.Assert(err, IsNil)
-                s.relctxs[rel.Id()] = server.NewRelationContext(ru, nil)
+                s.relctxs[rel.Id()] = jujuc.NewRelationContext(ru, nil)
         }
 }
 
-func (s *RelationIdsSuite) GetHookContext(c *C, relid int) *server.HookContext {
+func (s *RelationIdsSuite) GetHookContext(c *C, relid int) *jujuc.HookContext {
         if relid != -1 {
                 _, found := s.relctxs[relid]
                 c.Assert(found, Equals, true)
         }
-        return &server.HookContext{
+        return &jujuc.HookContext{
                 Service:        s.service,
                 Unit:           s.unit,
                 Id:             "TestCtx",
                 RelationId:     relid,
                 RemoteUnitName: "",
                 Relations:      s.relctxs,
         }
 }
 
 var relationIdsTests = []struct {
@@ skipping 111 matching lines @@
                 com, err := hctx.NewCommand("relation-ids")
                 c.Assert(err, IsNil)
                 ctx := dummyContext(c)
                 code := cmd.Main(com, ctx, []string{"--help"})
                 c.Assert(code, Equals, 0)
                 c.Assert(bufferString(ctx.Stdout), Equals, "")
                 expect := fmt.Sprintf(template, t.usage, t.doc)
                 c.Assert(bufferString(ctx.Stderr), Equals, expect)
         }
 }