From 0a73f17e2b1945fdb255cc91b408576693b08fdd Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Mon, 27 Jun 2022 21:28:09 +0800
Subject: [PATCH] fix: convert postman to pytest

---
 hrp/internal/builtin/utils.go     |  4 ++--
 hrp/internal/convert/converter.go | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hrp/internal/builtin/utils.go b/hrp/internal/builtin/utils.go
index bdc40938..3b3a62b6 100644
--- a/hrp/internal/builtin/utils.go
+++ b/hrp/internal/builtin/utils.go
@@ -450,8 +450,8 @@ func ReadFile(path string) ([]byte, error) {
 	return file, nil
 }
 
-func GetOutputNameWithoutExtension(path string) string {
+func GetFileNameWithoutExtension(path string) string {
 	base := filepath.Base(path)
 	ext := filepath.Ext(base)
-	return base[0:len(base)-len(ext)] + "_test"
+	return base[0 : len(base)-len(ext)]
 }
diff --git a/hrp/internal/convert/converter.go b/hrp/internal/convert/converter.go
index be5d77de..dd3f22b7 100644
--- a/hrp/internal/convert/converter.go
+++ b/hrp/internal/convert/converter.go
@@ -168,7 +168,7 @@ type TCaseConverter struct {
 }
 
 func (c *TCaseConverter) genOutputPath(suffix string) string {
-	outFileFullName := builtin.GetOutputNameWithoutExtension(c.SourcePath) + suffix
+	outFileFullName := builtin.GetFileNameWithoutExtension(c.SourcePath) + "_test" + suffix
 	if c.OutputDir != "" {
 		return filepath.Join(c.OutputDir, outFileFullName)
 	} else {
@@ -179,8 +179,13 @@ func (c *TCaseConverter) genOutputPath(suffix string) string {
 
 // convert TCase to pytest case
 func (c *TCaseConverter) ToPyTest() (string, error) {
-	args := append([]string{"make"}, c.SourcePath)
-	err := builtin.ExecPython3Command("httprunner", args...)
+	jsonPath, err := c.ToJSON()
+	if err != nil {
+		return "", errors.Wrap(err, "convert to JSON case failed")
+	}
+
+	args := append([]string{"make"}, jsonPath)
+	err = builtin.ExecPython3Command("httprunner", args...)
 	if err != nil {
 		return "", err
 	}