Add ServiceDestroyUnits to the API

state/state_test.go

 package state_test
 
 import (
         "fmt"
         "labix.org/v2/mgo/bson"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/testing"
@@ skipping 927 matching lines @@
                 state.SortPorts(p)
                 c.Check(p, DeepEquals, t.want)
                 state.SortPorts(p)
                 c.Check(p, DeepEquals, t.want)
         }
 }
 
 func (*StateSuite) TestNameChecks(c *C) {
         assertService := func(s string, expect bool) {
                 c.Assert(state.IsServiceName(s), Equals, expect)
+                // Check that anything that is considered a valid service name
+                // is also (in)valid if a(n) (in)valid unit designator is added
+                // to it.
                 c.Assert(state.IsUnitName(s+"/0"), Equals, expect)
                 c.Assert(state.IsUnitName(s+"/99"), Equals, expect)
                 c.Assert(state.IsUnitName(s+"/-1"), Equals, false)
                 c.Assert(state.IsUnitName(s+"/blah"), Equals, false)
+                c.Assert(state.IsUnitName(s+"/"), Equals, false)
         }
+        // Service names must be non-empty...
         assertService("", false)
+        // must not consist entirely of numbers
         assertService("33", false)
+        // may consist of a single word
         assertService("wordpress", true)
+        // may contain hyphen-seperated words...
+        assertService("super-duper-wordpress", true)
+        // ...but those words must have at least one letter in them
+        assertService("super-1234-wordpress", false)
+        // may contain internal numbers.
         assertService("w0rd-pre55", true)
+        // must not begin with a number
+        assertService("3wordpress", false)
+        // but internal, hyphen-sperated words can begin with numbers
+        assertService("foo-2foo", true)
+        // and may end with a number...
         assertService("foo2", true)
+        // ...unless that number is all by itself
         assertService("foo-2", false)
-        assertService("foo-2foo", true)
 
         assertMachine := func(s string, expect bool) {
                 c.Assert(state.IsMachineId(s), Equals, expect)
         }
         assertMachine("0", true)
         assertMachine("1", true)
         assertMachine("1000001", true)
         assertMachine("01", false)
         assertMachine("-1", false)
         assertMachine("", false)
@@ skipping 404 matching lines @@
         c.Assert(e.EntityName(), Equals, u.EntityName())
 
         user, err := s.State.AddUser("arble", "pass")
         c.Assert(err, IsNil)
 
         e, err = s.State.Entity(user.EntityName())
         c.Assert(err, IsNil)
         c.Assert(e, FitsTypeOf, user)
         c.Assert(e.EntityName(), Equals, user.EntityName())
 }