loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix tests

Browse Source
This commit is contained in:
cbornet
2016-06-15 23:20:37 +02:00
parent 7aac639aad
commit d4c961798e
10 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

5
modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java
View File

@@ -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;

3
modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
View File

@@ -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;

23
modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java Normal file
View File

@@ -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;
}
}

3
modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java
View File

@@ -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();

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

@@ -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");

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

@@ -20,6 +20,8 @@ public class SpringMVCServerOptionsProvider extends JavaOptionsProvider {
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;
}

4
modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
View File

@@ -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;

3
modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java
View File

@@ -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;