Implementation of the charm state.

state/internal_test.go

 // launchpad.net/juju/go/state
 //
 // Copyright (c) 2011-2012 Canonical Ltd.
-
 package state
 
 import (
-        "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
         "launchpad.net/gozk/zookeeper"
-        "testing"
 )
 
-// TestPackage integrates the tests into gotest.
-func TestPackage(t *testing.T) {
-        TestingT(t)
-}
-
 type TopologySuite struct {
         zkServer   *zookeeper.Server
         zkTestRoot string
         zkTestPort int
         zkAddr     string
         zkConn     *zookeeper.Conn
         t          *topology
 }
 
 var _ = Suite(&TopologySuite{})
 
-func (s *TopologySuite) SetUpSuite(c *C) {
-        var err error
-        s.zkTestRoot = c.MkDir() + "/zookeeper"
-        s.zkTestPort = 21812
-        s.zkAddr = fmt.Sprint("localhost:", s.zkTestPort)
-
-        s.zkServer, err = zookeeper.CreateServer(s.zkTestPort, s.zkTestRoot, "")
-        if err != nil {
-                c.Fatal("Cannot set up ZooKeeper server environment: ", err)
-        }
-        err = s.zkServer.Start()
-        if err != nil {
-                c.Fatal("Cannot start ZooKeeper server: ", err)
-        }
-}
-
-func (s *TopologySuite) TearDownSuite(c *C) {
-        if s.zkServer != nil {
-                s.zkServer.Destroy()
-        }
-}
-
 func (s *TopologySuite) SetUpTest(c *C) {
         // Connect the server.
-        _, s.zkConn = OpenAddr(c, s.zkAddr)
+        st, err := Open(&Info{
+                Addrs: []string{ZkAddr},
+        })
+        c.Assert(err, IsNil)
+        s.zkConn = ZkConn(st)
         // Read the toplogy.
-        var err error
         s.t, err = readTopology(s.zkConn)
         c.Assert(err, IsNil)
 }
 
 func (s *TopologySuite) TearDownTest(c *C) {
         // Delete possible nodes, ignore errors.
         zkRemoveTree(s.zkConn, "/topology")
         s.zkConn.Close()
 }
 
@@ skipping 407 matching lines @@
         zkTestRoot string
         zkTestPort int
         zkAddr     string
         zkConn     *zookeeper.Conn
         path       string
 }
 
 var _ = Suite(&ConfigNodeSuite{})
 
 func (s *ConfigNodeSuite) SetUpSuite(c *C) {
-        var err error
-        s.zkTestRoot = c.MkDir() + "/zookeeper"
-        s.zkTestPort = 21812
-        s.zkAddr = fmt.Sprint("localhost:", s.zkTestPort)
         s.path = "/config"
-
-        s.zkServer, err = zookeeper.CreateServer(s.zkTestPort, s.zkTestRoot, "")
-        if err != nil {
-                c.Fatal("Cannot set up ZooKeeper server environment: ", err)
-        }
-        err = s.zkServer.Start()
-        if err != nil {
-                c.Fatal("Cannot start ZooKeeper server: ", err)
-        }
-}
-
-func (s *ConfigNodeSuite) TearDownSuite(c *C) {
-        if s.zkServer != nil {
-                s.zkServer.Destroy()
-        }
 }
 
 func (s *ConfigNodeSuite) SetUpTest(c *C) {
-        _, s.zkConn = OpenAddr(c, s.zkAddr)
+        // Connect the server.
+        st, err := Open(&Info{
+                Addrs: []string{ZkAddr},
+        })
+        c.Assert(err, IsNil)
+        s.zkConn = ZkConn(st)
 }
 
 func (s *ConfigNodeSuite) TearDownTest(c *C) {
         // Delete possible nodes, ignore errors.
         zkRemoveTree(s.zkConn, s.path)
         s.zkConn.Close()
 }
 
 func (s ConfigNodeSuite) TestCreateEmptyConfigNode(c *C) {
         // Check that creating an empty node works correctly.
@@ skipping 293 matching lines @@
         // Shouldn't write again. Changes were already
         // flushed and acted upon by other parties.
         changes, err = nodeOne.Write()
         c.Assert(err, IsNil)
         c.Assert(changes, Equals, []ItemChange{})
 
         err = nodeOne.Read()
         c.Assert(err, IsNil)
         c.Assert(nodeOne, Equals, nodeTwo)
 }
+
+type QuoteSuite struct{}
+
+var _ = Suite(&QuoteSuite{})
+
+func (s QuoteSuite) TestUnmodified(c *C) {
+        // Check that a string containig only valid
+        // chars stays unmodified.
+        in := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
+        out := Quote(in)
+        c.Assert(out, Equals, in)
+}
+
+func (s QuoteSuite) TestQuote(c *C) {
+        // Check that invalid chars are translated correctly.
+        in := "hello_there/how'are~you-today.sir"
+        out := Quote(in)
+        c.Assert(out, Equals, "hello_5f_there_2f_how_27_are_7e_you-today.sir")
+}