[Lua] Improve auto-generated test files (#7568)

* move lua spec folder, remove extra endline

* remove extra line

* remove duplicated import

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/LuaClientCodegen.java

@@ -285,12 +285,12 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String apiTestFileFolder() {
-        return outputFolder + File.separator + apiPackage + File.separator + specFolder.replace("/", File.separator);
+        return outputFolder + File.separator + specFolder.replace("/", File.separator);
     }
 
     @Override
     public String modelTestFileFolder() {
-        return outputFolder + File.separator + modelPackage + File.separator + specFolder.replace("/", File.separator);
+        return outputFolder + File.separator + specFolder.replace("/", File.separator);
     }
 
     @Override

modules/swagger-codegen/src/main/resources/lua/api_test.mustache

@@ -1,15 +1,4 @@
---[[
 {{> partial_header}}
-]]
-
-local petstore_{{classname}} = require "{{packageName}}.api.{{{classname}}}"
-{{#models}}
-[[-- import all models --]]
-{{#model}}
-local {{packageName}}_{{{classname}}} = require "{{packageName}}.model.{{{classname}}}"
-{{/model}}
-{{/models}}
-
 --[[
 Unit tests for {{{packageName}}}.api.{{{classname}}}
 Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
@@ -17,9 +6,16 @@ Please update as you see appropriate
 ]]
 {{#operations}}
 describe("{{classname}}", function()
+  local {{{packageName}}}_{{{classname}}} = require "{{{packageName}}}.api.{{{classname}}}"
 {{#operation}}
+  {{#models}}
+  [[-- import all models --]]
+  {{#model}}
+  local {{{packageName}}}_{{{classname}}} = require "{{{packageName}}}.model.{{{classname}}}"
+  {{/model}}
+  {{/models}}
   -- unit tests for {{operationId}}
-  describe("{{operationId}} test", function()
+  describe("{{{operationId}}} test", function()
     it("should work", function()
       -- TODO assertion here: http://olivinelabs.com/busted/#asserts
     end)

modules/swagger-codegen/src/main/resources/lua/model_test.mustache

@@ -1,17 +1,14 @@
---[[
 {{> partial_header}}
-]]
-
 {{#models}}
 {{#model}}
-local {{packageName}}_{{{classname}}} = require "{{packageName}}.model.{{{classname}}}"
-
 --[[
 Unit tests for {{{packageName}}}.model.{{{classname}}}
 Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
 Please update as you see appropriate
 ]]
 describe("{{classname}}", function()
+  local {{{packageName}}}_{{{classname}}} = require "{{{packageName}}}.model.{{{classname}}}"
+
   {{#vars}}
   -- unit tests for the property '{{{name}}}'
   describe("property {{{name}}} test", function()