Fixing timeout bug :(

jamesatha · jamesatha · commit 25bae3e26476 · 2017-02-17T16:58:22.000-08:00
diff --git a/src/main/java/com/algorithmia/algo/Algorithm.java b/src/main/java/com/algorithmia/algo/Algorithm.java
@@ -23,6 +23,7 @@ public final class Algorithm {
     private final HttpClient client;
     private final Map<String, String> options;
     private final AlgorithmOutputType outputType;
+    private static final long DEFAULT_TIMEOUT = 300L;
     final static Gson gson = new Gson();
 
     public Algorithm(HttpClient client, AlgorithmRef algoRef) {
@@ -54,12 +55,21 @@ public Algorithm setOption(String key, String value) {
     }
 
     public Algorithm setTimeout(Long timeout, TimeUnit unit) {
-        Long time = unit.convert(timeout, TimeUnit.SECONDS);
+        Long time = TimeUnit.SECONDS.convert(timeout, unit);
         Map<String, String> optionsClone = new HashMap<String, String>(options);
         optionsClone.put(AlgorithmOptions.TIMEOUT.toString(), time.toString());
         return new Algorithm(client, algoRef, optionsClone);
     }
 
+    public Long getTimeout() {
+        String key = AlgorithmOptions.TIMEOUT.toString();
+        if (options.containsKey(key)) {
+            return Long.parseLong(options.get(key));
+        }
+        return DEFAULT_TIMEOUT;
+
+    }
+
     public Algorithm setStdout(boolean showStdout) {
         Map<String, String> optionsClone = new HashMap<String, String>(options);
         optionsClone.put(AlgorithmOptions.STDOUT.toString(), Boolean.toString(showStdout));
diff --git a/src/test/java/AlgorithmTest.java b/src/test/java/AlgorithmTest.java
@@ -11,6 +11,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.*;
 
 public class AlgorithmTest {
 
@@ -87,4 +88,25 @@ public void algorithmSetOptions() throws Exception {
 
     }
 
+    @Test
+    public void algorithmCheckTimeout() throws Exception {
+        Algorithm algo = Algorithmia.client(key).algo("docs/JavaAddOne");
+
+        // Check default timeout - just for fun. This doesn't have to be specified at all time
+        // but I wanted to make sure this method never throws an exception when the key in the options
+        // is null.
+        Assert.assertEquals((long)300, (long)algo.getTimeout());
+
+        // Check Minute conversion
+        algo = algo.setTimeout(20L, TimeUnit.MINUTES);
+        Assert.assertEquals((long)20 * 60, (long)algo.getTimeout());
+
+        // And seconds just in case
+        algo = algo.setTimeout(30L, TimeUnit.SECONDS);
+        Assert.assertEquals((long)30, (long)algo.getTimeout());
+
+        // And milliseconds
+        algo = algo.setTimeout(5000L, TimeUnit.MILLISECONDS);
+        Assert.assertEquals((long)5, (long)algo.getTimeout());
+    }
 }
