← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to state/api/params/params_test.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/api/params/params_test.go
4
4
        "encoding/json"
5
5
        . "launchpad.net/gocheck"
6
6
        "launchpad.net/juju-core/charm"
 
7
        "launchpad.net/juju-core/constraints"
7
8
        "launchpad.net/juju-core/state/api/params"
8
9
        "testing"
9
10
)
38
39
        about: "ServiceInfo Delta",
39
40
        value: params.Delta{
40
41
                Entity: &params.ServiceInfo{
41
 
                        Name:     "Benji",
42
 
                        Exposed:  true,
43
 
                        CharmURL: "cs:series/name",
 
42
                        Name:        "Benji",
 
43
                        Exposed:     true,
 
44
                        CharmURL:    "cs:series/name",
 
45
                        Constraints: constraints.MustParse("arch=arm mem=1024M"),
44
46
                },
45
47
        },
46
 
        json: `["service","change",{"CharmURL": "cs:series/name","Name":"Benji","Exposed":true}]`,
 
48
        json: `["service","change",{"CharmURL": "cs:series/name","Name":"Benji","Exposed":true,"Constraints":{"arch":"arm", "mem": 1024}}]`,
47
49
}, {
48
50
        about: "UnitInfo Delta",
49
51
        value: params.Delta{
118
120
}
119
121
 
120
122
func (s *MarshalSuite) TestDeltaUnmarshalJSON(c *C) {
121
 
        for _, t := range marshalTestCases {
122
 
                c.Log(t.about)
 
123
        for i, t := range marshalTestCases {
 
124
                c.Logf("test %d. %s", i, t.about)
123
125
                var unmarshalled params.Delta
124
126
                err := json.Unmarshal([]byte(t.json), &unmarshalled)
125
127
                c.Check(err, IsNil)