From d4c961798ec822cdf0f0b338cb8863561e6d29ed Mon Sep 17 00:00:00 2001 From: cbornet Date: Wed, 15 Jun 2016 23:20:37 +0200 Subject: [PATCH] fix tests --- .../languages/SpringBootServerCodegen.java | 7 ++++++ .../JavaInflectorServerOptionsTest.java | 5 ++-- .../codegen/java/JavaClientOptionsTest.java | 5 ++-- .../codegen/jaxrs/JaxRSServerOptionsTest.java | 3 ++- .../options/JavaClientOptionsProvider.java | 23 +++++++++++++++++++ .../codegen/options/JavaOptionsProvider.java | 3 --- .../options/JaxRSServerOptionsProvider.java | 1 - .../SpringMVCServerOptionsProvider.java | 2 ++ .../SpringBootServerOptionsTest.java | 4 ++-- .../springmvc/SpringMVCServerOptionsTest.java | 3 ++- 10 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java index 577b1bc3b933..3cdefc4e437e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java @@ -47,6 +47,13 @@ public class SpringBootServerCodegen extends AbstractJavaCodegen { supportedLibraries.put("j8-async", "Use async servlet feature and Java 8's default interface. Generating interface with service " + "declaration is useful when using Maven plugin. Just provide a implementation with @Controller to instantiate service." + "(DEPRECATED: use -Djava8=true,async=true instead)"); + + CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use"); + library.setDefault(DEFAULT_LIBRARY); + library.setEnum(supportedLibraries); + library.setDefault(DEFAULT_LIBRARY); + cliOptions.add(library); + } @Override diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java index 0987a0d236e0..4d020f0591b7 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java @@ -1,5 +1,6 @@ package io.swagger.codegen.inflector; +import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.java.JavaClientOptionsTest; import io.swagger.codegen.languages.JavaInflectorServerCodegen; @@ -7,7 +8,7 @@ import io.swagger.codegen.options.JavaInflectorServerOptionsProvider; import mockit.Expectations; import mockit.Tested; -public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest { +public class JavaInflectorServerOptionsTest extends AbstractOptionsTest { @Tested private JavaInflectorServerCodegen clientCodegen; @@ -45,8 +46,6 @@ public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest { times = 1; clientCodegen.setSerializableModel(Boolean.valueOf(JavaInflectorServerOptionsProvider.SERIALIZABLE_MODEL_VALUE)); times = 1; - clientCodegen.setLibrary(JavaInflectorServerOptionsProvider.DEFAULT_LIBRARY_VALUE); - times = 1; clientCodegen.setFullJavaUtil(Boolean.valueOf(JavaInflectorServerOptionsProvider.FULL_JAVA_UTIL_VALUE)); times = 1; clientCodegen.setSerializeBigDecimalAsString(true); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java index 701f9586eec5..aea42d72401f 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java @@ -2,6 +2,7 @@ package io.swagger.codegen.java; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.options.JavaClientOptionsProvider; import io.swagger.codegen.options.JavaOptionsProvider; import io.swagger.codegen.languages.JavaClientCodegen; import io.swagger.codegen.options.OptionsProvider; @@ -15,7 +16,7 @@ public class JavaClientOptionsTest extends AbstractOptionsTest { private JavaClientCodegen clientCodegen; public JavaClientOptionsTest() { - super(new JavaOptionsProvider()); + super(new JavaClientOptionsProvider()); } protected JavaClientOptionsTest(OptionsProvider optionsProvider) { @@ -51,7 +52,7 @@ public class JavaClientOptionsTest extends AbstractOptionsTest { times = 1; clientCodegen.setSerializableModel(Boolean.valueOf(JavaOptionsProvider.SERIALIZABLE_MODEL_VALUE)); times = 1; - clientCodegen.setLibrary(JavaOptionsProvider.DEFAULT_LIBRARY_VALUE); + clientCodegen.setLibrary(JavaClientOptionsProvider.DEFAULT_LIBRARY_VALUE); times = 1; clientCodegen.setFullJavaUtil(Boolean.valueOf(JavaOptionsProvider.FULL_JAVA_UTIL_VALUE)); times = 1; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java index 51dcd5fc90d7..7753c8e45da6 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java @@ -1,5 +1,6 @@ package io.swagger.codegen.jaxrs; +import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.java.JavaClientOptionsTest; import io.swagger.codegen.languages.JavaJerseyServerCodegen; @@ -8,7 +9,7 @@ import io.swagger.codegen.options.JaxRSServerOptionsProvider; import mockit.Expectations; import mockit.Tested; -public class JaxRSServerOptionsTest extends JavaClientOptionsTest { +public class JaxRSServerOptionsTest extends AbstractOptionsTest { @Tested private JavaJerseyServerCodegen clientCodegen; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java new file mode 100644 index 000000000000..53cfe826d36f --- /dev/null +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java @@ -0,0 +1,23 @@ +package io.swagger.codegen.options; + +import com.google.common.collect.ImmutableMap; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.languages.JavaClientCodegen; + +import java.util.HashMap; +import java.util.Map; + +public class JavaClientOptionsProvider extends JavaOptionsProvider { + + public static final String DEFAULT_LIBRARY_VALUE = "jersey2"; + + @Override + public Map createOptions() { + Map options = new HashMap(super.createOptions()); + options.put(CodegenConstants.LIBRARY, DEFAULT_LIBRARY_VALUE); + options.put(JavaClientCodegen.USE_RX_JAVA, "false"); + + return options; + } + +} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java index d2b51b06fe4c..468eb5c972f0 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java @@ -16,7 +16,6 @@ public class JavaOptionsProvider implements OptionsProvider { public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; public static final String SOURCE_FOLDER_VALUE = "src/main/java/test"; public static final String LOCAL_PREFIX_VALUE = "tst"; - public static final String DEFAULT_LIBRARY_VALUE = "jersey2"; public static final String SERIALIZABLE_MODEL_VALUE = "false"; public static final String FULL_JAVA_UTIL_VALUE = "true"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -40,9 +39,7 @@ public class JavaOptionsProvider implements OptionsProvider { .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE) .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE) .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE) - .put(CodegenConstants.LIBRARY, DEFAULT_LIBRARY_VALUE) .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true") - .put(JavaClientCodegen.USE_RX_JAVA, "false") .put(JavaClientCodegen.DATE_LIBRARY, "joda") .put("hideGenerationTimestamp", "true") .build(); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java index 3006ed396c95..230084c2ec9c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java @@ -54,7 +54,6 @@ public class JaxRSServerOptionsProvider implements OptionsProvider { .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE) .put(CodegenConstants.LIBRARY, JAXRS_DEFAULT_LIBRARY_VALUE) .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true") - .put(JavaClientCodegen.USE_RX_JAVA, "false") //.put(JavaClientCodegen.DATE_LIBRARY, "joda") .put("hideGenerationTimestamp", "true"); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java index a9d77c403938..0755b4380f62 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java @@ -20,6 +20,8 @@ public class SpringMVCServerOptionsProvider extends JavaOptionsProvider { Map options = new HashMap(super.createOptions()); options.put(SpringMVCServerCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE); options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE); + options.put(SpringMVCServerCodegen.USE_RX_JAVA, "false"); + return options; } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java index 376a44a60b85..90610924bfae 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java @@ -1,14 +1,14 @@ package io.swagger.codegen.springboot; +import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.java.JavaClientOptionsTest; import io.swagger.codegen.languages.SpringBootServerCodegen; import io.swagger.codegen.options.SpringBootServerOptionsProvider; import mockit.Expectations; import mockit.Tested; -public class SpringBootServerOptionsTest extends JavaClientOptionsTest { +public class SpringBootServerOptionsTest extends AbstractOptionsTest { @Tested private SpringBootServerCodegen clientCodegen; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java index c24162c1a3c9..c53a4e4941cb 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java @@ -1,5 +1,6 @@ package io.swagger.codegen.springmvc; +import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.java.JavaClientOptionsTest; import io.swagger.codegen.languages.SpringMVCServerCodegen; @@ -8,7 +9,7 @@ import io.swagger.codegen.options.SpringMVCServerOptionsProvider; import mockit.Expectations; import mockit.Tested; -public class SpringMVCServerOptionsTest extends JavaClientOptionsTest { +public class SpringMVCServerOptionsTest extends AbstractOptionsTest { @Tested private SpringMVCServerCodegen clientCodegen;