Annotation documents and Environment Entity

state/conn_test.go

 package state_test
 
 import (
-        "fmt"
         "labix.org/v2/mgo"
         . "launchpad.net/gocheck"
-        "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/testing"
-        "net/url"
         stdtesting "testing"
 )
 
 // TestPackage integrates the tests into gotest.
 func TestPackage(t *stdtesting.T) {
         testing.MgoTestPackage(t)
 }
 
 // ConnSuite provides the infrastructure for all other
 // test suites (StateSuite, CharmSuite, MachineSuite, etc).
@@ skipping 33 matching lines @@
         c.Assert(err, IsNil)
 }
 
 func (cs *ConnSuite) TearDownTest(c *C) {
         cs.State.Close()
         cs.MgoSuite.TearDownTest(c)
         cs.LoggingSuite.TearDownTest(c)
 }
 
 func (s *ConnSuite) AddTestingCharm(c *C, name string) *state.Charm {
-        ch := testing.Charms.Dir(name)
-        ident := fmt.Sprintf("%s-%d", name, ch.Revision())
-        curl := charm.MustParseURL("local:series/" + ident)
-        bundleURL, err := url.Parse("http://bundles.example.com/" + ident)
-        c.Assert(err, IsNil)
-        sch, err := s.State.AddCharm(ch, curl, bundleURL, ident+"-sha256")
-        c.Assert(err, IsNil)
-        return sch
+        return s.State.AddTestingCharm(c, name)
 }
+
+// AddConfigCharm clones a testing charm, replaces its config with
+// the given YAML string and adds it to the state, using the given
+// revision.
+func (s *ConnSuite) AddConfigCharm(c *C, name, configYaml string, revision int) *state.Charm {
+        return s.State.AddConfigCharm(c, name, configYaml, revision)
+}