From 21644da9528f5c920a01d4b8178bfa4a8aa70868 Mon Sep 17 00:00:00 2001
From: Aaron Chen <462826@qq.com>
Date: Sat, 13 Jul 2019 09:28:46 +0800
Subject: [PATCH] format test script content

---
 .idea/misc.xml           |  6 ++++++
 .idea/modules.xml        |  8 ++++++++
 .idea/vcs.xml            |  7 +++++++
 .idea/zentaoatf.iml      |  8 ++++++++
 src/gen-project.go       |  6 +++---
 xdoc/sample/README       |  1 +
 xdoc/script-template.txt | 10 +++++++---
 xdoc/scripts/tc-100.php  | 13 ++++++++-----
 xdoc/scripts/tc-200.php  | 17 ++++++++++-------
 xdoc/scripts/tc-300.php  |  9 ++++++---
 xdoc/scripts/tc-400.php  |  9 ++++++---
 11 files changed, 70 insertions(+), 24 deletions(-)
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/zentaoatf.iml
 create mode 100644 xdoc/sample/README

diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..28a804d8
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..97516649
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/zentaoatf.iml" filepath="$PROJECT_DIR$/.idea/zentaoatf.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..ade06b67
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/golang.org/x/text" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/zentaoatf.iml b/.idea/zentaoatf.iml
new file mode 100644
index 00000000..c956989b
--- /dev/null
+++ b/.idea/zentaoatf.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/gen-project.go b/src/gen-project.go
index 91b93bee..b1550509 100644
--- a/src/gen-project.go
+++ b/src/gen-project.go
@@ -44,7 +44,7 @@ func DealwithTestCase(tc model.TestCase, langType string, independentExpect bool
 	}
 
 	template := utils.ReadFile("xdoc/script-template.txt")
-	content := string(fmt.Sprintf(string(template), langType, caseTitle, caseId,
+	content := string(fmt.Sprintf(string(template), langType, caseId, caseTitle,
 		strings.Join(steps, "\n"), expectsTxt, strings.Join(srcCode, "\n")))
 
 	fmt.Println(content)
@@ -100,7 +100,7 @@ func DealwithTestStep(ts model.TestStep, langType string, level int, stepWidth i
 		expectsLine := ""
 
 		expectsLine = "# \n"
-		expectsLine += "/* " + stepIdent + " 期望结果, 可以有多行 */\n"
+		expectsLine += "/* " + stepIdent + "期望结果, 可以有多行 */\n"
 
 		*expects = append(*expects, expectsLine)
 	}
@@ -115,7 +115,7 @@ func DealwithTestStep(ts model.TestStep, langType string, level int, stepWidth i
 			codeLine += `println("#")\n`
 		}
 
-		codeLine += "  // 开始" + stepIdent + " - " + stepExpect + "\n"
+		codeLine += "  // " + stepIdent + ": " + stepExpect + "\n"
 		codeLine += "/* 输出验证点实际结果 */\n"
 
 		*srcCode = append(*srcCode, codeLine)
diff --git a/xdoc/sample/README b/xdoc/sample/README
new file mode 100644
index 00000000..17498c84
--- /dev/null
+++ b/xdoc/sample/README
@@ -0,0 +1 @@
+TODO:
\ No newline at end of file
diff --git a/xdoc/script-template.txt b/xdoc/script-template.txt
index cb7cc15f..b2ea8849 100644
--- a/xdoc/script-template.txt
+++ b/xdoc/script-template.txt
@@ -1,12 +1,16 @@
 <?%s
 <<<TC
-title:    %s
-caseId:   %d
-steps:    @开头的为含验证点的步骤
+CaseId:   %d
+Title:    %s
+Steps:    @开头的为含验证点的步骤
 %s
 
 expects:
 %s
+readme:
+- 脚本输出日志和expects章节中，#号标注的验证点需保持一致对应
+- 具体自动化测试样例，请参考http://
+
 TC;
 
 /* 此处编写操作步骤代码 */
diff --git a/xdoc/scripts/tc-100.php b/xdoc/scripts/tc-100.php
index 2b075eff..11ddf2f2 100644
--- a/xdoc/scripts/tc-100.php
+++ b/xdoc/scripts/tc-100.php
@@ -1,21 +1,24 @@
 <?php
 <<<TC
-title:    用户登录
-caseId:   100
-steps:    @开头的为含验证点的步骤
+CaseId:   100
+Title:    用户登录
+Steps:    @开头的为含验证点的步骤
    step1000         打开登录页面
    step1010         输入正确的用户名和密码
    @step1020        点击'登录'按钮
 
 expects:
 # 
-/* @step1020 期望结果, 可以有多行 */
+/* @step1020期望结果, 可以有多行 */
+
+readme:
+1. 脚本输出日志和expects章节中，#号标注的验证点需保持一致对应
 
 TC;
 
 /* 此处编写操作步骤代码 */
 
-echo "#\n";  // 开始@step1020 - 用户成功登录
+echo "#\n";  // @step1020: 用户成功登录
 /* 输出验证点实际结果 */
 
 ?>
diff --git a/xdoc/scripts/tc-200.php b/xdoc/scripts/tc-200.php
index f3b4610c..2d6ae94a 100644
--- a/xdoc/scripts/tc-200.php
+++ b/xdoc/scripts/tc-200.php
@@ -1,8 +1,8 @@
 <?php
 <<<TC
-title:    登录失败账号锁定策略
-caseId:   200
-steps:    @开头的为含验证点的步骤
+CaseId:   200
+Title:    登录失败账号锁定策略
+Steps:    @开头的为含验证点的步骤
    step2000         连续输入3次错误的密码
    @step2010        第4次尝试登录
    group2100        不连续输入3次错误的密码
@@ -13,19 +13,22 @@ steps:    @开头的为含验证点的步骤
 
 expects:
 # 
-/* @step2010 期望结果, 可以有多行 */
+/* @step2010期望结果, 可以有多行 */
 
 # 
-/* @step2104 期望结果, 可以有多行 */
+/* @step2104期望结果, 可以有多行 */
+
+readme:
+1. 脚本输出日志和expects章节中，#号标注的验证点需保持一致对应
 
 TC;
 
 /* 此处编写操作步骤代码 */
 
-echo "#\n";  // 开始@step2010 - 系统提示账号被锁定
+echo "#\n";  // @step2010: 系统提示账号被锁定
 /* 输出验证点实际结果 */
 
-echo "#\n";  // 开始@step2104 - 登录成功，账号未被锁定
+echo "#\n";  // @step2104: 登录成功，账号未被锁定
 /* 输出验证点实际结果 */
 
 ?>
diff --git a/xdoc/scripts/tc-300.php b/xdoc/scripts/tc-300.php
index e8194fa5..8823c5fa 100644
--- a/xdoc/scripts/tc-300.php
+++ b/xdoc/scripts/tc-300.php
@@ -1,12 +1,15 @@
 <?php
 <<<TC
-title:    注册
-caseId:   300
-steps:    @开头的为含验证点的步骤
+CaseId:   300
+Title:    注册
+Steps:    @开头的为含验证点的步骤
 
 
 expects:
 
+readme:
+1. 脚本输出日志和expects章节中，#号标注的验证点需保持一致对应
+
 TC;
 
 /* 此处编写操作步骤代码 */
diff --git a/xdoc/scripts/tc-400.php b/xdoc/scripts/tc-400.php
index 27295fb4..7f259081 100644
--- a/xdoc/scripts/tc-400.php
+++ b/xdoc/scripts/tc-400.php
@@ -1,12 +1,15 @@
 <?php
 <<<TC
-title:    忘记密码
-caseId:   400
-steps:    @开头的为含验证点的步骤
+CaseId:   400
+Title:    忘记密码
+Steps:    @开头的为含验证点的步骤
 
 
 expects:
 
+readme:
+1. 脚本输出日志和expects章节中，#号标注的验证点需保持一致对应
+
 TC;
 
 /* 此处编写操作步骤代码 */
-- 
GitLab