smaller tests, better code format (#4355)

Author: wing328

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java

@@ -146,6 +146,14 @@ public void onDownloadProgress(long bytesRead, long contentLength, boolean done)
             }
         } while (result.isEmpty());
         assertPetMatches(pet, fetched);
+    }
+
+    @Test
+    public void testCreateAndGetPetAsyncInvalidID() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+        // to store returned Pet or error message/exception
+        final Map<String, Object> result = new HashMap<String, Object>();
 
         // test getting a nonexistent pet
         result.clear();
@@ -172,8 +180,11 @@ public void onDownloadProgress(long bytesRead, long contentLength, boolean done)
         });
 
         // wait for the asynchronous call to finish (at most 10 seconds)
-        tryCount = 1;
+        final int maxTry = 10;
+        int tryCount = 1;
+        Pet fetched = null;
         ApiException exception = null;
+
         do {
             if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
             Thread.sleep(1000);
@@ -414,16 +425,16 @@ private void assertPetMatches(Pet expected, Pet actual) {
         assertEquals(expected.getId(), actual.getId());
         assertNotNull(actual.getCategory());
         assertEquals(expected.getCategory().getName(),
-                     actual.getCategory().getName());
+                actual.getCategory().getName());
     }
 
     /**
      * Assert that the given upload/download progress list satisfies the
      * following constraints:
-     *
-     *     - List is not empty
-     *     - Byte count should be nondecreasing
-     *     - The last element, and only the last element, should have done=true
+     * <p>
+     * - List is not empty
+     * - Byte count should be nondecreasing
+     * - The last element, and only the last element, should have done=true
      */
     private void assertValidProgress(List<Progress> progressList) {
         assertFalse(progressList.isEmpty());
@@ -434,7 +445,7 @@ private void assertValidProgress(List<Progress> progressList) {
             if (prev != null) {
                 if (prev.done || prev.bytes > progress.bytes) {
                     fail("Progress list out of order at index " + index
-                         + ": " + progressList);
+                            + ": " + progressList);
                 }
             }
             prev = progress;
@@ -450,9 +461,9 @@ private static class TestApiCallback<T> implements ApiCallback<T> {
 
         private final CountDownLatch latch;
         private final ConcurrentLinkedQueue<Progress> uploadProgress =
-            new ConcurrentLinkedQueue<Progress>();
+                new ConcurrentLinkedQueue<Progress>();
         private final ConcurrentLinkedQueue<Progress> downloadProgress =
-            new ConcurrentLinkedQueue<Progress>();
+                new ConcurrentLinkedQueue<Progress>();
 
         private boolean done;
         private boolean success;

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java

@@ -146,6 +146,14 @@ public void onDownloadProgress(long bytesRead, long contentLength, boolean done)
             }
         } while (result.isEmpty());
         assertPetMatches(pet, fetched);
+    }
+
+    @Test
+    public void testCreateAndGetPetAsyncInvalidID() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+        // to store returned Pet or error message/exception
+        final Map<String, Object> result = new HashMap<String, Object>();
 
         // test getting a nonexistent pet
         result.clear();
@@ -172,8 +180,11 @@ public void onDownloadProgress(long bytesRead, long contentLength, boolean done)
         });
 
         // wait for the asynchronous call to finish (at most 10 seconds)
-        tryCount = 1;
+        final int maxTry = 10;
+        int tryCount = 1;
+        Pet fetched = null;
         ApiException exception = null;
+
         do {
             if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
             Thread.sleep(1000);
@@ -414,16 +425,16 @@ private void assertPetMatches(Pet expected, Pet actual) {
         assertEquals(expected.getId(), actual.getId());
         assertNotNull(actual.getCategory());
         assertEquals(expected.getCategory().getName(),
-                     actual.getCategory().getName());
+                actual.getCategory().getName());
     }
 
     /**
      * Assert that the given upload/download progress list satisfies the
      * following constraints:
-     *
-     *     - List is not empty
-     *     - Byte count should be nondecreasing
-     *     - The last element, and only the last element, should have done=true
+     * <p>
+     * - List is not empty
+     * - Byte count should be nondecreasing
+     * - The last element, and only the last element, should have done=true
      */
     private void assertValidProgress(List<Progress> progressList) {
         assertFalse(progressList.isEmpty());
@@ -434,7 +445,7 @@ private void assertValidProgress(List<Progress> progressList) {
             if (prev != null) {
                 if (prev.done || prev.bytes > progress.bytes) {
                     fail("Progress list out of order at index " + index
-                         + ": " + progressList);
+                            + ": " + progressList);
                 }
             }
             prev = progress;
@@ -450,9 +461,9 @@ private static class TestApiCallback<T> implements ApiCallback<T> {
 
         private final CountDownLatch latch;
         private final ConcurrentLinkedQueue<Progress> uploadProgress =
-            new ConcurrentLinkedQueue<Progress>();
+                new ConcurrentLinkedQueue<Progress>();
         private final ConcurrentLinkedQueue<Progress> downloadProgress =
-            new ConcurrentLinkedQueue<Progress>();
+                new ConcurrentLinkedQueue<Progress>();
 
         private boolean done;
         private boolean success;