Merge pull request #1305 from iushankin/issue-1304

Fixed #1304: Migrate tests from the Scala to the plain Java. Part 1

Author: wing328

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

@@ -0,0 +1,41 @@
+package io.swagger.codegen;
+
+import io.swagger.models.auth.AuthorizationValue;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+public class ClientAuthInputTest {
+
+    @Test(description = "read a file upload param from a 2.0 spec")
+    public void clientAuthInputTest() {
+        final ClientOptInput input = new ClientOptInput();
+
+        final String header = "api_key:special-key,api_key:hello,X-AUTHORIZATION:0e6c11d79a,Authorization:Basic 1jz0";
+        input.setAuth(header);
+        final List<AuthorizationValue> authValues = input.getAuthorizationValues();
+        Assert.assertEquals(authValues.size(), 4);
+
+        final AuthorizationValue a1 = authValues.get(0);
+        Assert.assertEquals(a1.getKeyName(), "api_key");
+        Assert.assertEquals(a1.getValue(), "special-key");
+        Assert.assertEquals(a1.getType(), "header");
+
+        final AuthorizationValue a2 = authValues.get(1);
+        Assert.assertEquals(a2.getKeyName(), "api_key");
+        Assert.assertEquals(a2.getValue(), "hello");
+        Assert.assertEquals(a2.getType(), "header");
+
+        final AuthorizationValue a3 = authValues.get(2);
+        Assert.assertEquals(a3.getKeyName(), "X-AUTHORIZATION");
+        Assert.assertEquals(a3.getValue(), "0e6c11d79a");
+        Assert.assertEquals(a3.getType(), "header");
+
+        final AuthorizationValue a4 = authValues.get(3);
+        Assert.assertEquals(a4.getKeyName(), "Authorization");
+        Assert.assertEquals(a4.getValue(), "Basic 1jz0");
+        Assert.assertEquals(a4.getType(), "header");
+    }
+}

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

@@ -0,0 +1,15 @@
+package io.swagger.codegen;
+
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+
+import org.testng.annotations.Test;
+
+public class SwaggerMigratorTest {
+
+    @Test(description = "read a 1.2 spec")
+    public void swaggerMigratorTest() {
+        final SwaggerParser loader = new SwaggerParser();
+        final Swagger swagger = loader.read("src/test/resources/1_2/petstore-1.2/api-docs");
+    }
+}

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

@@ -0,0 +1,31 @@
+package io.swagger.codegen.java;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.languages.JavaClientCodegen;
+import io.swagger.models.ComposedModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.RefModel;
+import io.swagger.models.properties.StringProperty;
+
+import com.google.common.collect.Sets;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class JavaInheritanceTest {
+
+    @Test(description = "convert a composed model")
+    public void javaInheritanceTest() {
+        final Model model = new ComposedModel().parent(new RefModel("Base"))
+                .child(new ModelImpl().additionalProperties(new StringProperty()));
+
+        final DefaultCodegen codegen = new JavaClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.parent, "Base");
+        Assert.assertEquals(cm.imports, Sets.newHashSet("Base"));
+    }
+}

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

@@ -0,0 +1,96 @@
+package io.swagger.codegen.java;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.languages.JavaClientCodegen;
+import io.swagger.models.ComposedModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.RefModel;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class JavaModelEnumTest {
+
+    @Test(description = "convert a java model with an enum")
+    public void converterTest() {
+        final StringProperty enumProperty = new StringProperty();
+        enumProperty.setEnum(Arrays.asList("VALUE1", "VALUE2", "VALUE3"));
+        final ModelImpl model = new ModelImpl().property("name", enumProperty);
+
+        final DefaultCodegen codegen = new JavaClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty enumVar = cm.vars.get(0);
+        Assert.assertEquals(enumVar.baseName, "name");
+        Assert.assertEquals(enumVar.datatype, "String");
+        Assert.assertEquals(enumVar.datatypeWithEnum, "NameEnum");
+        Assert.assertEquals(enumVar.name, "name");
+        Assert.assertEquals(enumVar.defaultValue, "null");
+        Assert.assertEquals(enumVar.baseType, "String");
+        Assert.assertTrue(enumVar.isEnum);
+    }
+
+    @Test(description = "not override identical parent enums")
+    public void overrideEnumTest() {
+        final StringProperty identicalEnumProperty = new StringProperty();
+        identicalEnumProperty.setEnum(Arrays.asList("VALUE1", "VALUE2", "VALUE3"));
+
+        final StringProperty subEnumProperty = new StringProperty();
+        subEnumProperty.setEnum(Arrays.asList("SUB1", "SUB2", "SUB3"));
+
+        // Add one enum property to the parent
+        final Map<String, Property> parentProperties = new HashMap<String, Property>();
+        parentProperties.put("sharedThing", identicalEnumProperty);
+
+        // Add TWO enums to the subType model; one of which is identical to the one in parent class
+        final Map<String, Property> subProperties = new HashMap<String, Property>();
+        subProperties.put("sharedThing", identicalEnumProperty);
+        subProperties.put("unsharedThing", identicalEnumProperty);
+
+        final ModelImpl parentModel = new ModelImpl();
+        parentModel.setProperties(parentProperties);
+        parentModel.name("parentModel");
+
+        final ModelImpl subModel = new ModelImpl();
+        subModel.setProperties(subProperties);
+        subModel.name("subModel");
+
+        final ComposedModel model = new ComposedModel()
+                .parent(new RefModel(parentModel.getName()))
+                .child(subModel)
+                .interfaces(new ArrayList<RefModel>());
+
+        final DefaultCodegen codegen = new JavaClientCodegen();
+        final Map<String, Model> allModels = new HashMap<String, Model>();
+        allModels.put(codegen.toModelName(parentModel.getName()), parentModel);
+        allModels.put(codegen.toModelName(subModel.getName()), subModel);
+
+        final CodegenModel cm = codegen.fromModel("sample", model, allModels);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.parent, "ParentModel");
+        Assert.assertEquals(cm.imports, Collections.singletonList("ParentModel"));
+
+        // Assert that only the unshared/uninherited enum remains
+        Assert.assertEquals(cm.vars.size(), 1);
+        final CodegenProperty enumVar = cm.vars.get(0);
+        Assert.assertEquals(enumVar.baseName, "unsharedThing");
+        Assert.assertEquals(enumVar.datatype, "String");
+        Assert.assertEquals(enumVar.datatypeWithEnum, "UnsharedThingEnum");
+        Assert.assertTrue(enumVar.isEnum);
+    }
+}