adds tests, fixes for java templates

Author: fehguy

modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache

@@ -16,6 +16,7 @@ import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -83,11 +84,19 @@ public class ApiInvoker {
       return "";
     } else if (param instanceof Date) {
       return formatDateTime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
     } else {
       return String.valueOf(param);
     }
   }
-
   public void enableDebug() {
     isDebug = true;
   }

modules/swagger-generator/pom.xml

@@ -104,7 +104,7 @@
             <id>start-jetty</id>
             <phase>pre-integration-test</phase>
             <goals>
-              <goal>run</goal>
+              <goal>start</goal>
             </goals>
             <configuration>
               <scanIntervalSeconds>0</scanIntervalSeconds>
@@ -226,7 +226,7 @@
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <servlet-api-version>2.5</servlet-api-version>
     <zip-version>1.3.2</zip-version>
-    <jetty-version>9.0.7.v20131107</jetty-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.4.1</jersey2-version>
   </properties>
 </project>

pom.xml

@@ -288,6 +288,7 @@
       </activation>
       <modules>
         <module>samples/client/petstore/objc</module>
+        <module>samples/client/petstore/java</module>
       </modules>
     </profile>
   </profiles>

samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java

@@ -16,6 +16,7 @@
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -83,11 +84,19 @@ public static String parameterToString(Object param) {
       return "";
     } else if (param instanceof Date) {
       return formatDateTime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
     } else {
       return String.valueOf(param);
     }
   }
-
   public void enableDebug() {
     isDebug = true;
   }

samples/client/petstore/java/src/main/java/io/swagger/client/model/ApiResponse.java

@@ -0,0 +1,64 @@
+package io.swagger.client.model;
+
+
+import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+public class ApiResponse  {
+  
+  private Integer code = null;
+  private String type = null;
+  private String message = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  @JsonProperty("code")
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  @JsonProperty("type")
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  @JsonProperty("message")
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("  code: ").append(code).append("\n");
+    sb.append("  type: ").append(type).append("\n");
+    sb.append("  message: ").append(message).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}

samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java

@@ -0,0 +1,83 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+public class PetApiTest {
+  PetApi api = null;
+
+  @Before
+  public void setup() {
+    api = new PetApi();
+  }
+
+  @Test
+  public void testCreateAndGetPet() throws Exception {
+    Pet pet = createRandomPet();
+    api.addPet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    assertNotNull(fetched);
+    assertEquals(pet.getId(), fetched.getId());
+    assertNotNull(fetched.getCategory());
+    assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+  }
+
+  @Test
+  public void testUpdatePet() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("programmer");
+
+    api.updatePet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    assertNotNull(fetched);
+    assertEquals(pet.getId(), fetched.getId());
+    assertNotNull(fetched.getCategory());
+    assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+  }
+
+  @Test
+  public void testFindPetByStatus() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("programmer");
+    pet.setStatus(Pet.StatusEnum.available);
+
+    api.updatePet(pet);
+
+    List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+    assertNotNull(pets);
+
+    boolean found = false;
+    for(Pet fetched : pets) {
+      if(fetched.getId().equals(pet.getId())) {
+        found = true;
+        break;
+      }
+    }
+
+    assertTrue(found);
+  }
+
+  private Pet createRandomPet() {
+    Pet pet = new Pet();
+    pet.setId(System.currentTimeMillis());
+    pet.setName("gorilla");
+
+    Category category = new Category();
+    category.setName("really-happy");
+
+    pet.setCategory(category);
+    pet.setStatus(Pet.StatusEnum.available);
+    List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+    pet.setPhotoUrls(photos);
+
+    return pet;
+  }
+}

samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m

@@ -6,8 +6,7 @@ @implementation PetApiTest
 - (void)setUp {
     [super setUp];
     api = [[SWGPetApi alloc ]init];
-//    [[SWGApiClient sharedClientFromPool]setLoggingEnabled:true];
-    [SWGPetApi setBasePath:@"http://localhost:8002/api"];
+    [SWGPetApi setBasePath:@"http://localhost:8080/api"];
 }
 
 - (void)tearDown {

samples/client/petstore/objc/pom.xml

@@ -30,7 +30,7 @@
           <stopKey>alpha</stopKey>
           <stopPort>9099</stopPort>
           <httpConnector>
-            <port>8002</port>
+            <port>8080</port>
           </httpConnector>
         </configuration>
         <executions>
@@ -41,8 +41,8 @@
               <goal>deploy-war</goal>
             </goals>
           </execution>
-         </executions>
-        </plugin>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>