11 files changed, 182 insertions, 0 deletions
diff --git a/test/optengine-tests/test_modelapi_invalid.json b/test/optengine-tests/test_modelapi_invalid.json
new file mode 100644
index 0000000..a58258e
--- /dev/null
+++ b/test/optengine-tests/test_modelapi_invalid.json
@@ -0,0 +1,13 @@
+{
+  "requestInfo": {
+    "transactinId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt"
+  },
+  "modelInfo": {
+    "modelId": "model2",
+    "solver": "mzn",
+    "description": "graph coloring problem for australia",
+    "modelContent": "int: nc;\r\nvar 1 .. nc: wa;   var 1 .. nc: nt;  var 1 .. nc: sa;   var 1 .. nc: q;\r\nvar 1 .. nc: nsw;  var 1 .. nc: v;   var 1 .. nc: t;\r\nconstraint wa != nt;\r\nconstraint wa != sa;\r\nconstraint nt != sa;\r\nconstraint nt != q;\r\nconstraint sa != q;\r\nconstraint sa != nsw;\r\nconstraint sa != v;\r\nconstraint q != nsw;\r\nconstraint nsw != v;\r\nsolve satisfy;\r\noutput [\r\n    \"wa=\\(wa)\\t nt=\\(nt)\\t sa=\\(sa)\\n\",\r\n    \"q=\\(q)\\t nsw=\\(nsw)\\t v=\\(v)\\n\",\r\n    \"t=\", show(t), \"\\n\"\r\n];"
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_modelapi_valid.json b/test/optengine-tests/test_modelapi_valid.json
new file mode 100644
index 0000000..1fbca5b
--- /dev/null
+++ b/test/optengine-tests/test_modelapi_valid.json
@@ -0,0 +1,13 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt"
+  },
+  "modelInfo": {
+    "modelId": "model2",
+    "solver": "mzn",
+    "description": "graph coloring problem for australia",
+    "modelContent": "int: nc;\r\nvar 1 .. nc: wa;   var 1 .. nc: nt;  var 1 .. nc: sa;   var 1 .. nc: q;\r\nvar 1 .. nc: nsw;  var 1 .. nc: v;   var 1 .. nc: t;\r\nconstraint wa != nt;\r\nconstraint wa != sa;\r\nconstraint nt != sa;\r\nconstraint nt != q;\r\nconstraint sa != q;\r\nconstraint sa != nsw;\r\nconstraint sa != v;\r\nconstraint q != nsw;\r\nconstraint nsw != v;\r\nsolve satisfy;\r\noutput [\r\n    \"wa=\\(wa)\\t nt=\\(nt)\\t sa=\\(sa)\\n\",\r\n    \"q=\\(q)\\t nsw=\\(nsw)\\t v=\\(v)\\n\",\r\n    \"t=\", show(t), \"\\n\"\r\n];"
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_invalid.json b/test/optengine-tests/test_optengine_invalid.json
new file mode 100644
index 0000000..9a0267a
--- /dev/null
+++ b/test/optengine-tests/test_optengine_invalid.json
@@ -0,0 +1,18 @@
+{
+  "requestInfo": {
+    "transactioId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "solver": "mzn",
+    "solverArgs": {
+      "solver": "geocode"
+    },
+    "modelContent": "int: nc;\r\nvar 1 .. nc: wa;   var 1 .. nc: nt;  var 1 .. nc: sa;   var 1 .. nc: q;\r\nvar 1 .. nc: nsw;  var 1 .. nc: v;   var 1 .. nc: t;\r\nconstraint wa != nt;\r\nconstraint wa != sa;\r\nconstraint nt != sa;\r\nconstraint nt != q;\r\nconstraint sa != q;\r\nconstraint sa != nsw;\r\nconstraint sa != v;\r\nconstraint q != nsw;\r\nconstraint nsw != v;\r\nsolve satisfy;\r\noutput [\r\n    \"wa=\\(wa)\\t nt=\\(nt)\\t sa=\\(sa)\\n\",\r\n    \"q=\\(q)\\t nsw=\\(nsw)\\t v=\\(v)\\n\",\r\n    \"t=\", show(t), \"\\n\"\r\n];",
+    "optData": {
+      "nc": 3
+    }
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_invalid2.json b/test/optengine-tests/test_optengine_invalid2.json
new file mode 100644
index 0000000..23c5a8e
--- /dev/null
+++ b/test/optengine-tests/test_optengine_invalid2.json
@@ -0,0 +1,15 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    
+    "solverArgs": {
+      "solver": "cbc"
+    },
+    "modelContent": "% Baking cakes for the school fete (with data file)\r\n\r\nint: flour;  %no. grams of flour available\r\nint: banana; %no. of bananas available\r\nint: sugar;  %no. grams of sugar available\r\nint: butter; %no. grams of butter available\r\nint: cocoa;  %no. grams of cocoa available\r\n\r\nconstraint assert(flour >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of flour should be non-negative\");\r\nconstraint assert(banana >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of banana should be non-negative\");\r\nconstraint assert(sugar >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of sugar should be non-negative\");\r\nconstraint assert(butter >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of butter should be non-negative\");\r\nconstraint assert(cocoa >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of cocoa should be non-negative\");\r\n\r\nvar 0..100: b; % no. of banana cakes\r\nvar 0..100: c; % no. of chocolate cakes\r\n\r\n% flour\r\nconstraint 250*b + 200*c <= flour;\r\n% bananas\r\nconstraint 2*b  <= banana;\r\n% sugar\r\nconstraint 75*b + 150*c <= sugar;\r\n% butter\r\nconstraint 100*b + 150*c <= butter;\r\n% cocoa\r\nconstraint 75*c <= cocoa;\r\n\r\n% maximize our profit\r\nsolve maximize 400*b + 450*c;\r\n\r\noutput [\"no. of banana cakes = \\(b)\\n\",\r\n        \"no. of chocolate cakes = \\(c)\\n\"];"
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_invalid_solver.json b/test/optengine-tests/test_optengine_invalid_solver.json
new file mode 100644
index 0000000..a967c16
--- /dev/null
+++ b/test/optengine-tests/test_optengine_invalid_solver.json
@@ -0,0 +1,15 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "solver": "apy",
+    "modelContent": "import sys\r\n\r\nif __name__ == \"__main__\":\r\n    print(sys.argv[1],sys.argv[2])\r\n\r\n    with open(sys.argv[2], \"wt\") as f:\r\n        f.write('{\"hello\":\"world\",\"another\":\"string\"}')\r\n\r\n",
+    "optData": {
+      "text": "flour = 8000; \r\nbanana = 11; \r\nsugar = 3000; \r\nbutter = 1500; \r\ncocoa = 800; "
+    }
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_modelId.json b/test/optengine-tests/test_optengine_modelId.json
new file mode 100644
index 0000000..b676d91
--- /dev/null
+++ b/test/optengine-tests/test_optengine_modelId.json
@@ -0,0 +1,19 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "modelId": "test",
+    "solverArgs": {
+      "solver": "geocode"
+    },
+    "optData": {
+      "json": {
+        "nc": 3
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_no_modelid.json b/test/optengine-tests/test_optengine_no_modelid.json
new file mode 100644
index 0000000..9a8c3a4
--- /dev/null
+++ b/test/optengine-tests/test_optengine_no_modelid.json
@@ -0,0 +1,24 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "solver": "mzn",
+    "solverArgs": {
+      "solver": "cbc"
+    },
+    "modelContent": "% Baking cakes for the school fete (with data file)\r\n\r\nint: flour;  %no. grams of flour available\r\nint: banana; %no. of bananas available\r\nint: sugar;  %no. grams of sugar available\r\nint: butter; %no. grams of butter available\r\nint: cocoa;  %no. grams of cocoa available\r\n\r\nconstraint assert(flour >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of flour should be non-negative\");\r\nconstraint assert(banana >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of banana should be non-negative\");\r\nconstraint assert(sugar >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of sugar should be non-negative\");\r\nconstraint assert(butter >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of butter should be non-negative\");\r\nconstraint assert(cocoa >= 0,\"Invalid datafile: \" ++\r\n                  \"Amount of cocoa should be non-negative\");\r\n\r\nvar 0..100: b; % no. of banana cakes\r\nvar 0..100: c; % no. of chocolate cakes\r\n\r\n% flour\r\nconstraint 250*b + 200*c <= flour;\r\n% bananas\r\nconstraint 2*b  <= banana;\r\n% sugar\r\nconstraint 75*b + 150*c <= sugar;\r\n% butter\r\nconstraint 100*b + 150*c <= butter;\r\n% cocoa\r\nconstraint 75*c <= cocoa;\r\n\r\n% maximize our profit\r\nsolve maximize 400*b + 450*c;\r\n\r\noutput [\"no. of banana cakes = \\(b)\\n\",\r\n        \"no. of chocolate cakes = \\(c)\\n\"];",
+    "optData": {
+      "json": {
+        "flour": 4000,
+        "banana": 6,
+        "sugar": 2000,
+        "butter": 500,
+        "cocoa": 500
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_no_optdata.json b/test/optengine-tests/test_optengine_no_optdata.json
new file mode 100644
index 0000000..f6645c8
--- /dev/null
+++ b/test/optengine-tests/test_optengine_no_optdata.json
@@ -0,0 +1,15 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "solver": "mzn",
+    "solverArgs": {
+      "solver": "geocode"
+    },
+    "modelContent": "int: nc;\r\nvar 1 .. nc: wa;   var 1 .. nc: nt;  var 1 .. nc: sa;   var 1 .. nc: q;\r\nvar 1 .. nc: nsw;  var 1 .. nc: v;   var 1 .. nc: t;\r\nconstraint wa != nt;\r\nconstraint wa != sa;\r\nconstraint nt != sa;\r\nconstraint nt != q;\r\nconstraint sa != q;\r\nconstraint sa != nsw;\r\nconstraint sa != v;\r\nconstraint q != nsw;\r\nconstraint nsw != v;\r\nsolve satisfy;\r\noutput [\r\n    \"wa=\\(wa)\\t nt=\\(nt)\\t sa=\\(sa)\\n\",\r\n    \"q=\\(q)\\t nsw=\\(nsw)\\t v=\\(v)\\n\",\r\n    \"t=\", show(t), \"\\n\"\r\n];"
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_solverid.json b/test/optengine-tests/test_optengine_solverid.json
new file mode 100644
index 0000000..bfd446c
--- /dev/null
+++ b/test/optengine-tests/test_optengine_solverid.json
@@ -0,0 +1,15 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "solver": "py",
+    "modelContent": "import sys\r\n\r\nif __name__ == \"__main__\":\r\n    print(sys.argv[1],sys.argv[2])\r\n\r\n    with open(sys.argv[2], \"wt\") as f:\r\n        f.write('{\"hello\":\"world\",\"another\":\"string\"}')\r\n\r\n",
+    "optData": {
+      "text": "flour = 8000; \r\nbanana = 11; \r\nsugar = 3000; \r\nbutter = 1500; \r\ncocoa = 800; "
+    }
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_optengine_valid.json b/test/optengine-tests/test_optengine_valid.json
new file mode 100644
index 0000000..8de2b71
--- /dev/null
+++ b/test/optengine-tests/test_optengine_valid.json
@@ -0,0 +1,20 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "solver": "mzn",
+    "solverArgs": {
+      "solver": "geocode"
+    },
+    "modelContent": "int: nc;\r\nvar 1 .. nc: wa;   var 1 .. nc: nt;  var 1 .. nc: sa;   var 1 .. nc: q;\r\nvar 1 .. nc: nsw;  var 1 .. nc: v;   var 1 .. nc: t;\r\nconstraint wa != nt;\r\nconstraint wa != sa;\r\nconstraint nt != sa;\r\nconstraint nt != q;\r\nconstraint sa != q;\r\nconstraint sa != nsw;\r\nconstraint sa != v;\r\nconstraint q != nsw;\r\nconstraint nsw != v;\r\nsolve satisfy;\r\noutput [\r\n    \"wa=\\(wa)\\t nt=\\(nt)\\t sa=\\(sa)\\n\",\r\n    \"q=\\(q)\\t nsw=\\(nsw)\\t v=\\(v)\\n\",\r\n    \"t=\", show(t), \"\\n\"\r\n];",
+    "optData": {
+      "json": {
+        "nc": 3
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/test/optengine-tests/test_py_optengine_valid.json b/test/optengine-tests/test_py_optengine_valid.json
new file mode 100644
index 0000000..bfd446c
--- /dev/null
+++ b/test/optengine-tests/test_py_optengine_valid.json
@@ -0,0 +1,15 @@
+{
+  "requestInfo": {
+    "transactionId": "xxx-xxx-xxxx",
+    "requestID": "yyy-yyy-yyyy",
+    "sourceId": "cmopt",
+    "timeout": 600
+  },
+  "optimInfo": {
+    "solver": "py",
+    "modelContent": "import sys\r\n\r\nif __name__ == \"__main__\":\r\n    print(sys.argv[1],sys.argv[2])\r\n\r\n    with open(sys.argv[2], \"wt\") as f:\r\n        f.write('{\"hello\":\"world\",\"another\":\"string\"}')\r\n\r\n",
+    "optData": {
+      "text": "flour = 8000; \r\nbanana = 11; \r\nsugar = 3000; \r\nbutter = 1500; \r\ncocoa = 800; "
+    }
+  }
+}
+\ No newline at end of file