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

Merge branch 'master' into java-imports

Browse Source 
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
This commit is contained in:
xhh
2016-01-29 11:16:14 +08:00
parent 34a941f352 564fa04f7c
commit ee1f401145
356 changed files with 11850 additions and 3863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/client/petstore/java/feign/src/test/java/io/swagger/TestUtils.java Normal file
View File

@@ -0,0 +1,17 @@
package io.swagger;
import java.util.Random;
import java.util.concurrent.atomic.AtomicLong;
public class TestUtils {
private static final AtomicLong atomicId = createAtomicId();
public static long nextId() {
return atomicId.getAndIncrement();
}
private static AtomicLong createAtomicId() {
int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
return new AtomicLong((long) baseId);
}
}

5
samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java
View File

@@ -1,7 +1,8 @@
package io.swagger.petstore.test;
import io.swagger.client.ApiClient;
import io.swagger.TestUtils;
import io.swagger.client.ApiClient;
import io.swagger.client.api.*;
import io.swagger.client.model.*;
@@ -183,7 +184,7 @@ public class PetApiTest {
private Pet createRandomPet() {
Pet pet = new Pet();
pet.setId(System.currentTimeMillis());
pet.setId(TestUtils.nextId());
pet.setName("gorilla");
Category category = new Category();

16
samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
View File

@@ -1,5 +1,9 @@
package io.swagger.petstore.test;
import feign.FeignException;
import io.swagger.TestUtils;
import io.swagger.client.*;
import io.swagger.client.api.*;
import io.swagger.client.model.*;
@@ -44,15 +48,19 @@ public class StoreApiTest {
Order fetched = api.getOrderById(order.getId().toString());
assertEquals(fetched.getId(), order.getId());
api.deleteOrder(String.valueOf(order.getId()));
api.deleteOrder(order.getId().toString());
api.getOrderById(order.getId().toString());
// fail("expected an error");
try {
api.getOrderById(order.getId().toString());
fail("expected an error");
} catch (FeignException e) {
assertTrue(e.getMessage().startsWith("status 404 "));
}
}
private Order createOrder() {
Order order = new Order();
order.setId(new Long(System.currentTimeMillis()));
order.setId(TestUtils.nextId());
order.setPetId(new Long(200));
order.setQuantity(new Integer(13));
order.setShipDate(new java.util.Date());

12
samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java
View File

@@ -1,5 +1,7 @@
package io.swagger.petstore.test;
import io.swagger.TestUtils;
import io.swagger.client.ApiClient;
import io.swagger.client.api.*;
import io.swagger.client.model.*;
@@ -32,9 +34,9 @@ public class UserApiTest {
@Test
public void testCreateUsersWithArray() throws Exception {
User user1 = createUser();
user1.setUsername("abc123");
user1.setUsername("user" + user1.getId());
User user2 = createUser();
user2.setUsername("123abc");
user2.setUsername("user" + user2.getId());
api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
@@ -45,9 +47,9 @@ public class UserApiTest {
@Test
public void testCreateUsersWithList() throws Exception {
User user1 = createUser();
user1.setUsername("abc123");
user1.setUsername("user" + user1.getId());
User user2 = createUser();
user2.setUsername("123abc");
user2.setUsername("user" + user2.getId());
api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
@@ -73,7 +75,7 @@ public class UserApiTest {
private User createUser() {
User user = new User();
user.setId(System.currentTimeMillis());
user.setId(TestUtils.nextId());
user.setUsername("fred" + user.getId());
user.setFirstName("Fred");
user.setLastName("Meyer");