From 7a17d3dc55afdedf4b0ca6ab39fa05c9eb3102b6 Mon Sep 17 00:00:00 2001
From: Beppe Catanese <1771700+gcatanese@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:05:42 +0100
Subject: [PATCH] Correct import, add test (#13905)

---
 .../src/main/resources/go/api_test.mustache   |  2 +-
 .../codegen/go/GoClientCodegenTest.java       | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/go/api_test.mustache b/modules/openapi-generator/src/main/resources/go/api_test.mustache
index 0bbbbf757b8..b62cacca027 100644
--- a/modules/openapi-generator/src/main/resources/go/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/go/api_test.mustache
@@ -16,7 +16,7 @@ import (
     "github.com/stretchr/testify/assert"
     "github.com/stretchr/testify/require"
     "testing"
-    {{goImportAlias}} "./openapi"
+    {{goImportAlias}} "{{gitHost}}/{{gitUserId}}/{{gitRepoId}}{{#isGoSubmodule}}/{{packageName}}{{/isGoSubmodule}}"
 )
 
 func Test_{{packageName}}_{{classname}}Service(t *testing.T) {
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java
index b55967fdaf9..55706dc106e 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java
@@ -222,6 +222,27 @@ public class GoClientCodegenTest {
                 "func Test_openapi_PetApiService(t *testing.T) {");
     }
 
+    @Test
+    public void verifyTestImport() throws IOException {
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("go")
+                .setGitUserId("OpenAPITools")
+                .setGitRepoId("openapi-generator")
+                .setInputSpec("src/test/resources/3_0/petstore.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(configurator.toClientOptInput()).generate();
+        files.forEach(File::deleteOnExit);
+
+        TestUtils.assertFileExists(Paths.get(output + "/test/api_pet_test.go"));
+        TestUtils.assertFileContains(Paths.get(output + "/test/api_pet_test.go"),
+                "openapiclient \"github.com/OpenAPITools/openapi-generator\"");
+    }
+
     @Test
     public void verifyFormatErrorMessageInUse() throws IOException {
         File output = Files.createTempDirectory("test").toFile();