Interpreter cli (#14)

* Add test hierarchy

* Pass ZMI into interpreter

* Add runInterpreter task

* Ensure ZMI is modified after query execution

3 files changed, 224 insertions, 12 deletions

diff --git a/build.gradle b/build.gradle
index a3e64e4..498d29b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,10 +44,6 @@ application {
     mainClassName = 'pl.edu.mimuw.cloudatlas.interpreter.Main'
 }
 
-run {
-    standardInput = System.in
-}
-
 task runAgent(type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     main = 'pl.edu.mimuw.cloudatlas.agent.Agent'
@@ -62,3 +58,9 @@ task runFetcher(type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     main = 'pl.edu.mimuw.cloudatlas.fetcher.Fetcher'
 }
+
+task runInterpreter(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'pl.edu.mimuw.cloudatlas.interpreter.Main'
+    standardInput = System.in
+}
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java b/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java
index 6e0d5fe..ea9fdb1 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/interpreter/Main.java
@@ -52,14 +52,11 @@ import pl.edu.mimuw.cloudatlas.model.ValueTime;
 import pl.edu.mimuw.cloudatlas.model.ZMI;
 
 public class Main {
-    private static ZMI root;
-
     public static void main(String[] args) throws Exception {
-        runTest(System.in, System.out);
+        runTest(System.in, System.out, createTestHierarchy2());
     }
 
-    public static void runTest(InputStream in, PrintStream out) throws Exception {
-        root = createTestHierarchy();
+    public static void runTest(InputStream in, PrintStream out, ZMI root) throws Exception {
         Scanner scanner = new Scanner(in);
         scanner.useDelimiter("\\n");
         while(scanner.hasNext()) {
@@ -97,7 +94,7 @@ public class Main {
         }));
     }
 
-    private static ZMI createTestHierarchy() throws ParseException, UnknownHostException {
+    public static ZMI createTestHierarchy() throws ParseException, UnknownHostException {
         ValueContact violet07Contact = createContact("/uw/violet07", (byte)10, (byte)1, (byte)1, (byte)10);
         ValueContact khaki13Contact = createContact("/uw/khaki13", (byte)10, (byte)1, (byte)1, (byte)38);
         ValueContact khaki31Contact = createContact("/uw/khaki31", (byte)10, (byte)1, (byte)1, (byte)39);
@@ -106,7 +103,7 @@ public class Main {
 
         List<Value> list;
 
-        root = new ZMI();
+        ZMI root = new ZMI();
         root.getAttributes().add("level", new ValueInt(0l));
         root.getAttributes().add("name", new ValueString(null));
         root.getAttributes().add("owner", new ValueString("/uw/violet07"));
@@ -251,4 +248,191 @@ public class Main {
 
         return root;
     }
+
+    private static ZMI createTestHierarchy2() throws ParseException, UnknownHostException {
+        ValueContact violet07Contact = createContact("/uw/violet07", (byte)10, (byte)1, (byte)1, (byte)10);
+        ValueContact khaki13Contact = createContact("/uw/khaki13", (byte)10, (byte)1, (byte)1, (byte)38);
+        ValueContact khaki31Contact = createContact("/uw/khaki31", (byte)10, (byte)1, (byte)1, (byte)39);
+        ValueContact whatever01Contact = createContact("/uw/whatever01", (byte)82, (byte)111, (byte)52, (byte)56);
+        ValueContact whatever02Contact = createContact("/uw/whatever02", (byte)82, (byte)111, (byte)52, (byte)57);
+
+        List<Value> list;
+
+        ZMI root = new ZMI();
+        root.getAttributes().add("level", new ValueInt(0l));
+        root.getAttributes().add("name", new ValueString(null));
+        // root.getAttributes().add("owner", new ValueString("/uw/violet07"));
+        // root.getAttributes().add("timestamp", new ValueTime("2012/11/09 20:10:17.342"));
+        // root.getAttributes().add("contacts", new ValueSet(TypePrimitive.CONTACT));
+        // root.getAttributes().add("cardinality", new ValueInt(0l));
+
+        ZMI uw = new ZMI(root);
+        root.addSon(uw);
+        uw.getAttributes().add("level", new ValueInt(1l));
+        uw.getAttributes().add("name", new ValueString("uw"));
+        // uw.getAttributes().add("owner", new ValueString("/uw/violet07"));
+        // uw.getAttributes().add("timestamp", new ValueTime("2012/11/09 20:8:13.123"));
+        // uw.getAttributes().add("contacts", new ValueSet(TypePrimitive.CONTACT));
+        // uw.getAttributes().add("cardinality", new ValueInt(0l));
+
+        ZMI pjwstk = new ZMI(root);
+        root.addSon(pjwstk);
+        pjwstk.getAttributes().add("level", new ValueInt(1l));
+        pjwstk.getAttributes().add("name", new ValueString("pjwstk"));
+        // pjwstk.getAttributes().add("owner", new ValueString("/pjwstk/whatever01"));
+        // pjwstk.getAttributes().add("timestamp", new ValueTime("2012/11/09 20:8:13.123"));
+        // pjwstk.getAttributes().add("contacts", new ValueSet(TypePrimitive.CONTACT));
+        // pjwstk.getAttributes().add("cardinality", new ValueInt(0l));
+
+        ZMI violet07 = new ZMI(uw);
+        uw.addSon(violet07);
+        violet07.getAttributes().add("level", new ValueInt(2l));
+        violet07.getAttributes().add("name", new ValueString("violet07"));
+        violet07.getAttributes().add("owner", new ValueString("/uw/violet07"));
+        violet07.getAttributes().add("timestamp", new ValueTime("2012/11/09 18:00:00.000"));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            khaki31Contact, whatever01Contact
+        });
+        violet07.getAttributes().add("contacts", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        violet07.getAttributes().add("cardinality", new ValueInt(1l));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            violet07Contact,
+        });
+        violet07.getAttributes().add("members", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        violet07.getAttributes().add("creation", new ValueTime("2011/11/09 20:8:13.123"));
+        violet07.getAttributes().add("cpu_usage", new ValueDouble(0.9));
+        violet07.getAttributes().add("num_cores", new ValueInt(3l));
+        violet07.getAttributes().add("has_ups", new ValueBoolean(null));
+        list = Arrays.asList(new Value[] {
+            new ValueString("tola"), new ValueString("tosia"),
+        });
+        violet07.getAttributes().add("some_names", new ValueList(list, TypePrimitive.STRING));
+        violet07.getAttributes().add("expiry", new ValueDuration(13l, 12l, 0l, 0l, 0l));
+
+        ZMI khaki31 = new ZMI(uw);
+        uw.addSon(khaki31);
+        khaki31.getAttributes().add("level", new ValueInt(2l));
+        khaki31.getAttributes().add("name", new ValueString("khaki31"));
+        khaki31.getAttributes().add("owner", new ValueString("/uw/khaki31"));
+        khaki31.getAttributes().add("timestamp", new ValueTime("2012/11/09 20:03:00.000"));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            violet07Contact, whatever02Contact,
+        });
+        khaki31.getAttributes().add("contacts", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        khaki31.getAttributes().add("cardinality", new ValueInt(1l));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            khaki31Contact
+        });
+        khaki31.getAttributes().add("members", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        khaki31.getAttributes().add("creation", new ValueTime("2011/11/09 20:12:13.123"));
+        khaki31.getAttributes().add("cpu_usage", new ValueDouble(null));
+        khaki31.getAttributes().add("num_cores", new ValueInt(3l));
+        khaki31.getAttributes().add("has_ups", new ValueBoolean(false));
+        list = Arrays.asList(new Value[] {
+            new ValueString("agatka"), new ValueString("beatka"), new ValueString("celina"),
+        });
+        khaki31.getAttributes().add("some_names", new ValueList(list, TypePrimitive.STRING));
+        khaki31.getAttributes().add("expiry", new ValueDuration(-13l, -11l, 0l, 0l, 0l));
+
+        ZMI khaki13 = new ZMI(uw);
+        uw.addSon(khaki13);
+        khaki13.getAttributes().add("level", new ValueInt(2l));
+        khaki13.getAttributes().add("name", new ValueString("khaki13"));
+        khaki13.getAttributes().add("owner", new ValueString("/uw/khaki13"));
+        khaki13.getAttributes().add("timestamp", new ValueTime("2012/11/09 21:03:00.000"));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {});
+        khaki13.getAttributes().add("contacts", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        khaki13.getAttributes().add("cardinality", new ValueInt(1l));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            khaki13Contact,
+        });
+        khaki13.getAttributes().add("members", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        khaki13.getAttributes().add("creation", new ValueTime((Long)null));
+        khaki13.getAttributes().add("cpu_usage", new ValueDouble(0.1));
+        khaki13.getAttributes().add("num_cores", new ValueInt(null));
+        khaki13.getAttributes().add("has_ups", new ValueBoolean(true));
+        list = Arrays.asList(new Value[] {});
+        khaki13.getAttributes().add("some_names", new ValueList(list, TypePrimitive.STRING));
+        khaki13.getAttributes().add("expiry", new ValueDuration((Long)null));
+
+        ZMI whatever01 = new ZMI(pjwstk);
+        pjwstk.addSon(whatever01);
+        whatever01.getAttributes().add("level", new ValueInt(2l));
+        whatever01.getAttributes().add("name", new ValueString("whatever01"));
+        whatever01.getAttributes().add("owner", new ValueString("/pjwstk/whatever01"));
+        whatever01.getAttributes().add("timestamp", new ValueTime("2012/11/09 21:12:00.000"));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            violet07Contact, whatever02Contact,
+        });
+        whatever01.getAttributes().add("contacts", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        whatever01.getAttributes().add("cardinality", new ValueInt(1l));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            whatever01Contact,
+        });
+        whatever01.getAttributes().add("members", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        whatever01.getAttributes().add("creation", new ValueTime("2012/10/18 07:03:00.000"));
+        whatever01.getAttributes().add("cpu_usage", new ValueDouble(0.1));
+        whatever01.getAttributes().add("num_cores", new ValueInt(7l));
+        whatever01.getAttributes().add("num_processes", new ValueInt(215l));
+        list = Arrays.asList(new Value[] {
+            new ValueString("rewrite")
+        });
+        whatever01.getAttributes().add("php_modules", new ValueList(list, TypePrimitive.STRING));
+
+        ZMI whatever02 = new ZMI(pjwstk);
+        pjwstk.addSon(whatever02);
+        whatever02.getAttributes().add("level", new ValueInt(2l));
+        whatever02.getAttributes().add("name", new ValueString("whatever02"));
+        whatever02.getAttributes().add("owner", new ValueString("/pjwstk/whatever02"));
+        whatever02.getAttributes().add("timestamp", new ValueTime("2012/11/09 21:13:00.000"));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            khaki31Contact, whatever01Contact,
+        });
+        whatever02.getAttributes().add("contacts", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        whatever02.getAttributes().add("cardinality", new ValueInt(1l));
+        // TODO: ogarnąć co tu powinno być
+        /*
+        list = Arrays.asList(new Value[] {
+            whatever02Contact,
+        });
+        whatever02.getAttributes().add("members", new ValueSet(new HashSet<Value>(list), TypePrimitive.CONTACT));
+        */
+        whatever02.getAttributes().add("creation", new ValueTime("2012/10/18 07:04:00.000"));
+        whatever02.getAttributes().add("cpu_usage", new ValueDouble(0.4));
+        whatever02.getAttributes().add("num_cores", new ValueInt(13l));
+        whatever02.getAttributes().add("num_processes", new ValueInt(222l));
+        list = Arrays.asList(new Value[] {
+            new ValueString("odbc")
+        });
+        whatever02.getAttributes().add("php_modules", new ValueList(list, TypePrimitive.STRING));
+
+        return root;
+    }
 }
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/interpreter/InterpreterTests.java b/src/test/java/pl/edu/mimuw/cloudatlas/interpreter/InterpreterTests.java
index 20f7c2e..1794cf9 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/interpreter/InterpreterTests.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/interpreter/InterpreterTests.java
@@ -2,15 +2,38 @@ package pl.edu.mimuw.cloudatlas.interpreter;
 
 import java.io.PrintStream;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.io.File;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.net.URL;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
 
+import pl.edu.mimuw.cloudatlas.model.AttributesMap;
+import pl.edu.mimuw.cloudatlas.model.ValueTime;
+import pl.edu.mimuw.cloudatlas.model.ZMI;
+
 public class InterpreterTests {
     @Test
+    public void modifiesZmi() throws Exception {
+        ZMI root = Main.createTestHierarchy();
+        InputStream in = new ByteArrayInputStream("SELECT epoch() AS timestamp".getBytes("UTF-8"));
+        ByteArrayOutputStream outByteArray = new ByteArrayOutputStream();
+        PrintStream outPrint = new PrintStream(outByteArray);
+        Main.runTest(in, outPrint, root);
+
+        AttributesMap rootAttributes = root.getAttributes();
+        assertEquals(new ValueTime("2000/01/01 00:00:00.000"), rootAttributes.get("timestamp"));
+
+        for (ZMI son : root.getSons()) {
+            AttributesMap sonAttributes = son.getAttributes();
+            assertEquals(new ValueTime("2000/01/01 00:00:00.000"), sonAttributes.get("timestamp"));
+        }
+    }
+
+    @Test
     public void fileTest01() throws Exception {
         runFileTest(1);
     }
@@ -112,7 +135,10 @@ public class InterpreterTests {
         FileInputStream in = new FileInputStream(test.getFile());
         ByteArrayOutputStream outByteArray = new ByteArrayOutputStream();
         PrintStream outPrint = new PrintStream(outByteArray);
-        Main.runTest(in, outPrint);
+
+        ZMI root = Main.createTestHierarchy();
+        Main.runTest(in, outPrint, root);
+
         String actual = outByteArray.toString();
 
         File expectedFile = new File(testOut.getFile());