Merge pull request #4 from code77se/unit-tests

Unit tests

jq/src/main/java/se/code77/jq/JQ.java

@@ -298,10 +298,9 @@ public V call() throws Exception {
                             throw (Exception) cause;
                         } else {
                             // Promises can only rejected with
-                            // Exceptions, not
-                            // any Throwable. Simply wrap it.
-                            throw new Exception("Future threw a Throwable",
-                                    cause);
+                            // Exceptions, not any Throwable.
+                            // Simply throw the ExecutionException.
+                            throw e;
                         }
                     }
 
@@ -588,10 +587,13 @@ public final void checkStates(final List<Promise<V>> promises) {
             mFulfilledCount = 0;
             mRejectedCount = 0;
 
+            for (Promise<V> p : promises) {
+                mStates.add(p.inspect());
+            }
+
             for (int i = 0; i < promises.size(); i++) {
                 final int pos = i;
                 final Promise<V> p = promises.get(pos);
-                mStates.add(p.inspect());
 
                 p.then(new Promise.OnFulfilledCallback<V, Void>() {
                     @Override

jq/src/main/java/se/code77/jq/Promise.java

@@ -124,6 +124,24 @@ public static final class StateSnapshot<V> {
             this.reason = reason;
         }
 
+        @Override
+        public int hashCode() {
+            return state.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof StateSnapshot) {
+                StateSnapshot that = (StateSnapshot)o;
+
+                return state.equals(that.state) &&
+                        (value == null ? that.value == null : value.equals(that.value)) &&
+                        (reason == null ? that.reason == null : reason.equals(that.reason));
+            }
+
+            return false;
+        }
+
         @Override
         public String toString() {
             switch (state) {

jq/src/main/java/se/code77/jq/PromiseImpl.java

@@ -246,7 +246,7 @@ synchronized void _resolve(V value) {
         ensurePending();
 
         mState = new StateSnapshot<>(State.FULFILLED, value, null);
-        debug("fulfilled with value '" + value + "'");
+        info("fulfilled with value '" + value + "'");
         notify();
         handleCompletion();
     }
@@ -255,7 +255,7 @@ synchronized void _reject(Exception reason) {
         ensurePending();
 
         mState = new StateSnapshot<>(State.REJECTED, null, reason);
-        debug("rejected with reason '" + reason + "'");
+        info("rejected with reason '" + reason + "'");
         notify();
         handleCompletion();
     }
@@ -316,23 +316,30 @@ public void run() {
                 try {
                     Future<?> nextValue;
 
+                    debug("[" + mState + "]: Handling link " + link);
+
                     if (isRejected()) {
                         if (link.onRejectedCallback != null) {
                             nextValue = link.onRejectedCallback.onRejected(mState.reason);
+                            verbose("Link.onRejected returned " + nextValue);
                         } else {
+                            verbose("Link has no onRejected, forward to next promise");
                             link.nextPromise._reject(mState.reason);
                             return;
                         }
                     } else {
                         if (link.onFulfilledCallback != null) {
                             nextValue = link.onFulfilledCallback.onFulfilled(mState.value);
+                            verbose("Link.onFulfilled returned " + nextValue);
                         } else {
+                            verbose("Link has no onFulfilled, forward to next promise");
                             link.nextPromise._resolve(mState.value);
                             return;
                         }
                     }
 
                     if (nextValue != null) {
+                        verbose("Link returned future, next promise will inherit");
                         JQ.wrap(nextValue).then(new OnFulfilledCallback() {
                             @Override
                             public Future onFulfilled(Object value) throws Exception {
@@ -347,14 +354,15 @@ public Future onRejected(Exception reason) throws Exception {
                             }
                         }).done();
                     } else {
+                        verbose("Link returned null, next promise will resolve directly");
                         link.nextPromise._resolve(null);
                     }
                 } catch (UnhandledRejectionException e) {
                     throw e;
                 } catch (Exception reason) {
                     StringWriter sw = new StringWriter();
                     reason.printStackTrace(new PrintWriter(sw));
-                    debug("Promise rejected from callback: " + sw.toString());
+                    info("Promise rejected from callback: " + sw.toString());
 
                     link.nextPromise._reject(reason);
                 }
@@ -374,10 +382,18 @@ private String getLogPrefix() {
         return "Promise@" + Integer.toHexString(hashCode()) + ": ";
     }
 
+    private void verbose(String s) {
+        getLogger().verbose(getLogPrefix() + s);
+    }
+
     private void debug(String s) {
         getLogger().debug(getLogPrefix() + s);
     }
 
+    private void info(String s) {
+        getLogger().info(getLogPrefix() + s);
+    }
+
     private void warn(String s) {
         getLogger().warn(getLogPrefix() + s);
     }

jq/src/main/java/se/code77/jq/config/Config.java

@@ -38,6 +38,12 @@ public interface Dispatcher {
      * A logger creates log prints.
      */
     public interface Logger {
+        /**
+         * Print a debug log
+         * @param s log text
+         */
+        void verbose(String s);
+
         /**
          * Print a debug log
          * @param s log text
@@ -64,6 +70,7 @@ public interface Logger {
     }
 
     public enum LogLevel {
+        VERBOSE,
         DEBUG,
         INFO,
         WARN,

jq/src/main/java/se/code77/jq/config/android/AndroidConfig.java

@@ -52,6 +52,13 @@ private boolean hasLevel(LogLevel level) {
             return mLogLevel.ordinal() <= level.ordinal();
         }
 
+        @Override
+        public void verbose(String s) {
+            if (hasLevel(LogLevel.VERBOSE)) {
+                Log.v(LOG_TAG, s);
+            }
+        }
+
         @Override
         public void debug(String s) {
             if (hasLevel(LogLevel.DEBUG)) {