issue-2743 generating unit tests in root/test directory

This commit is contained in:
Mikolaj Przybysz 2016-05-02 11:37:17 +02:00
parent 6b3735e58d
commit b1c030d698

View File

@ -35,6 +35,9 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
protected String packagePath = "SwaggerClient-php"; protected String packagePath = "SwaggerClient-php";
protected String artifactVersion = "1.0.0"; protected String artifactVersion = "1.0.0";
protected String srcBasePath = "lib"; protected String srcBasePath = "lib";
protected String testBasePath = "test";
protected String apiDirName = "Api";
protected String modelDirName = "Model";
protected String variableNamingConvention= "snake_case"; protected String variableNamingConvention= "snake_case";
protected String apiDocPath = "docs/"; protected String apiDocPath = "docs/";
protected String modelDocPath = "docs/"; protected String modelDocPath = "docs/";
@ -49,9 +52,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
modelTestTemplateFiles.put("model_test.mustache", ".php"); modelTestTemplateFiles.put("model_test.mustache", ".php");
apiTestTemplateFiles.put("api_test.mustache", ".php"); apiTestTemplateFiles.put("api_test.mustache", ".php");
embeddedTemplateDir = templateDir = "php"; embeddedTemplateDir = templateDir = "php";
apiPackage = invokerPackage + "\\Api"; apiPackage = invokerPackage + "\\" + apiDirName;
modelPackage = invokerPackage + "\\Model"; modelPackage = invokerPackage + "\\" + modelDirName;
testPackage = invokerPackage + "\\Tests";
modelDocTemplateFiles.put("model_doc.mustache", ".md"); modelDocTemplateFiles.put("model_doc.mustache", ".md");
apiDocTemplateFiles.put("api_doc.mustache", ".md"); apiDocTemplateFiles.put("api_doc.mustache", ".md");
@ -259,12 +261,12 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
@Override @Override
public String apiTestFileFolder() { public String apiTestFileFolder() {
return (outputFolder + "/" + toPackagePath(testPackage, srcBasePath)); return (outputFolder + "/" + getPackagePath() + "/" + testBasePath + "/" + apiDirName);
} }
@Override @Override
public String modelTestFileFolder() { public String modelTestFileFolder() {
return (outputFolder + "/" + toPackagePath(testPackage, srcBasePath)); return (outputFolder + "/" + getPackagePath() + "/" + testBasePath + "/" + modelDirName);
} }
@Override @Override