Merge lp:~allenap/gwacl/test-unused-chs-fields into lp:gwacl

[Gavin Panella]

Test CreateHostedService for use with Create Hosted Service calls.

Previously several fields of CreateHostedService were untested.

[Julian Edwards (julian-edwards)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review: approve

Wow, I didn't think we'd missed this much testing. Thanks for fixing
(this and the others).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlHCWcUACgkQWhGlTF8G/HfyoACeL3/ANwke46rdlY4JAsaUzz8I
JNQAoIkvDKEZiY+4FsjxeNCA/R09r81Z
=6ow/
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-06-19 16:21:29 +0000
+++ xmlobjects.go	2013-06-19 16:21:29 +0000
@@ -308,15 +308,13 @@
 }
 
 type CreateHostedService struct {
-    // See http://msdn.microsoft.com/en-us/library/windowsazure/hh264518.aspx
-    XMLNS       string `xml:"xmlns,attr"`
-    ServiceName string `xml:"ServiceName"`
-    // Label is base64-encoded.
-    Label              string             `xml:"Label"`
-    Description        string             `xml:"Description,omitempty"`
-    AffinityGroup      string             `xml:"AffinityGroup,omitempty"`
+    XMLNS              string             `xml:"xmlns,attr"`
+    ServiceName        string             `xml:"ServiceName"`
+    Label              string             `xml:"Label"` // base64-encoded
+    Description        string             `xml:"Description"`
     Location           string             `xml:"Location,omitempty"`
-    ExtendedProperties []ExtendedProperty `xml:"ExtendedProperties>ExtendedProperty,omitempty"`
+    AffinityGroup      string             `xml:"AffinityGroup"`
+    ExtendedProperties []ExtendedProperty `xml:"ExtendedProperties>ExtendedProperty"`
 }
 
 func NewCreateHostedServiceWithLocation(serviceName, label, location string) *CreateHostedService {
@@ -329,6 +327,10 @@
     }
 }
 
+func (s *CreateHostedService) Deserialize(data []byte) error {
+    return xml.Unmarshal(data, s)
+}
+
 //
 // Deployment bits
 //
 
=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-06-19 16:21:29 +0000
+++ xmlobjects_test.go	2013-06-19 16:21:29 +0000
@@ -644,6 +644,47 @@
     c.Assert(observed.Containers[0].Metadata.Items[0].Name(), Equals, "metadata-name")
 }
 
+// TestCreateStorageService demonstrates that CreateHostedService is a
+// suitable container for the CreateHostedService XML tree that are required
+// for the Create Hosted Service API call.
+func (suite *xmlSuite) TestCreateHostedService(c *C) {
+    // From http://msdn.microsoft.com/en-us/library/windowsazure/gg441304.aspx
+    input := `
+        <?xml version="1.0" encoding="utf-8"?>
+        <CreateHostedService xmlns="http://schemas.microsoft.com/windowsazure">
+          <ServiceName>service-name</ServiceName>
+          <Label>base64-encoded-service-label</Label>
+          <Description>description</Description>
+          <Location>location</Location>
+          <AffinityGroup>affinity-group</AffinityGroup>
+          <ExtendedProperties>
+            <ExtendedProperty>
+              <Name>property-name</Name>
+              <Value>property-value</Value>
+            </ExtendedProperty>
+          </ExtendedProperties>
+        </CreateHostedService>
+        `
+    expected := &CreateHostedService{
+        XMLNS:         XMLNS,
+        ServiceName:   "service-name",
+        Label:         "base64-encoded-service-label",
+        Description:   "description",
+        Location:      "location",
+        AffinityGroup: "affinity-group",
+        ExtendedProperties: []ExtendedProperty{
+            {
+                Name:  "property-name",
+                Value: "property-value",
+            },
+        },
+    }
+    observed := &CreateHostedService{}
+    err := observed.Deserialize([]byte(input))
+    c.Assert(err, IsNil)
+    c.Assert(observed, DeepEquals, expected)
+}
+
 func (suite *xmlSuite) TestNewCreateHostedServiceWithLocation(c *C) {
     serviceName := "serviceName"
     label := "label"