Fix Java concoredocker to match Python behavior

Author: avinxshKD

concoredocker.java

@@ -16,6 +16,7 @@ public class concoredocker {
     private static String inpath = "/in";
     private static String outpath = "/out";
     private static Map<String, Object> params = new HashMap<>();
+    private static int simtime = 0;
     private static int maxtime;
 
     public static void main(String[] args) {
@@ -63,19 +64,19 @@ private static Map<String, Object> parseFile(String filename) throws IOException
     private static void defaultMaxTime(int defaultValue) {
         try {
             String content = new String(Files.readAllBytes(Paths.get(inpath + "1/concore.maxtime")));
-            // changed assumption from map to list for maxtime, as it usually represents a list of time steps
-            maxtime = ((List<?>) literalEval(content)).size(); 
-        } catch (IOException e) {
+            maxtime = ((Number) literalEval(content)).intValue();
+        } catch (Exception e) {
             maxtime = defaultValue;
         }
     }
 
-    private static void unchanged() {
+    private static boolean unchanged() {
         if (olds.equals(s)) {
             s = "";
-        } else {
-            olds = s;
+            return true;
         }
+        olds = s;
+        return false;
     }
 
     private static Object tryParam(String n, Object i) {
@@ -95,9 +96,13 @@ private static Object read(int port, String name, String initstr) {
                 retrycount++;
             }
             s += ins;
-            Object[] inval = ((List<?>) literalEval(ins)).toArray(); // FIXED: Casted to List, converted to Array
-            int simtime = Math.max((int) inval[0], 0); // assuming simtime is an integer
-            return inval[1];
+            List<?> inval = (List<?>) literalEval(ins);
+            simtime = Math.max(simtime, ((Number) inval.get(0)).intValue());
+            Object[] val = new Object[inval.size() - 1];
+            for (int i = 1; i < inval.size(); i++) {
+                val[i - 1] = inval.get(i);
+            }
+            return val;
         } catch (IOException | InterruptedException | ClassCastException e) {
             return initstr;
         }
@@ -110,20 +115,21 @@ private static void write(int port, String name, Object val, int delta) {
             if (val instanceof String) {
                 Thread.sleep(2 * delay);
             } else if (!(val instanceof Object[])) {
-                System.out.println("mywrite must have list or str");
-                System.exit(1);
+                System.out.println("write must have list or str");
+                return;
             }
             if (val instanceof Object[]) {
                 Object[] arrayVal = (Object[]) val;
                 content.append("[")
-                        .append(maxtime + delta)
+                        .append(simtime + delta)
                         .append(",")
                         .append(arrayVal[0]);
                 for (int i = 1; i < arrayVal.length; i++) {
                     content.append(",")
                             .append(arrayVal[i]);
                 }
                 content.append("]");
+                simtime += delta;
             } else {
                 content.append(val);
             }
@@ -134,13 +140,14 @@ private static void write(int port, String name, Object val, int delta) {
     }
 
     private static Object[] initVal(String simtimeVal) {
-        int simtime = 0;
         Object[] val = new Object[] {};
         try {
-            Object[] arrayVal = ((List<?>) literalEval(simtimeVal)).toArray(); // FIXED: Casted to List, converted to Array
-            simtime = (int) arrayVal[0]; // assuming simtime is an integer
-            val = new Object[arrayVal.length - 1];
-            System.arraycopy(arrayVal, 1, val, 0, val.length);
+            List<?> inval = (List<?>) literalEval(simtimeVal);
+            simtime = ((Number) inval.get(0)).intValue();
+            val = new Object[inval.size() - 1];
+            for (int i = 1; i < inval.size(); i++) {
+                val[i - 1] = inval.get(i);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

requirements-dev.txt

@@ -1,2 +1,2 @@
 pytest>=7.0.0
-pytest-cov>=4.0.0
+pytest-cov>=4.0.0

tests/test_concoredocker.py

@@ -0,0 +1,124 @@
+import os
+import sys
+import tempfile
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+import concoredocker
+
+def test_safe_literal_eval_dict():
+    f = tempfile.NamedTemporaryFile(mode='w', delete=False)
+    f.write("{'a': 1, 'b': 2}")
+    f.close()
+    result = concoredocker.safe_literal_eval(f.name, {})
+    os.unlink(f.name)
+    assert result == {'a': 1, 'b': 2}
+
+def test_safe_literal_eval_list():
+    f = tempfile.NamedTemporaryFile(mode='w', delete=False)
+    f.write("[1, 2, 3]")
+    f.close()
+    result = concoredocker.safe_literal_eval(f.name, [])
+    os.unlink(f.name)
+    assert result == [1, 2, 3]
+
+def test_safe_literal_eval_missing():
+    result = concoredocker.safe_literal_eval("/nonexistent.txt", {'default': True})
+    assert result == {'default': True}
+
+def test_safe_literal_eval_bad_syntax():
+    f = tempfile.NamedTemporaryFile(mode='w', delete=False)
+    f.write("not valid {{{")
+    f.close()
+    result = concoredocker.safe_literal_eval(f.name, "fallback")
+    os.unlink(f.name)
+    assert result == "fallback"
+
+def test_initval():
+    concoredocker.simtime = 0
+    result = concoredocker.initval("[5.0, 1.0, 2.0]")
+    assert result == [1.0, 2.0]
+    assert concoredocker.simtime == 5.0
+
+def test_initval_single():
+    concoredocker.simtime = 0
+    result = concoredocker.initval("[10.0, 99]")
+    assert result == [99]
+    assert concoredocker.simtime == 10.0
+
+def test_unchanged_true():
+    concoredocker.s = "abc"
+    concoredocker.olds = "abc"
+    assert concoredocker.unchanged() == True
+    assert concoredocker.s == ''
+
+def test_unchanged_false():
+    concoredocker.s = "new"
+    concoredocker.olds = "old"
+    assert concoredocker.unchanged() == False
+    assert concoredocker.olds == "new"
+
+def test_write_list():
+    tmpdir = tempfile.mkdtemp()
+    outdir = os.path.join(tmpdir, "out1")
+    os.makedirs(outdir)
+    old_outpath = concoredocker.outpath
+    concoredocker.outpath = os.path.join(tmpdir, "out")
+    concoredocker.simtime = 5.0
+    
+    concoredocker.write(1, "testfile", [1.0, 2.0], delta=0)
+    
+    with open(os.path.join(outdir, "testfile")) as f:
+        content = f.read()
+    assert content == "[5.0, 1.0, 2.0]"
+    concoredocker.outpath = old_outpath
+    
+def test_write_delta():
+    tmpdir = tempfile.mkdtemp()
+    outdir = os.path.join(tmpdir, "out1")
+    os.makedirs(outdir)
+    old_outpath = concoredocker.outpath
+    concoredocker.outpath = os.path.join(tmpdir, "out")
+    concoredocker.simtime = 10.0
+    
+    concoredocker.write(1, "testfile", [3.0], delta=2)
+    
+    with open(os.path.join(outdir, "testfile")) as f:
+        content = f.read()
+    assert content == "[12.0, 3.0]"
+    assert concoredocker.simtime == 12.0
+    concoredocker.outpath = old_outpath
+
+def test_read_file():
+    tmpdir = tempfile.mkdtemp()
+    indir = os.path.join(tmpdir, "in1")
+    os.makedirs(indir)
+    old_inpath = concoredocker.inpath
+    concoredocker.inpath = os.path.join(tmpdir, "in")
+    concoredocker.delay = 0.001
+    
+    with open(os.path.join(indir, "data"), 'w') as f:
+        f.write("[7.0, 100, 200]")
+    
+    concoredocker.s = ''
+    concoredocker.simtime = 0
+    result = concoredocker.read(1, "data", "[0, 0, 0]")
+    
+    assert result == [100, 200]
+    assert concoredocker.simtime == 7.0
+    concoredocker.inpath = old_inpath
+    concoredocker.delay = 1
+
+def test_read_missing():
+    tmpdir = tempfile.mkdtemp()
+    indir = os.path.join(tmpdir, "in1")
+    os.makedirs(indir)
+    old_inpath = concoredocker.inpath
+    concoredocker.inpath = os.path.join(tmpdir, "in")
+    concoredocker.delay = 0.001
+    
+    concoredocker.s = ''
+    concoredocker.simtime = 0
+    result = concoredocker.read(1, "nofile", "[0, 5, 5]")
+    assert result == [5, 5]
+    concoredocker.inpath = old_inpath
+    concoredocker.delay = 1