fix test

goddenrich · May 15, 2024 · 28011fb · 28011fb
1 parent 19a9db9
commit 28011fb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 135 deletions.
diff --git a/smoke_tests/fixtures/requests.go b/smoke_tests/fixtures/requests.go
@@ -7,16 +7,6 @@ import (
 	"github.com/Admiral-Piett/goaws/app/models"
 )
 
-var CreateQueuesRequestBodyXML = struct {
-	Action    string `xml:"Action"`
-	Version   string `xml:"Version"`
-	QueueName string `xml:"QueueName"`
-}{
-	Action:    "CreateQueue",
-	Version:   "2012-11-05",
-	QueueName: "new-queue-1",
-}
-
 var ListQueuesRequestBodyXML = struct {
 	Action  string `xml:"Action"`
 	Version string `xml:"Version"`

diff --git a/smoke_tests/sqs_send_message_test.go b/smoke_tests/sqs_send_message_test.go
@@ -34,30 +34,10 @@ func Test_SendMessageV1_json_no_attributes(t *testing.T) {
 	targetQueueUrl := sdkResponse.QueueUrl
 
 	// Assert no messages in the queue before sending message
-	getQueueAttributesBodyXML := struct {
-		Action     string `xml:"Action"`
-		Version    string `xml:"Version"`
-		Attribute1 string `xml:"AttributeName.1"`
-		QueueUrl   string `xml:"QueueUrl"`
-	}{
-		Action:     "GetQueueAttributes",
-		Version:    "2012-11-05",
-		Attribute1: "All",
-		QueueUrl:   *targetQueueUrl,
-	}
-	e := httpexpect.Default(t, server.URL)
-	r := e.POST("/").
-		WithForm(getQueueAttributesBodyXML).
-		Expect().
-		Status(http.StatusOK).
-		Body().Raw()
-	r2 := app.GetQueueAttributesResponse{}
-	xml.Unmarshal([]byte(r), &r2)
-	for _, attr := range r2.Result.Attrs {
-		if attr.Name == "ApproximateNumberOfMessages" {
-			assert.Equal(t, "0", attr.Value)
-		}
-	}
+	getQueueAttributeOutput, _ := sqsClient.GetQueueAttributes(context.TODO(), &sqs.GetQueueAttributesInput{
+		QueueUrl: targetQueueUrl,
+	})
+	assert.Equal(t, "0", getQueueAttributeOutput.Attributes["ApproximateNumberOfMessages"])
 
 	// Target test: send a message
 	targetMessageBody := "Test_SendMessageV1_json_no_attributes"
@@ -68,18 +48,10 @@ func Test_SendMessageV1_json_no_attributes(t *testing.T) {
 	assert.NotNil(t, sendMessageOutput.MessageId)
 
 	// Assert 1 message in the queue
-	r = e.POST("/").
-		WithForm(getQueueAttributesBodyXML).
-		Expect().
-		Status(http.StatusOK).
-		Body().Raw()
-	r2 = app.GetQueueAttributesResponse{}
-	xml.Unmarshal([]byte(r), &r2)
-	for _, attr := range r2.Result.Attrs {
-		if attr.Name == "ApproximateNumberOfMessages" {
-			assert.Equal(t, "1", attr.Value)
-		}
-	}
+	getQueueAttributeOutput, _ = sqsClient.GetQueueAttributes(context.TODO(), &sqs.GetQueueAttributesInput{
+		QueueUrl: targetQueueUrl,
+	})
+	assert.Equal(t, "1", getQueueAttributeOutput.Attributes["ApproximateNumberOfMessages"])
 }
 
 func Test_SendMessageV1_json_with_attributes(t *testing.T) {
@@ -120,30 +92,10 @@ func Test_SendMessageV1_json_with_attributes(t *testing.T) {
 	assert.NotNil(t, sendMessageOutput.MessageId)
 
 	// Assert 1 message in the queue
-	getQueueAttributesBodyXML := struct {
-		Action     string `xml:"Action"`
-		Version    string `xml:"Version"`
-		Attribute1 string `xml:"AttributeName.1"`
-		QueueUrl   string `xml:"QueueUrl"`
-	}{
-		Action:     "GetQueueAttributes",
-		Version:    "2012-11-05",
-		Attribute1: "All",
-		QueueUrl:   *targetQueueUrl,
-	}
-	e := httpexpect.Default(t, server.URL)
-	r := e.POST("/").
-		WithForm(getQueueAttributesBodyXML).
-		Expect().
-		Status(http.StatusOK).
-		Body().Raw()
-	r2 := app.GetQueueAttributesResponse{}
-	xml.Unmarshal([]byte(r), &r2)
-	for _, attr := range r2.Result.Attrs {
-		if attr.Name == "ApproximateNumberOfMessages" {
-			assert.Equal(t, "1", attr.Value)
-		}
-	}
+	getQueueAttributeOutput, _ := sqsClient.GetQueueAttributes(context.TODO(), &sqs.GetQueueAttributesInput{
+		QueueUrl: targetQueueUrl,
+	})
+	assert.Equal(t, "1", getQueueAttributeOutput.Attributes["ApproximateNumberOfMessages"])
 
 	// Receive message and check attribute
 	receiveMessageBodyXML := struct {
@@ -156,7 +108,8 @@ func Test_SendMessageV1_json_with_attributes(t *testing.T) {
 		Version:  "2012-11-05",
 		QueueUrl: *targetQueueUrl,
 	}
-	r = e.POST("/").
+	e := httpexpect.Default(t, server.URL)
+	r := e.POST("/").
 		WithForm(receiveMessageBodyXML).
 		Expect().
 		Status(http.StatusOK).
@@ -236,30 +189,10 @@ func Test_SendMessageV1_xml_no_attributes(t *testing.T) {
 	targetQueueUrl := sdkResponse.QueueUrl
 
 	// Assert no messages in the queue before sending message
-	getQueueAttributesBodyXML := struct {
-		Action     string `xml:"Action"`
-		Version    string `xml:"Version"`
-		Attribute1 string `xml:"AttributeName.1"`
-		QueueUrl   string `xml:"QueueUrl"`
-	}{
-		Action:     "GetQueueAttributes",
-		Version:    "2012-11-05",
-		Attribute1: "All",
-		QueueUrl:   *targetQueueUrl,
-	}
-	e := httpexpect.Default(t, server.URL)
-	r := e.POST("/").
-		WithForm(getQueueAttributesBodyXML).
-		Expect().
-		Status(http.StatusOK).
-		Body().Raw()
-	r2 := app.GetQueueAttributesResponse{}
-	xml.Unmarshal([]byte(r), &r2)
-	for _, attr := range r2.Result.Attrs {
-		if attr.Name == "ApproximateNumberOfMessages" {
-			assert.Equal(t, "0", attr.Value)
-		}
-	}
+	getQueueAttributeOutput, _ := sqsClient.GetQueueAttributes(context.TODO(), &sqs.GetQueueAttributesInput{
+		QueueUrl: targetQueueUrl,
+	})
+	assert.Equal(t, "0", getQueueAttributeOutput.Attributes["ApproximateNumberOfMessages"])
 
 	// Target test: send a message
 	sendMessageXML := struct {
@@ -273,8 +206,8 @@ func Test_SendMessageV1_xml_no_attributes(t *testing.T) {
 		QueueUrl:    *targetQueueUrl,
 		MessageBody: "Test Message",
 	}
-	e = httpexpect.Default(t, server.URL)
-	r = e.POST("/").
+	e := httpexpect.Default(t, server.URL)
+	r := e.POST("/").
 		WithForm(sendMessageXML).
 		Expect().
 		Status(http.StatusOK).
@@ -284,18 +217,10 @@ func Test_SendMessageV1_xml_no_attributes(t *testing.T) {
 	assert.NotNil(t, r3.MessageId)
 
 	// Assert 1 message in the queue
-	r = e.POST("/").
-		WithForm(getQueueAttributesBodyXML).
-		Expect().
-		Status(http.StatusOK).
-		Body().Raw()
-	r2 = app.GetQueueAttributesResponse{}
-	xml.Unmarshal([]byte(r), &r2)
-	for _, attr := range r2.Result.Attrs {
-		if attr.Name == "ApproximateNumberOfMessages" {
-			assert.Equal(t, "1", attr.Value)
-		}
-	}
+	getQueueAttributeOutput, _ = sqsClient.GetQueueAttributes(context.TODO(), &sqs.GetQueueAttributesInput{
+		QueueUrl: targetQueueUrl,
+	})
+	assert.Equal(t, "1", getQueueAttributeOutput.Attributes["ApproximateNumberOfMessages"])
 }
 
 func Test_SendMessageV1_xml_with_attributes(t *testing.T) {
@@ -314,30 +239,10 @@ func Test_SendMessageV1_xml_with_attributes(t *testing.T) {
 	targetQueueUrl := sdkResponse.QueueUrl
 
 	// Assert no messages in the queue before sending message
-	getQueueAttributesBodyXML := struct {
-		Action     string `xml:"Action"`
-		Version    string `xml:"Version"`
-		Attribute1 string `xml:"AttributeName.1"`
-		QueueUrl   string `xml:"QueueUrl"`
-	}{
-		Action:     "GetQueueAttributes",
-		Version:    "2012-11-05",
-		Attribute1: "All",
-		QueueUrl:   *targetQueueUrl,
-	}
-	e := httpexpect.Default(t, server.URL)
-	r := e.POST("/").
-		WithForm(getQueueAttributesBodyXML).
-		Expect().
-		Status(http.StatusOK).
-		Body().Raw()
-	r2 := app.GetQueueAttributesResponse{}
-	xml.Unmarshal([]byte(r), &r2)
-	for _, attr := range r2.Result.Attrs {
-		if attr.Name == "ApproximateNumberOfMessages" {
-			assert.Equal(t, "0", attr.Value)
-		}
-	}
+	getQueueAttributeOutput, _ := sqsClient.GetQueueAttributes(context.TODO(), &sqs.GetQueueAttributesInput{
+		QueueUrl: targetQueueUrl,
+	})
+	assert.Equal(t, "0", getQueueAttributeOutput.Attributes["ApproximateNumberOfMessages"])
 
 	// Target test: send a message
 	sendMessageXML := struct {
@@ -351,8 +256,8 @@ func Test_SendMessageV1_xml_with_attributes(t *testing.T) {
 		QueueUrl:    *targetQueueUrl,
 		MessageBody: "Test Message",
 	}
-	e = httpexpect.Default(t, server.URL)
-	r = e.POST("/").
+	e := httpexpect.Default(t, server.URL)
+	r := e.POST("/").
 		WithForm(sendMessageXML).
 		WithFormField("MessageAttribute.1.Name", "Attr1").
 		WithFormField("MessageAttribute.1.Value.DataType", "String").