add timeout tests

Author: koush

AndroidAsync/AndroidAsync.iml

@@ -63,7 +63,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java

@@ -137,7 +137,9 @@ public void run() {
     }
 
     private static long getTimeoutRemaining(AsyncHttpRequest request) {
-        return Math.max(System.currentTimeMillis() - request.executionTime + request.getTimeout(), 1);
+        // need a better way to calculate this.
+        // a timer of sorts that stops/resumes.
+        return request.getTimeout();
     }
 
     private void executeAffinity(final AsyncHttpRequest request, final int redirectCount, final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback) {

AndroidAsyncTest/AndroidAsyncTest.iml

@@ -18,7 +18,7 @@
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="AndroidAsync" />
   </component>

AndroidAsyncTest/src/com/koushikdutta/async/test/TimeoutTests.java

@@ -1,13 +1,25 @@
 package com.koushikdutta.async.test;
 
+import android.util.Log;
+
 import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.DataEmitter;
+import com.koushikdutta.async.DataSink;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.http.AsyncHttpClient;
+import com.koushikdutta.async.http.AsyncHttpRequest;
+import com.koushikdutta.async.http.AsyncHttpRequestBody;
+import com.koushikdutta.async.http.StringBody;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 import com.koushikdutta.async.http.server.AsyncHttpServerResponse;
 import com.koushikdutta.async.http.server.HttpServerRequestCallback;
 
 import junit.framework.TestCase;
 
+import java.net.URI;
+import java.util.concurrent.TimeoutException;
+
 /**
  * Created by koush on 7/11/13.
  */
@@ -22,14 +34,15 @@ public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerRespo
                     public void run() {
                         response.send("3");
                     }
-                }, 3000);
+                }, 1000);
             }
         });
 
-        server.get("/now", new HttpServerRequestCallback() {
+        server.post("/now", new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
-                response.send("now");
+                StringBody body = (StringBody)request.getBody();
+                response.send(body.get());
             }
         });
     }
@@ -44,9 +57,60 @@ protected void setUp() throws Exception {
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
-        AsyncServer.getDefault().stop();
+//        AsyncServer.getDefault().stop();
+        server.stop();
+
     }
 
     public void testTimeout() throws Exception {
+        AsyncHttpRequest req = new AsyncHttpRequest(URI.create("http://localhost:5000/3"), "GET");
+        req.setTimeout(1000);
+        try {
+            AsyncHttpClient.getDefaultInstance().executeString(req).get();
+            fail();
+        }
+        catch (Exception e) {
+            Log.d("timeout", "error", e);
+            assertTrue(e.getCause() instanceof TimeoutException);
+        }
+
+        req = new AsyncHttpRequest(URI.create("http://localhost:5000/3"), "GET");
+        assertEquals("3", AsyncHttpClient.getDefaultInstance().executeString(req).get());
+    }
+
+    public void testSlowBody() throws Exception {
+        AsyncHttpRequest req = new AsyncHttpRequest(URI.create("http://localhost:5000/now"), "POST");
+        req.setTimeout(1000);
+        req.setLogging("slowbody", Log.VERBOSE);
+        req.setBody(new DelayedStringBody("foo"));
+        assertEquals("foo", AsyncHttpClient.getDefaultInstance().executeString(req).get());
+
+        req = new AsyncHttpRequest(URI.create("http://localhost:5000/3"), "GET");
+        req.setLogging("slowbody", Log.VERBOSE);
+        req.setTimeout(100);
+        req.setBody(new DelayedStringBody("foo"));
+        try {
+            AsyncHttpClient.getDefaultInstance().executeString(req).get();
+            fail();
+        }
+        catch (Exception e) {
+            Log.d("timeout", "error", e);
+            assertTrue(e.getCause() instanceof TimeoutException);
+        }
+    }
+
+    class DelayedStringBody extends StringBody {
+        public DelayedStringBody(String value) {
+            super(value);
+        }
+        @Override
+        public void write(final AsyncHttpRequest request, final DataSink sink, final CompletedCallback completed) {
+            AsyncServer.getDefault().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    DelayedStringBody.super.write(request, sink, completed);
+                }
+            }, 1000);
+        }
     }
 }