chore: fix unit tests after merging #1499 (#1558)

swaggo · Apr 17, 2023 · 45df9a3 · 45df9a3
1 parent acb0508
commit 45df9a3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/gen/gen.go b/gen/gen.go
@@ -510,7 +510,7 @@ func (g *Gen) writeGoDocV3(packageName string, output io.Writer, openAPI *v3.Ope
 	generator, err := template.New("oas3.tmpl").Funcs(template.FuncMap{
 		"printDoc": func(v string) string {
 			// Add schemes
-			v = "{\n    \"schemes\": {{ marshal .Schemes }}," + v[1:]
+			v = "{\n    \"schemes\": " + config.LeftTemplateDelim + " marshal .Schemes " + config.RightTemplateDelim + "," + v[1:]
 			// Sanitize backticks
 			return strings.Replace(v, "`", "`+\"`\"+`", -1)
 		},
@@ -524,9 +524,9 @@ func (g *Gen) writeGoDocV3(packageName string, output io.Writer, openAPI *v3.Ope
 		OpenAPI:    openAPI.OpenAPI,
 		Info: &v3.Extendable[v3.Info]{
 			Spec: &v3.Info{
-				Description:    "{{escape .Description}}",
-				Title:          "{{.Title}}",
-				Version:        "{{.Version}}",
+				Description:    config.LeftTemplateDelim + "escape .Description" + config.RightTemplateDelim,
+				Title:          config.LeftTemplateDelim + ".Title" + config.RightTemplateDelim,
+				Version:        config.LeftTemplateDelim + ".Version" + config.RightTemplateDelim,
 				TermsOfService: openAPI.Info.Spec.TermsOfService,
 				Contact:        openAPI.Info.Spec.Contact,
 				License:        openAPI.Info.Spec.License,

diff --git a/gen/gen_test.go b/gen/gen_test.go
@@ -284,7 +284,7 @@ func TestGen_BuildDocCustomDelims(t *testing.T) {
 		}
 	}
 
-	cmd := exec.Command("go", "build", "-buildmode=plugin", "github.com/swaggo/swag/testdata/delims")
+	cmd := exec.Command("go", "build", "-buildmode=plugin", "github.com/swaggo/swag/v2/testdata/delims")
 
 	cmd.Dir = config.SearchDir
 

diff --git a/gen/src/oas2.tmpl b/gen/src/oas2.tmpl
@@ -1,6 +1,6 @@
 // Code generated by swaggo/swag{{ if .GeneratedTime }} at {{ .Timestamp }}{{ end }}. DO NOT EDIT.
 
-package docs
+package {{.PackageName}}
 
 import "github.com/swaggo/swag/v2"
 
@@ -16,6 +16,8 @@ var SwaggerInfo{{ if ne .InstanceName "swagger" }}{{ .InstanceName }} {{- end }}
 	Description: {{ printf "%q" .Description}},
 	InfoInstanceName: {{ printf "%q" .InstanceName }},
 	SwaggerTemplate: docTemplate{{ if ne .InstanceName "swagger" }}{{ .InstanceName }} {{- end }},
+	LeftDelim:        {{ printf "%q" .LeftTemplateDelim}},
+    RightDelim:       {{ printf "%q" .RightTemplateDelim}},
 }
 
 func init() {

diff --git a/gen/src/oas3.tmpl b/gen/src/oas3.tmpl
@@ -1,6 +1,6 @@
-// Code generated by swaggo/swag{{ if .GeneratedTime }} at {{ .Timestamp }}{{ end }}. DO NOT EDIT
+// Code generated by swaggo/swag{{ if .GeneratedTime }} at {{ .Timestamp }}{{ end }}. DO NOT EDIT.
 
-package docs
+package {{.PackageName}}
 
 import "github.com/swaggo/swag/v2"
 
@@ -13,6 +13,8 @@ var SwaggerInfo{{ if ne .InstanceName "swagger" }}{{ .InstanceName }} {{- end }}
 	Description: {{ printf "%q" .Description}},
 	InfoInstanceName: {{ printf "%q" .InstanceName }},
 	SwaggerTemplate: docTemplate{{ if ne .InstanceName "swagger" }}{{ .InstanceName }} {{- end }},
+	LeftDelim:        {{ printf "%q" .LeftTemplateDelim}},
+    RightDelim:       {{ printf "%q" .RightTemplateDelim}},
 }
 
 func init() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/swaggo/swag
+module github.com/swaggo/swag/v2
 
 go 1.18
 

diff --git a/testdata/delims/main.go b/testdata/delims/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/swaggo/swag"
-	"github.com/swaggo/swag/testdata/delims/api"
-	_ "github.com/swaggo/swag/testdata/delims/docs"
+	"github.com/swaggo/swag/v2"
+	"github.com/swaggo/swag/v2/testdata/delims/api"
+	_ "github.com/swaggo/swag/v2/testdata/delims/docs"
 )
 
 func ReadDoc() string {