From d891be61e68ac9ef679ebece95c62e416b1a04bf Mon Sep 17 00:00:00 2001
From: martianzhang <martianzhang@hotmail.com>
Date: Wed, 9 Jan 2019 17:29:03 +0800
Subject: [PATCH] polish code

---
 Makefile              | 4 ++--
 test/env.bats         | 4 ++--
 test/main.bats        | 2 +-
 test/test_helper.bash | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 95d88c8..ac06587 100644
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ release: build
 
 .PHONY: docker
 docker:
-	@echo "$(CGREEN)Build mysql test enviorment ...$(CEND)"
+	@echo "$(CGREEN)Build mysql test environment ...$(CEND)"
 	@docker stop soar-mysql 2>/dev/null || true
 	@docker wait soar-mysql 2>/dev/null >/dev/null || true
 	@echo "docker run --name soar-mysql $(MYSQL_RELEASE):$(MYSQL_VERSION)"
@@ -204,7 +204,7 @@ docker:
 			timeout=`expr $$timeout - 1`; \
 			printf '.' ;  sleep 1 ; \
 		else \
-			echo "." ; echo "mysql test enviorment is ready!" ; break ; \
+			echo "." ; echo "mysql test environment is ready!" ; break ; \
 		fi ; \
 		if [ $$timeout = 0 ] ; then \
 			echo "." ; echo "$(CRED)docker soar-mysql start timeout(180 s)!$(CEND)" ; exit 1 ; \
diff --git a/test/env.bats b/test/env.bats
index e385249..f14758e 100644
--- a/test/env.bats
+++ b/test/env.bats
@@ -4,13 +4,13 @@ load test_helper
 
 @test "Simple Query Optimizer" {
   ${SOAR_BIN_ENV} -query "select * from film where length > 120" | grep -v "散粒度" > ${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden
-  run golden_diff ${BATS_TEST_NAME}
+  run golden_diff
   [ $status -eq 0 ]
 }
 
 @test "Run all test cases" {
   ${SOAR_BIN} -list-test-sqls | ${SOAR_BIN_ENV} | grep -v "散粒度" > ${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden
-  run golden_diff ${BATS_TEST_NAME}
+  run golden_diff
   [ $status -eq 0 ]
 }
 
diff --git a/test/main.bats b/test/main.bats
index 6c5bbf5..38fbfd2 100644
--- a/test/main.bats
+++ b/test/main.bats
@@ -19,7 +19,7 @@ load test_helper
 
 @test "Run default printconfig cases" {
   ${SOAR_BIN} -print-config -log-output=/dev/null  > ${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden
-  run golden_diff ${BATS_TEST_NAME}
+  run golden_diff
   [ $status -eq 0 ]
 }
 
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 90e8624..c3db244 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -7,7 +7,7 @@ setup() {
   mkdir -p "${BATS_TMP_DIRNAME}"
 }
 
+# golden_diff like gofmt golden file check method, use this function check output different with template
 golden_diff() {
-  FUNC_NAME=$1
-  diff "${BATS_TMP_DIRNAME}/${FUNC_NAME}.golden" "${BATS_FIXTURE_DIRNAME}/${FUNC_NAME}.golden" >/dev/null
+  diff "${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden" "${BATS_FIXTURE_DIRNAME}/${BATS_TEST_NAME}.golden" >/dev/null
 }
-- 
GitLab