more replacements of junit Assert with assert keyword.

17 files changed, 118 insertions, 177 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
index 66c8d28..296962d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java
@@ -1,18 +1,15 @@
 package com.koushikdutta.async;
 
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.callback.DataCallback;
+import com.koushikdutta.async.callback.WritableCallback;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 
-import junit.framework.Assert;
-import android.util.Log;
-
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.callback.WritableCallback;
-
 public class AsyncNetworkSocket implements AsyncSocket {
     AsyncNetworkSocket() {
     }
@@ -38,7 +35,7 @@ public class AsyncNetworkSocket implements AsyncSocket {
     }
     
     public void onDataWritable() {
-        Assert.assertNotNull(mWriteableHandler);
+        assert mWriteableHandler != null;
         mWriteableHandler.onWriteable();
     }
     
@@ -63,7 +60,7 @@ public class AsyncNetworkSocket implements AsyncSocket {
             return;
         }
         if (!mChannel.isConnected()) {
-            Assert.assertFalse(mChannel.isChunked());
+            assert !mChannel.isChunked();
             return;
         }
 
@@ -81,7 +78,7 @@ public class AsyncNetworkSocket implements AsyncSocket {
     private void handleRemaining(int remaining) {
         if (remaining > 0) {
             // chunked channels should not fail
-            Assert.assertFalse(mChannel.isChunked());
+            assert !mChannel.isChunked();
             // register for a write notification if a write fails
             mKey.interestOps(SelectionKey.OP_READ | SelectionKey.OP_WRITE);
         }
@@ -103,7 +100,7 @@ public class AsyncNetworkSocket implements AsyncSocket {
         }
         try {
             if (!mChannel.isConnected()) {
-                Assert.assertFalse(mChannel.isChunked());
+                assert !mChannel.isChunked();
                 return;
             }
 
@@ -153,7 +150,7 @@ public class AsyncNetworkSocket implements AsyncSocket {
                 ByteBufferList list = new ByteBufferList(b);
                 Util.emitAllData(this, list);
                 if (b.remaining() != 0) {
-                    Assert.assertTrue(pending == null);
+                    assert pending == null;
                     pending = list;
                 }
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
index dd5322a..fbed2a3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java
@@ -1,29 +1,18 @@
 package com.koushikdutta.async;
 
-import java.nio.ByteBuffer;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLEngineResult;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
-import javax.net.ssl.SSLEngineResult.Status;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import junit.framework.Assert;
-
-import org.apache.http.conn.ssl.StrictHostnameVerifier;
-
 import android.os.Build;
-
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.wrapper.AsyncSocketWrapper;
+import org.apache.http.conn.ssl.StrictHostnameVerifier;
+
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import java.nio.ByteBuffer;
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
 
 public class AsyncSSLSocketWrapper implements AsyncSocketWrapper, AsyncSSLSocket {
     AsyncSocket mSocket;
@@ -206,7 +195,7 @@ public class AsyncSSLSocketWrapper implements AsyncSocketWrapper, AsyncSSLSocket
                     if (!e.getIgnore())
                         throw e;
                 }
-                Assert.assertNotNull(mWriteableCallback);
+                assert mWriteableCallback != null;
                 mWriteableCallback.onWriteable();
                 mEmitter.onDataAvailable();
             }
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
index 3d23770..8130e90 100644
--- a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -1,16 +1,20 @@
 package com.koushikdutta.async;
 
+import android.os.Build;
+import android.os.Handler;
+import android.util.Log;
+import com.koushikdutta.async.callback.CompletedCallback;
+import com.koushikdutta.async.callback.ConnectCallback;
+import com.koushikdutta.async.callback.ListenCallback;
+import com.koushikdutta.async.future.Cancellable;
+import com.koushikdutta.async.future.SimpleCancelable;
+import com.koushikdutta.async.future.SimpleFuture;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.ClosedSelectorException;
-import java.nio.channels.DatagramChannel;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
+import java.nio.channels.*;
 import java.nio.channels.spi.SelectorProvider;
 import java.util.Hashtable;
 import java.util.LinkedList;
@@ -19,18 +23,6 @@ import java.util.WeakHashMap;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
-import android.os.Build;
-import android.os.Handler;
-import android.util.Log;
-
-import com.koushikdutta.async.callback.CompletedCallback;
-import com.koushikdutta.async.callback.ConnectCallback;
-import com.koushikdutta.async.callback.ListenCallback;
-import com.koushikdutta.async.future.Cancellable;
-import com.koushikdutta.async.future.SimpleCancelable;
-import com.koushikdutta.async.future.SimpleFuture;
-
 public class AsyncServer {
     public static final String LOGTAG = "NIO";
     
@@ -572,7 +564,7 @@ public class AsyncServer {
         synchronized (this) {
             if (mSelector != null) {
                 Log.i(LOGTAG, "Reentrant call");
-                Assert.assertEquals(Thread.currentThread(), mAffinity);
+                assert Thread.currentThread() == mAffinity;
                 // this is reentrant
                 reentrant = true;
                 selector = mSelector;
@@ -811,7 +803,7 @@ public class AsyncServer {
                 }
                 else {
                     Log.i(LOGTAG, "wtf");
-                    Assert.fail();
+                    assert false;
                 }
             }
             catch (Exception ex) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
index bbaa625..d8b55d2 100644
--- a/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java
@@ -1,12 +1,10 @@
 package com.koushikdutta.async;
 
-import java.nio.ByteBuffer;
-
-import junit.framework.Assert;
-
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 
+import java.nio.ByteBuffer;
+
 public class BufferedDataSink implements DataSink {
     DataSink mDataSink;
     public BufferedDataSink(DataSink datasink) {
@@ -104,7 +102,7 @@ public class BufferedDataSink implements DataSink {
     }
     
     public void setMaxBuffer(int maxBuffer) {
-        Assert.assertTrue(maxBuffer >= 0);
+        assert maxBuffer >= 0;
         mMaxBuffer = maxBuffer;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
index 173371c..4e700d8 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async;
 
-import junit.framework.Assert;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Iterator;
@@ -46,6 +44,18 @@ public class ByteBufferList implements Iterable<ByteBuffer> {
         return ret;
     }
 
+    public boolean isEmpty() {
+        if (remaining == 0)
+            return true;
+        if (remaining != -1)
+            return false;
+        for (ByteBuffer bb: mBuffers) {
+            if (bb.remaining() > 0)
+                return false;
+        }
+        return true;
+    }
+
     int remaining = -1;
     public int remaining() {
         if (remaining >= 0) {
@@ -163,7 +173,7 @@ public class ByteBufferList implements Iterable<ByteBuffer> {
                 bb.get(bytes, offset, toRead);
                 offset += toRead;
             }
-            Assert.assertNotNull(bb);
+            assert bb != null;
             // if there was still data left in the last buffer we popped
             // toss it back into the head
             if (bb.position() < bb.limit())
diff --git a/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java b/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java
index 8910012..caaaf2c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java
+++ b/AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async;
 
-import junit.framework.Assert;
-
 import com.koushikdutta.async.callback.DataCallback;
 
 public class DataEmitterReader implements com.koushikdutta.async.callback.DataCallback {
@@ -10,7 +8,7 @@ public class DataEmitterReader implements com.koushikdutta.async.callback.DataCa
     ByteBufferList mPendingData = new ByteBufferList();
 
     public void read(int count, DataCallback callback) {
-        Assert.assertNull(mPendingRead);    
+        assert mPendingRead == null;
         mPendingReadLength = count;
         mPendingRead = callback;
         mPendingData = new ByteBufferList();
@@ -32,7 +30,7 @@ public class DataEmitterReader implements com.koushikdutta.async.callback.DataCa
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         // if we're registered for data, we must be waiting for a read
-        assert(mPendingRead != null);
+        assert mPendingRead != null;
         do {
             int need = Math.min(bb.remaining(), mPendingReadLength - mPendingData.remaining());
             bb.get(mPendingData, need);
diff --git a/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java b/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
index 309e5ab..1495dd0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
+++ b/AndroidAsync/src/com/koushikdutta/async/FilteredDataSink.java
@@ -2,8 +2,6 @@ package com.koushikdutta.async;
 
 import java.nio.ByteBuffer;
 
-import junit.framework.Assert;
-
 public class FilteredDataSink extends BufferedDataSink {
     public FilteredDataSink(DataSink sink) {
         super(sink);
@@ -23,7 +21,7 @@ public class FilteredDataSink extends BufferedDataSink {
         ByteBufferList list = new ByteBufferList();
         byte[] bytes = new byte[bb.remaining()];
         bb.get(bytes);
-        Assert.assertTrue(bb.remaining() == 0);
+        assert bb.remaining() == 0;
         list.add(ByteBuffer.wrap(bytes));
         ByteBufferList filtered = filter(list);
         super.write(filtered, true);
@@ -36,7 +34,7 @@ public class FilteredDataSink extends BufferedDataSink {
         if (isBuffering() && getMaxBuffer() != Integer.MAX_VALUE)
             return;
         ByteBufferList filtered = filter(bb);
-        Assert.assertTrue(bb == null || filtered == bb || bb.remaining() == 0);
+        assert bb == null || filtered == bb || bb.isEmpty();
         super.write(filtered, true);
         if (bb != null)
             bb.clear();
diff --git a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
index 5bcf164..2fcb6d0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/LineEmitter.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async;
 
-import junit.framework.Assert;
-
 import com.koushikdutta.async.callback.DataCallback;
 
 public class LineEmitter implements DataCallback {
@@ -25,7 +23,7 @@ public class LineEmitter implements DataCallback {
         while (bb.remaining() > 0) {
             byte b = bb.get();
             if (b == '\n') {
-                Assert.assertNotNull(mLineCallback);
+                assert mLineCallback != null;
                 mLineCallback.onStringAvailable(data.toString());
                 data = new StringBuilder();
                 return;
diff --git a/AndroidAsync/src/com/koushikdutta/async/PushParser.java b/AndroidAsync/src/com/koushikdutta/async/PushParser.java
index 9cf386c..944ac80 100644
--- a/AndroidAsync/src/com/koushikdutta/async/PushParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/PushParser.java
@@ -1,5 +1,7 @@
 package com.koushikdutta.async;
 
+import com.koushikdutta.async.callback.DataCallback;
+
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -7,10 +9,6 @@ import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.LinkedList;
 
-import junit.framework.Assert;
-
-import com.koushikdutta.async.callback.DataCallback;
-
 public class PushParser {
     private LinkedList<Object> mWaiting = new LinkedList<Object>();
 
@@ -120,9 +118,9 @@ public class PushParser {
     }
     
     public void tap(TapCallback callback) {
-        Assert.assertNull(mCallback);
-        Assert.assertTrue(mWaiting.size() > 0);
-        
+        assert mCallback == null;
+        assert mWaiting.size() > 0;
+
         mCallback = callback;
         
         new DataCallback() {
@@ -219,14 +217,14 @@ public class PushParser {
                                 mArgs.add(bytes);
                         }
                         else {
-                            Assert.fail();
+                            assert false;
                         }
 //                        System.out.println("Parsed: " + mArgs.get(0));
                         mWaiting.remove();
                     }
                 }
                 catch (Exception ex) {
-                    Assert.assertTrue(mNeeded != 0);
+                    assert mNeeded != 0;
 //                    ex.printStackTrace();
                     mReader.read(mNeeded, this);
                     return;
@@ -263,7 +261,8 @@ public class PushParser {
         "    *;\n" +
         "}\n";
 
-        Assert.fail("AndroidAsync: tap callback could not be found. Proguard? Use this in your proguard config:\n" + fail);
+        //null != "AndroidAsync: tap callback could not be found. Proguard? Use this in your proguard config:\n" + fail;
+        assert false;
         return null;
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
index dbfc3e5..5c47d8c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
+++ b/AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java
@@ -7,8 +7,6 @@ import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 
-import junit.framework.Assert;
-
 class ServerSocketChannelWrapper extends ChannelWrapper {
     ServerSocketChannel mChannel;
 
@@ -25,20 +23,20 @@ class ServerSocketChannelWrapper extends ChannelWrapper {
     @Override
     public int read(ByteBuffer buffer) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        Assert.fail(msg);
+        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public boolean isConnected() {
-        Assert.fail("ServerSocketChannel is never connected");
+        assert false;
         return false;
     }
 
     @Override
     public int write(ByteBuffer src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        Assert.fail(msg);
+        assert false;
         throw new IOException(msg);
 
     }
@@ -51,7 +49,7 @@ class ServerSocketChannelWrapper extends ChannelWrapper {
     @Override
     public int write(ByteBuffer[] src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        Assert.fail(msg);
+        assert false;
         throw new IOException(msg);
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
index 05d40c4..e0381df 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java
@@ -1,26 +1,17 @@
 package com.koushikdutta.async.http;
 
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.apache.http.Header;
-import org.apache.http.HeaderIterator;
-import org.apache.http.HttpRequest;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.params.HttpParams;
-
 import android.os.Handler;
 import android.os.Looper;
-
 import com.koushikdutta.async.AsyncSSLException;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.libcore.RequestHeaders;
+import org.apache.http.*;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.params.HttpParams;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
 
 public class AsyncHttpRequest implements HttpRequest {
     public RequestLine getRequestLine() {
@@ -66,7 +57,7 @@ public class AsyncHttpRequest implements HttpRequest {
     }
 
     public AsyncHttpRequest(URI uri, String method) {
-        Assert.assertNotNull(uri);
+        assert uri != null;
         mMethod = method;
         mHeaders = new RequestHeaders(uri, mRawHeaders);
         mRawHeaders.setStatusLine(getRequestLine().toString());
@@ -187,13 +178,13 @@ public class AsyncHttpRequest implements HttpRequest {
 
     @Override
     public HeaderIterator headerIterator() {
-        Assert.fail();
+        assert false;
         return null;
     }
 
     @Override
     public HeaderIterator headerIterator(String name) {
-        Assert.fail();
+        assert false;
         return null;
     }
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/MultipartFormDataBody.java b/AndroidAsync/src/com/koushikdutta/async/http/MultipartFormDataBody.java
index 83dfc48..d27857f 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/MultipartFormDataBody.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/MultipartFormDataBody.java
@@ -1,11 +1,5 @@
 package com.koushikdutta.async.http;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.UUID;
-
-import junit.framework.Assert;
-
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.LineEmitter;
@@ -18,6 +12,10 @@ import com.koushikdutta.async.future.Continuation;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.server.BoundaryEmitter;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.UUID;
+
 public class MultipartFormDataBody extends BoundaryEmitter implements AsyncHttpRequestBody {
     LineEmitter liner;
     RawHeaders formData;
@@ -177,7 +175,7 @@ public class MultipartFormDataBody extends BoundaryEmitter implements AsyncHttpR
                 com.koushikdutta.async.Util.writeAll(sink, bytes, next);
                 written += bytes.length;
                 
-                Assert.assertEquals(written, totalToWrite);
+                assert written == totalToWrite;
             }
         });
         c.start();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/Part.java b/AndroidAsync/src/com/koushikdutta/async/http/Part.java
index c6f5424..eb54991 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/Part.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/Part.java
@@ -1,16 +1,13 @@
 package com.koushikdutta.async.http;
 
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.apache.http.NameValuePair;
-
 import com.koushikdutta.async.DataSink;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.http.libcore.RawHeaders;
+import org.apache.http.NameValuePair;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
 
 public class Part {
     public static final String CONTENT_DISPOSITION = "Content-Disposition";
@@ -64,6 +61,6 @@ public class Part {
     }
     
     public void write(DataSink sink, CompletedCallback callback) {
-        Assert.fail();
+        assert false;
     }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java
index c04c2b4..e9f6a04 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpRequestBodyBase.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async.http.server;
 
-import junit.framework.Assert;
-
 import com.koushikdutta.async.FilteredDataEmitter;
 import com.koushikdutta.async.http.AsyncHttpRequest;
 import com.koushikdutta.async.http.AsyncHttpRequestBody;
@@ -14,7 +12,7 @@ public class AsyncHttpRequestBodyBase extends FilteredDataEmitter implements Asy
 
     @Override
     public void write(AsyncHttpRequest request, AsyncHttpResponse sink) {
-        Assert.fail();
+        assert false;
     }
 
     private String mContentType;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index eeb9f6f..77e92ef 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -1,36 +1,25 @@
 package com.koushikdutta.async.http.server;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import junit.framework.Assert;
 import android.content.Context;
-
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.AsyncServerSocket;
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.Util;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.ListenCallback;
-import com.koushikdutta.async.http.AsyncHttpGet;
-import com.koushikdutta.async.http.AsyncHttpPost;
-import com.koushikdutta.async.http.UrlEncodedFormBody;
-import com.koushikdutta.async.http.WebSocket;
-import com.koushikdutta.async.http.WebSocketImpl;
+import com.koushikdutta.async.http.*;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.libcore.RequestHeaders;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
 public class AsyncHttpServer {
     ArrayList<AsyncServerSocket> mListeners = new ArrayList<AsyncServerSocket>();
     public void stop() {
@@ -331,7 +320,7 @@ public class AsyncHttpServer {
     }
     
     public void directory(String regex, final File directory, final boolean list) {
-        Assert.assertTrue(directory.isDirectory());
+        assert directory.isDirectory();
         addAction("GET", regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index e69590f..1e93cd9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -1,25 +1,18 @@
 package com.koushikdutta.async.http.server;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-
-import junit.framework.Assert;
-
-import org.json.JSONObject;
-
-import com.koushikdutta.async.AsyncServer;
-import com.koushikdutta.async.AsyncSocket;
-import com.koushikdutta.async.BufferedDataSink;
-import com.koushikdutta.async.ByteBufferList;
-import com.koushikdutta.async.Util;
+import com.koushikdutta.async.*;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.WritableCallback;
 import com.koushikdutta.async.http.filter.ChunkedOutputFilter;
 import com.koushikdutta.async.http.libcore.RawHeaders;
 import com.koushikdutta.async.http.libcore.ResponseHeaders;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
 
 public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
     private RawHeaders mRawHeaders = new RawHeaders();
@@ -63,8 +56,8 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
         if (mHasWritten)
             return;
 
-        Assert.assertTrue(mContentLength < 0);
-        Assert.assertNotNull(mRawHeaders.getStatusLine());
+        assert mContentLength < 0;
+        assert null != mRawHeaders.getStatusLine();
         mRawHeaders.set("Transfer-Encoding", "Chunked");
         writeHead();
         mSink.setMaxBuffer(0);
@@ -73,7 +66,7 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
     }
 
     private void writeInternal(ByteBufferList bb) {
-        Assert.assertTrue(!mEnded);
+        assert !mEnded;
         initFirstWrite();
         mChunker.write(bb);
     }
@@ -115,14 +108,14 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
     private boolean mHeadWritten = false;
     @Override
     public void writeHead() {
-        Assert.assertFalse(mHeadWritten);
+        assert !mHeadWritten;
         mHeadWritten = true;
         mSink.write(ByteBuffer.wrap(mRawHeaders.toHeaderString().getBytes()));
     }
 
     @Override
     public void setContentType(String contentType) {
-        Assert.assertFalse(mHeadWritten);
+        assert !mHeadWritten;
         mRawHeaders.set("Content-Type", contentType);
     }
     
@@ -130,7 +123,7 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
         try {
             if (mRawHeaders.getStatusLine() == null)
                 responseCode(200);
-            Assert.assertTrue(mContentLength < 0);
+            assert mContentLength < 0;
             byte[] bytes = string.getBytes("UTF-8");
             mContentLength = bytes.length;
             mRawHeaders.set("Content-Length", Integer.toString(bytes.length));
@@ -141,7 +134,7 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
             onEnd();
         }
         catch (UnsupportedEncodingException e) {
-            Assert.fail();
+            assert false;
         }
     }
     
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
index a982c75..9a1d99d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java
@@ -1,13 +1,11 @@
 package com.koushikdutta.async.http.server;
 
-import java.nio.ByteBuffer;
-
-import junit.framework.Assert;
-
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.FilteredDataEmitter;
 
+import java.nio.ByteBuffer;
+
 public class BoundaryEmitter extends FilteredDataEmitter {
     private byte[] boundary;
     public void setBoundary(String boundary) {
@@ -21,12 +19,12 @@ public class BoundaryEmitter extends FilteredDataEmitter {
     }
     
     public String getBoundaryStart() {
-        Assert.assertNotNull(boundary);
+        assert boundary != null;
         return new String(boundary, 2, boundary.length - 2);
     }
     
     public String getBoundaryEnd() {
-        Assert.assertNotNull(boundary);
+        assert boundary != null;
         return getBoundaryStart() + "--\r\n";
     }
     
@@ -156,7 +154,7 @@ public class BoundaryEmitter extends FilteredDataEmitter {
 //                }
 //            }
             else {
-                Assert.fail();
+                assert false;
                 report(new Exception("Invalid multipart/form-data. Unknown state?"));
             }
         }