fix tests

Author: cbornet

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

@@ -47,6 +47,13 @@ public SpringBootServerCodegen() {
         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

modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java

@@ -1,13 +1,14 @@
 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;
 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 @@ protected void setExpectations() {
             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);

modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java

@@ -2,6 +2,7 @@
 
 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 @@ protected void setExpectations() {
             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;

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 mockit.Expectations;
 import mockit.Tested;
 
-public class JaxRSServerOptionsTest extends JavaClientOptionsTest {
+public class JaxRSServerOptionsTest extends AbstractOptionsTest {
 
     @Tested
     private JavaJerseyServerCodegen clientCodegen;

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<String, String> createOptions() {
+        Map<String, String> options = new HashMap<String, String>(super.createOptions());
+        options.put(CodegenConstants.LIBRARY, DEFAULT_LIBRARY_VALUE);
+        options.put(JavaClientCodegen.USE_RX_JAVA, "false");
+
+        return options;
+    }
+
+}

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 JavaOptionsProvider() {
                 .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();

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java

@@ -54,7 +54,6 @@ public Map<String, String> createOptions() {
             .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");
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java

@@ -20,6 +20,8 @@ public Map<String, String> createOptions() {
         Map<String, String> options = new HashMap<String, String>(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;
     }
 

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;

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 mockit.Expectations;
 import mockit.Tested;
 
-public class SpringMVCServerOptionsTest extends JavaClientOptionsTest {
+public class SpringMVCServerOptionsTest extends AbstractOptionsTest {
 
     @Tested
     private SpringMVCServerCodegen clientCodegen;