test: update unit tests for ,chardata XML unmarshalling change

Author: rsdmike

pkg/wsman/amt/tls/credentialcontext.go

@@ -132,6 +132,7 @@ func (credentialContext CredentialContext) Create(certHandle string) (response R
 	if err != nil {
 		return
 	}
+
 	// put the xml response into the go struct
 	err = xml.Unmarshal([]byte(response.XMLOutput), &response)
 	if err != nil {

pkg/wsman/amt/tls/credentialcontext_test.go

@@ -7,6 +7,7 @@ package tls
 
 import (
 	"encoding/xml"
+	"strings"
 
 	"github.com/device-management-toolkit/go-wsman-messages/v2/internal/message"
 	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/client"
@@ -102,6 +103,18 @@ type (
 	}
 )
 
+// UnmarshalXML trims insignificant whitespace in SelectorResponse.Text while decoding.
+func (s *SelectorResponse) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	type Alias SelectorResponse
+	var aux Alias
+	if err := d.DecodeElement(&aux, &start); err != nil {
+		return err
+	}
+	aux.Text = strings.TrimSpace(aux.Text)
+	*s = SelectorResponse(aux)
+	return nil
+}
+
 type (
 	SettingDataRequest struct {
 		XMLName                       xml.Name `xml:"h:AMT_TLSSettingData"`

pkg/wsman/amt/tls/types.go

@@ -78,7 +78,7 @@ func TestPositiveIPS_HTTPProxyService(t *testing.T) {
 							XMLName: xml.Name{Space: fmt.Sprintf("%s%s", message.IPSSchema, IPSHTTPProxyService), Local: "ProxyAccessPoint"},
 							Address: "http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous",
 							ReferenceParameters: models.ReferenceParameters_OUTPUT{
-								ResourceURI: "\n                        http://intel.com/wbem/wscim/1/ips-schema/1/IPS_HTTPProxyAccessPoint",
+								ResourceURI: "http://intel.com/wbem/wscim/1/ips-schema/1/IPS_HTTPProxyAccessPoint",
 								SelectorSet: models.SelectorSet_OUTPUT{
 									XMLName: xml.Name{Space: "http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd", Local: "SelectorSet"},
 									Selector: []message.Selector_OUTPUT{

pkg/wsman/ips/http/service_test.go

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<a:Envelope
-	xmlns:a="http://www.w3.org/2003/05/soap-envelope"
+<a:Envelope xmlns:a="http://www.w3.org/2003/05/soap-envelope"
 	xmlns:b="http://schemas.xmlsoap.org/ws/2004/08/addressing"
 	xmlns:c="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"
 	xmlns:d="http://schemas.xmlsoap.org/ws/2005/02/trust"

pkg/wsman/wsmantesting/responses/amt/tls/credentialcontext/create.xml

@@ -15,20 +15,18 @@
                     <h:ElementInContext>
                         <b:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</b:Address>
                         <b:ReferenceParameters>
-                            <c:ResourceURI>
-                                http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</c:ResourceURI>
+                            <c:ResourceURI>http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</c:ResourceURI>
                             <c:SelectorSet>
-                                <c:Selector Name= "InstanceID">Intel(r) AMT Certificate: Handle: 3</c:Selector>
+                                <c:Selector Name="InstanceID">Intel(r) AMT Certificate: Handle: 3</c:Selector>
                             </c:SelectorSet>
                         </b:ReferenceParameters>
                     </h:ElementInContext>
                     <h:ElementProvidingContext>
                         <b:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</b:Address>
                         <b:ReferenceParameters>
-                            <c:ResourceURI>
-                                http://intel.com/wbem/wscim/1/amt-schema/1/AMT_TLSProtocolEndpointCollection</c:ResourceURI>
+                            <c:ResourceURI>http://intel.com/wbem/wscim/1/amt-schema/1/AMT_TLSProtocolEndpointCollection</c:ResourceURI>
                             <c:SelectorSet>
-                                <c:Selector Name= "ElementName">TLSProtocolEndpoint Instances Collection</c:Selector>
+                                <c:Selector Name="ElementName">TLSProtocolEndpoint Instances Collection</c:Selector>
                             </c:SelectorSet>
                         </b:ReferenceParameters>
                     </h:ElementProvidingContext>

pkg/wsman/wsmantesting/responses/amt/tls/credentialcontext/pull.xml

@@ -20,8 +20,7 @@
             <g:ProxyAccessPoint>
                 <b:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</b:Address>
                 <b:ReferenceParameters>
-                    <c:ResourceURI>
-                        http://intel.com/wbem/wscim/1/ips-schema/1/IPS_HTTPProxyAccessPoint</c:ResourceURI>
+                    <c:ResourceURI>http://intel.com/wbem/wscim/1/ips-schema/1/IPS_HTTPProxyAccessPoint</c:ResourceURI>
                     <c:SelectorSet>
                         <c:Selector Name="CreationClassName">IPS_HTTPProxyAccessPoint</c:Selector>
                         <c:Selector Name="Name">Intel(r) ME:HTTP Proxy Access Point 3</c:Selector>