Shorter methods names in system_tests

Author: ChunyiLyu

system_tests/system_tests.go

@@ -61,7 +61,7 @@ var _ = Describe("Operator", func() {
 			port = rabbitmqManagementNodePort(ctx, clientSet, cluster)
 
 			var err error
-			username, password, err = getRabbitmqUsernameAndPassword(ctx, cluster.Namespace, cluster.Name, clientSet)
+			username, password, err = getUsernameAndPassword(ctx, clientSet, cluster.Namespace, cluster.Name)
 			Expect(err).NotTo(HaveOccurred())
 			assertHttpReady(hostname, port)
 		})
@@ -72,7 +72,7 @@ var _ = Describe("Operator", func() {
 
 		It("works", func() {
 			By("being able to create a test queue and publish a message", func() {
-				response, err := rabbitmqAlivenessTest(hostname, port, username, password)
+				response, err := alivenessTest(hostname, port, username, password)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(response.Status).To(Equal("ok"))
 			})
@@ -245,7 +245,7 @@ CONSOLE_LOG=new`
 			port = rabbitmqManagementNodePort(ctx, clientSet, cluster)
 
 			var err error
-			username, password, err = getRabbitmqUsernameAndPassword(ctx, cluster.Namespace, cluster.Name, clientSet)
+			username, password, err = getUsernameAndPassword(ctx, clientSet, cluster.Namespace, cluster.Name)
 			Expect(err).NotTo(HaveOccurred())
 			assertHttpReady(hostname, port)
 		})
@@ -256,15 +256,15 @@ CONSOLE_LOG=new`
 
 		It("persists messages after pod deletion", func() {
 			By("publishing a message", func() {
-				err := rabbitmqPublishToNewQueue(hostname, port, username, password)
+				err := publishToQueue(hostname, port, username, password)
 				Expect(err).NotTo(HaveOccurred())
 			})
 
 			By("consuming a message after RabbitMQ was restarted", func() {
 				// We are asserting this in the BeforeEach. Is it necessary again here?
 				assertHttpReady(hostname, port)
 
-				message, err := rabbitmqGetMessageFromQueue(hostname, port, username, password)
+				message, err := getMessageFromQueue(hostname, port, username, password)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(message.Payload).To(Equal("hello"))
 			})
@@ -301,13 +301,13 @@ CONSOLE_LOG=new`
 			})
 
 			It("works", func() {
-				username, password, err := getRabbitmqUsernameAndPassword(ctx, cluster.Namespace, cluster.Name, clientSet)
+				username, password, err := getUsernameAndPassword(ctx, clientSet, cluster.Namespace, cluster.Name)
 				hostname := kubernetesNodeIp(ctx, clientSet)
 				port := rabbitmqManagementNodePort(ctx, clientSet, cluster)
 				Expect(err).NotTo(HaveOccurred())
 				assertHttpReady(hostname, port)
 
-				response, err := rabbitmqAlivenessTest(hostname, port, username, password)
+				response, err := alivenessTest(hostname, port, username, password)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(response.Status).To(Equal("ok"))
 			})
@@ -356,14 +356,14 @@ CONSOLE_LOG=new`
 
 			It("talks amqps with RabbitMQ", func() {
 				var err error
-				username, password, err = getRabbitmqUsernameAndPassword(ctx, "rabbitmq-system", "tls-test-rabbit", clientSet)
+				username, password, err = getUsernameAndPassword(ctx, clientSet, "rabbitmq-system", "tls-test-rabbit")
 				Expect(err).NotTo(HaveOccurred())
 
 				// try to publish and consume a message on a amqps url
 				sentMessage := "Hello Rabbitmq!"
-				Expect(rabbitmqAMQPSPublishToNewQueue(sentMessage, username, password, hostname, amqpsNodePort, caFilePath)).To(Succeed())
+				Expect(publishToQueueAMQPS(sentMessage, username, password, hostname, amqpsNodePort, caFilePath)).To(Succeed())
 
-				recievedMessage, err := rabbitmqAMQPSGetMessageFromQueue(username, password, hostname, amqpsNodePort, caFilePath)
+				recievedMessage, err := getMessageFromQueueAMQPS(username, password, hostname, amqpsNodePort, caFilePath)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(recievedMessage).To(Equal(sentMessage))
 			})

system_tests/utils.go

@@ -128,7 +128,7 @@ func makeRequest(url, httpMethod, rabbitmqUsername, rabbitmqPassword string, bod
 	return
 }
 
-func rabbitmqGetMessageFromQueue(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbitmqPassword string) (*Message, error) {
+func getMessageFromQueue(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbitmqPassword string) (*Message, error) {
 	getQueuesUrl := fmt.Sprintf("http://%s:%s/api/queues/%%2F/test-queue/get", rabbitmqHostName, rabbitmqPort)
 	data := map[string]interface{}{
 		"vhost":    "/",
@@ -162,7 +162,7 @@ type Message struct {
 	MessageCount int    `json:"message_count"`
 }
 
-func rabbitmqPublishToNewQueue(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbitmqPassword string) error {
+func publishToQueue(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbitmqPassword string) error {
 	url := fmt.Sprintf("http://%s:%s/api/queues/%%2F/test-queue", rabbitmqHostName, rabbitmqPort)
 	_, err := makeRequest(url, http.MethodPut, rabbitmqUsername, rabbitmqPassword, []byte("{\"durable\": true}"))
 
@@ -219,7 +219,7 @@ func connectAMQPS(username, password, hostname, port, caFilePath string) (conn *
 	return nil, err
 }
 
-func rabbitmqAMQPSPublishToNewQueue(message, username, password, hostname, amqpsPort, caFilePath string) error {
+func publishToQueueAMQPS(message, username, password, hostname, amqpsPort, caFilePath string) error {
 	// create connection
 	conn, err := connectAMQPS(username, password, hostname, amqpsPort, caFilePath)
 	if err != nil {
@@ -262,7 +262,7 @@ func rabbitmqAMQPSPublishToNewQueue(message, username, password, hostname, amqps
 	return nil
 }
 
-func rabbitmqAMQPSGetMessageFromQueue(username, password, hostname, amqpsPort, caFilePath string) (string, error) {
+func getMessageFromQueueAMQPS(username, password, hostname, amqpsPort, caFilePath string) (string, error) {
 	// create connection
 	conn, err := connectAMQPS(username, password, hostname, amqpsPort, caFilePath)
 	if err != nil {
@@ -312,7 +312,7 @@ func rabbitmqAMQPSGetMessageFromQueue(username, password, hostname, amqpsPort, c
 	return "", nil
 }
 
-func rabbitmqAlivenessTest(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbitmqPassword string) (*HealthcheckResponse, error) {
+func alivenessTest(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbitmqPassword string) (*HealthcheckResponse, error) {
 	client := &http.Client{Timeout: 10 * time.Second}
 	url := fmt.Sprintf("http://%s:%s/api/aliveness-test/%%2F", rabbitmqHostName, rabbitmqPort)
 
@@ -352,7 +352,7 @@ type HealthcheckResponse struct {
 	Status string `json:"status"`
 }
 
-func getRabbitmqUsernameAndPassword(ctx context.Context, namespace, instanceName string, clientset *kubernetes.Clientset) (string, string, error) {
+func getUsernameAndPassword(ctx context.Context, clientset *kubernetes.Clientset, namespace, instanceName string) (string, string, error) {
 	secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, fmt.Sprintf("%s-rabbitmq-admin", instanceName), metav1.GetOptions{})
 	if err != nil {
 		return "", "", err