[KOGITO-1245] Corrected repetitive post calls if failing (apache#183)

Author: radtriste

bddframework/framework/http.go

@@ -18,23 +18,24 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"strings"
 	"time"
 )
 
 // WaitForSuccessfulHTTPRequest waits for an HTTP request to be successful
-func WaitForSuccessfulHTTPRequest(namespace, httpMethod, uri, path, bodyFormat string, body io.Reader, timeoutInMin int) error {
+func WaitForSuccessfulHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, bodyContent string, timeoutInMin int) error {
 	return WaitFor(namespace, fmt.Sprintf("HTTP %s request on path '%s' to be successful", httpMethod, path), time.Duration(timeoutInMin)*time.Minute, func() (bool, error) {
-		return IsHTTPRequestSuccessful(namespace, httpMethod, uri, path, bodyFormat, body)
+		return IsHTTPRequestSuccessful(namespace, httpMethod, uri, path, bodyFormat, bodyContent)
 	})
 }
 
 // ExecuteHTTPRequest executes an HTTP request
-func ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat string, body io.Reader) (*http.Response, error) {
-	request, err := http.NewRequest(httpMethod, uri+"/"+path, body)
-	if body != nil && len(bodyFormat) > 0 {
+func ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, bodyContent string) (*http.Response, error) {
+	GetLogger(namespace).Debugf("ExecuteHTTPRequest %s on uri %s, with path %s, %s bodyContent %s", httpMethod, uri, path, bodyFormat, bodyContent)
+
+	request, err := http.NewRequest(httpMethod, uri+"/"+path, strings.NewReader(bodyContent))
+	if len(bodyContent) > 0 && len(bodyFormat) > 0 {
 		switch bodyFormat {
 		case "json":
 			request.Header.Add("Content-Type", "application/json")
@@ -54,8 +55,8 @@ func ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat string, bod
 }
 
 // IsHTTPRequestSuccessful makes and checks whether an http request is successful
-func IsHTTPRequestSuccessful(namespace, httpMethod, uri, path, bodyFormat string, body io.Reader) (bool, error) {
-	response, err := ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, body)
+func IsHTTPRequestSuccessful(namespace, httpMethod, uri, path, bodyFormat, bodyContent string) (bool, error) {
+	response, err := ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, bodyContent)
 	if err != nil {
 		return false, err
 	}
@@ -73,8 +74,8 @@ func CheckHTTPResponseSuccessful(namespace string, response *http.Response) bool
 }
 
 // IsHTTPResponseArraySize makes and checks whether an http request returns an array of a specific size
-func IsHTTPResponseArraySize(namespace, httpMethod, uri, path string, bodyFormat string, body io.Reader, arraySize int) (bool, error) {
-	response, err := ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, body)
+func IsHTTPResponseArraySize(namespace, httpMethod, uri, path string, bodyFormat, bodyContent string, arraySize int) (bool, error) {
+	response, err := ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, bodyContent)
 	if err != nil {
 		return false, err
 	}
@@ -96,8 +97,8 @@ func IsHTTPResponseArraySize(namespace, httpMethod, uri, path string, bodyFormat
 }
 
 // DoesHTTPResponseContain checks whether the response of an http request contains a certain string
-func DoesHTTPResponseContain(namespace, httpMethod, uri, path string, bodyFormat string, body io.Reader, responseContent string) (bool, error) {
-	response, err := ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, body)
+func DoesHTTPResponseContain(namespace, httpMethod, uri, path string, bodyFormat, bodyContent string, responseContent string) (bool, error) {
+	response, err := ExecuteHTTPRequest(namespace, httpMethod, uri, path, bodyFormat, bodyContent)
 	if err != nil {
 		return false, err
 	}

bddframework/steps/http.go

@@ -16,7 +16,6 @@ package steps
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/cucumber/godog"
@@ -38,7 +37,7 @@ func (data *Data) httpGetRequestOnServiceWithPathIsSuccessfulWithinMinutes(servi
 	if err != nil {
 		return err
 	}
-	return framework.WaitForSuccessfulHTTPRequest(data.Namespace, "GET", routeURI, path, "", nil, timeoutInMin)
+	return framework.WaitForSuccessfulHTTPRequest(data.Namespace, "GET", routeURI, path, "", "", timeoutInMin)
 }
 
 func (data *Data) httpPostRequestOnServiceWithPathAndBody(serviceName, path string, body *gherkin.DocString) error {
@@ -47,7 +46,7 @@ func (data *Data) httpPostRequestOnServiceWithPathAndBody(serviceName, path stri
 	if err != nil {
 		return err
 	}
-	if success, err := framework.IsHTTPRequestSuccessful(data.Namespace, "POST", routeURI, path, body.ContentType, strings.NewReader(body.Content)); err != nil {
+	if success, err := framework.IsHTTPRequestSuccessful(data.Namespace, "POST", routeURI, path, body.ContentType, body.Content); err != nil {
 		return err
 	} else if !success {
 		return fmt.Errorf("HTTP POST request to path %s was not successful", path)
@@ -61,7 +60,7 @@ func (data *Data) httpPostRequestOnServiceIsSuccessfulWithinMinutesWithPathAndBo
 	if err != nil {
 		return err
 	}
-	return framework.WaitForSuccessfulHTTPRequest(data.Namespace, "POST", routeURI, path, body.ContentType, strings.NewReader(body.Content), timeoutInMin)
+	return framework.WaitForSuccessfulHTTPRequest(data.Namespace, "POST", routeURI, path, body.ContentType, body.Content, timeoutInMin)
 }
 
 func (data *Data) httpGetRequestOnServiceWithPathShouldReturnAnArrayofSizeWithinMinutes(serviceName, path string, size, timeoutInMin int) error {
@@ -70,7 +69,7 @@ func (data *Data) httpGetRequestOnServiceWithPathShouldReturnAnArrayofSizeWithin
 		return err
 	}
 	return framework.WaitFor(data.Namespace, fmt.Sprintf("GET request on path %s to return array of size %d", path, size), time.Duration(timeoutInMin)*time.Minute, func() (bool, error) {
-		return framework.IsHTTPResponseArraySize(data.Namespace, "GET", routeURI, path, "", nil, size)
+		return framework.IsHTTPResponseArraySize(data.Namespace, "GET", routeURI, path, "", "", size)
 	})
 }
 
@@ -81,6 +80,6 @@ func (data *Data) httpGetRequestOnServiceWithPathShouldContainAstringWithinMinut
 	}
 
 	return framework.WaitFor(data.Namespace, fmt.Sprintf("GET request on path %s to return response content '%s'", path, responseContent), time.Duration(timeoutInMin)*time.Minute, func() (bool, error) {
-		return framework.DoesHTTPResponseContain(data.Namespace, "GET", routeURI, path, "", nil, responseContent)
+		return framework.DoesHTTPResponseContain(data.Namespace, "GET", routeURI, path, "", "", responseContent)
 	})
 }