Added test case for XML mode

Author: vnalawad-tibco

Diff for: activity/soapclient/activity.go

@@ -33,10 +33,10 @@ func New(ctx activity.InitContext) (activity.Activity, error) {
 		return nil, err
 	}
 
-	if s.UseXMLPassThru == false {
+	if s.XMLMode == false {
 		// Set attribure prefix for JSON to XML and XML to JSON conversion
 		// e.g If the prefix is set to '@', <car electric="true">Tesla</car> will be converted to {"car": {"@electric": "true", "#text": "Tesla"}}
-		mxj.SetAttrPrefix(s.AttributePrefix)
+		mxj.SetAttrPrefix(s.XMLAttributePrefix)
 	}
 
 	clientPool := updater_http.NewClientPool()
@@ -90,7 +90,7 @@ func New(ctx activity.InitContext) (activity.Activity, error) {
 	httpAdapter := soap_http.NewClientAdapter(soap_http.ClientPool(clientPool), soap_http.Timeout(time.Duration(s.Timeout)*time.Second))
 	act := &Activity{settings: s}
 	act.clientAdapter = httpAdapter
-	act.xmlPassThroughMode = s.UseXMLPassThru
+	act.xmlPassThroughMode = s.XMLMode
 
 	return act, nil
 }

Diff for: activity/soapclient/activity_test.go

@@ -1,6 +1,7 @@
 package soapclient
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/project-flogo/core/activity"
@@ -25,7 +26,7 @@ func TestSettings(t *testing.T) {
 }
 
 func TestSOAPClientActivity(t *testing.T) {
-	settings := &Settings{SoapServiceEndpoint: "https://www.dataaccess.com/webservicesserver/NumberConversion.wso", SoapVersion: "1.1", AttributePrefix: "@"}
+	settings := &Settings{SoapServiceEndpoint: "https://www.dataaccess.com/webservicesserver/NumberConversion.wso", SoapVersion: "1.1", XMLAttributePrefix: "@"}
 	iCtx := test.NewActivityInitContext(settings, nil)
 	act, _ := New(iCtx)
 	tc := test.NewActivityContext(act.Metadata())
@@ -51,7 +52,7 @@ func TestSOAPClientActivity(t *testing.T) {
 }
 
 func TestSOAPClientActivityFault(t *testing.T) {
-	settings := &Settings{SoapServiceEndpoint: "http://www.dneonline.com/calculator.asmx", SoapVersion: "1.1", AttributePrefix: "@"}
+	settings := &Settings{SoapServiceEndpoint: "http://www.dneonline.com/calculator.asmx", SoapVersion: "1.1", XMLAttributePrefix: "@"}
 	iCtx := test.NewActivityInitContext(settings, nil)
 	act, _ := New(iCtx)
 	tc := test.NewActivityContext(act.Metadata())
@@ -71,3 +72,52 @@ func TestSOAPClientActivityFault(t *testing.T) {
 	assert.True(t, output.IsFault)
 	assert.NotNil(t, output.SOAPResponseFault)
 }
+
+func TestSOAPClientActivityHttpQueryParams(t *testing.T) {
+	settings := &Settings{SoapServiceEndpoint: "https://www.crcind.com/csp/samples/SOAP.Demo.cls", SoapVersion: "1.1"}
+	iCtx := test.NewActivityInitContext(settings, nil)
+	act, _ := New(iCtx)
+	tc := test.NewActivityContext(act.Metadata())
+
+	//setup attrs
+	input := &Input{HttpQueryParams: map[string]string{"soap_method": "AddInteger", "Arg1": "20", "Arg2": "30"}}
+	tc.SetInputObject(input)
+
+	done, err := act.Eval(tc)
+	assert.Nil(t, err)
+	assert.True(t, done)
+
+	output := &Output{}
+	tc.GetOutputObject(output)
+	assert.NotNil(t, output)
+	assert.Equal(t, 200, output.HttpStatus)
+	assert.False(t, output.IsFault)
+	assert.NotNil(t, output.SOAPResponsePayload)
+	res, err1 := coerce.ToObject(output.SOAPResponsePayload)
+	assert.Nil(t, err1)
+	resObj := res["AddIntegerResponse"].(map[string]interface{})
+	assert.Equal(t, "50", resObj["AddIntegerResult"])
+}
+
+func TestSOAPClientActivityXMLMode(t *testing.T) {
+	settings := &Settings{SoapServiceEndpoint: "https://www.dataaccess.com/webservicesserver/NumberConversion.wso", SoapVersion: "1.1", XMLMode: true}
+	iCtx := test.NewActivityInitContext(settings, nil)
+	act, _ := New(iCtx)
+	tc := test.NewActivityContext(act.Metadata())
+
+	//setup attrs
+	input := &Input{SoapAction: "NumberToWords", SOAPRequestBody: `<NumberToWords xmlns="http://www.dataaccess.com/webservicesserver/"><ubiNum>100</ubiNum></NumberToWords>`}
+	tc.SetInputObject(input)
+	done, err := act.Eval(tc)
+	assert.Nil(t, err)
+	assert.True(t, done)
+
+	output := &Output{}
+	tc.GetOutputObject(output)
+	assert.NotNil(t, output)
+	assert.Equal(t, 200, output.HttpStatus)
+	assert.False(t, output.IsFault)
+	assert.NotNil(t, output.SOAPResponsePayload)
+	res := strings.Join(strings.Fields(output.SOAPResponsePayload.(string)), " ")
+	assert.Equal(t, `<m:NumberToWordsResponse xmlns:m="http://www.dataaccess.com/webservicesserver/"> <m:NumberToWordsResult>one hundred </m:NumberToWordsResult> </m:NumberToWordsResponse>`, res)
+}

Diff for: activity/soapclient/descriptor.json

@@ -33,18 +33,18 @@
       }
     },
     {
-      "name": "xmlPassthroughMode",
+      "name": "xmlMode",
       "type": "boolean",
       "description": "When enabled, you must configure input body and headers as XML string. The output will be in XML string format. When disabled, the input and output will be processed as JSON. You can configure JSON schema equivalent of XML data for input and output. This activity will convert JSON to XML behind the scene.",
       "value": false,
       "display": {
-        "name": "Use XML Passthrough Mode"
+        "name": "XML Mode"
       }
     },
     {
-      "name": "attributePrefix",
+      "name": "xmlAttributePrefix",
       "type": "string",
-      "description": "Attribute prefix for JSON to XML conversion. Default is '-'. This is only used when XML Passthrough mode is disabled.",
+      "description": "Attribute prefix for JSON to XML conversion. Default is '-'. This is only used when XML mode is disabled.",
       "value": "-",
       "display": {
         "name": "XML Attribute Prefix"

Diff for: activity/soapclient/metadata.go

@@ -7,8 +7,8 @@ type Settings struct {
 	SoapVersion         string `md:"soapVersion"`                  // The address of the proxy server to be use
 	Timeout             int    `md:"timeout"`                      // The request timeout in seconds
 	EnableTLS           bool   `md:"enableTLS"`                    // Skip SSL validation
-	AttributePrefix     string `md:"attributePrefix"`              // The prefix to use for attributes
-	UseXMLPassThru      bool   `md:"xmlPassthroughMode"`           // Use XML pass-thru
+	XMLAttributePrefix  string `md:"xmlAttributePrefix"`           // The prefix to use for XML attributes while converting XML to JSON
+	XMLMode             bool   `md:"xmlMode"`                      // Configure direct XML input/output
 	ServerCertificate   string `md:"serverCertificate"`            // The server certificate
 	ClientCertificate   string `md:"clientCertificate"`            // The client certificate
 	ClientKey           string `md:"clientKey"`                    // The client key