From a2f5316ad96b6e78844c371f8dd5483095cf4af3 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sun, 12 Nov 2017 12:38:04 +0100
Subject: Introduce ECTesterStandalone.

---
 .../crcs/ectester/common/output/OutputLogger.java  | 62 ++++++++++++++++++++++
 src/cz/crcs/ectester/common/test/Result.java       |  4 +-
 src/cz/crcs/ectester/common/test/Test.java         |  2 +-
 src/cz/crcs/ectester/common/test/Testable.java     |  4 +-
 src/cz/crcs/ectester/reader/ECTesterReader.java    |  1 +
 .../crcs/ectester/reader/output/OutputLogger.java  | 60 ---------------------
 .../ectester/standalone/ECTesterStandalone.java    | 13 +++++
 7 files changed, 82 insertions(+), 64 deletions(-)
 create mode 100644 src/cz/crcs/ectester/common/output/OutputLogger.java
 delete mode 100644 src/cz/crcs/ectester/reader/output/OutputLogger.java
 create mode 100644 src/cz/crcs/ectester/standalone/ECTesterStandalone.java

(limited to 'src')

diff --git a/src/cz/crcs/ectester/common/output/OutputLogger.java b/src/cz/crcs/ectester/common/output/OutputLogger.java
new file mode 100644
index 0000000..b876c5b
--- /dev/null
+++ b/src/cz/crcs/ectester/common/output/OutputLogger.java
@@ -0,0 +1,62 @@
+package cz.crcs.ectester.common.output;
+
+import cz.crcs.ectester.reader.output.TeeOutputStream;
+
+import java.io.*;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author Petr Svenda petr@svenda.com
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class OutputLogger {
+    private OutputStream out;
+    private PrintStream print;
+
+    public OutputLogger(boolean systemOut, String... filePaths) throws IOException {
+        List<OutputStream> streams = new LinkedList<>();
+        for (String filePath : filePaths) {
+            if (filePath != null) {
+                streams.add(new FileOutputStream(filePath));
+            }
+        }
+        if (systemOut) {
+            streams.add(System.out);
+        }
+        this.out = new TeeOutputStream(streams.toArray(new OutputStream[0]));
+        this.print = new PrintStream(this.out);
+    }
+
+    public OutputLogger(String filePath) throws IOException {
+        this(true, filePath);
+    }
+
+    public OutputStream getOutputStream() {
+        return this.out;
+    }
+
+    public PrintStream getPrintStream() {
+        return this.print;
+    }
+
+    public void println() {
+        print.println();
+    }
+
+    public void println(String logLine) {
+        print.println(logLine);
+    }
+
+    public void print(String logLine) {
+        print.print(logLine);
+    }
+
+    public void flush() {
+        print.flush();
+    }
+
+    public void close() {
+        print.close();
+    }
+}
diff --git a/src/cz/crcs/ectester/common/test/Result.java b/src/cz/crcs/ectester/common/test/Result.java
index 523a9d7..11fcb4d 100644
--- a/src/cz/crcs/ectester/common/test/Result.java
+++ b/src/cz/crcs/ectester/common/test/Result.java
@@ -46,7 +46,7 @@ public class Result {
     }
 
     /**
-     *
+     * A result value of a Test.
      */
     public enum Value {
         SUCCESS(true),
@@ -86,7 +86,7 @@ public class Result {
     }
 
     /**
-     *
+     * A possible expected value result of a Test.
      */
     public enum ExpectedValue {
         SUCCESS,
diff --git a/src/cz/crcs/ectester/common/test/Test.java b/src/cz/crcs/ectester/common/test/Test.java
index 8c025b8..5973d0f 100644
--- a/src/cz/crcs/ectester/common/test/Test.java
+++ b/src/cz/crcs/ectester/common/test/Test.java
@@ -7,7 +7,7 @@ import static cz.crcs.ectester.common.test.Result.Value;
  *
  * @author Jan Jancar johny@neuromancer.sk
  */
-public abstract class Test {
+public abstract class Test implements Testable {
     protected boolean hasRun = false;
     protected Result result;
 
diff --git a/src/cz/crcs/ectester/common/test/Testable.java b/src/cz/crcs/ectester/common/test/Testable.java
index e033b0a..d05d31e 100644
--- a/src/cz/crcs/ectester/common/test/Testable.java
+++ b/src/cz/crcs/ectester/common/test/Testable.java
@@ -1,13 +1,15 @@
 package cz.crcs.ectester.common.test;
 
 /**
- *
  * @author Jan Jancar johny@neuromancer.sk
  */
 public interface Testable {
 
     boolean hasRun();
+
     void run() throws TestException;
+
     boolean ok();
+
     boolean error();
 }
diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index 786ab05..99b2f83 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -26,6 +26,7 @@ import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.ec.EC_Category;
 import cz.crcs.ectester.common.ec.EC_Data;
 import cz.crcs.ectester.common.ec.EC_Params;
+import cz.crcs.ectester.common.output.OutputLogger;
 import cz.crcs.ectester.common.test.TestException;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.command.Command;
diff --git a/src/cz/crcs/ectester/reader/output/OutputLogger.java b/src/cz/crcs/ectester/reader/output/OutputLogger.java
deleted file mode 100644
index bf47a1f..0000000
--- a/src/cz/crcs/ectester/reader/output/OutputLogger.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cz.crcs.ectester.reader.output;
-
-import java.io.*;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author Petr Svenda petr@svenda.com
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class OutputLogger {
-    private OutputStream out;
-    private PrintStream print;
-
-    public OutputLogger(boolean systemOut, String... filePaths) throws IOException {
-        List<OutputStream> streams = new LinkedList<>();
-        for (String filePath : filePaths) {
-            if (filePath != null) {
-                streams.add(new FileOutputStream(filePath));
-            }
-        }
-        if (systemOut) {
-            streams.add(System.out);
-        }
-        this.out = new TeeOutputStream(streams.toArray(new OutputStream[0]));
-        this.print = new PrintStream(this.out);
-    }
-
-    public OutputLogger(String filePath) throws IOException {
-        this(true, filePath);
-    }
-
-    public OutputStream getOutputStream() {
-        return this.out;
-    }
-
-    public PrintStream getPrintStream() {
-        return this.print;
-    }
-
-    public void println() {
-        print.println();
-    }
-
-    public void println(String logLine) {
-        print.println(logLine);
-    }
-
-    public void print(String logLine) {
-        print.print(logLine);
-    }
-
-    public void flush() {
-        print.flush();
-    }
-
-    public void close() {
-        print.close();
-    }
-}
diff --git a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
new file mode 100644
index 0000000..cae4bb9
--- /dev/null
+++ b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -0,0 +1,13 @@
+package cz.crcs.ectester.standalone;
+
+public class ECTesterStandalone {
+
+    private void run(String[] args) {
+
+    }
+
+    public static void main(String[] args) {
+        ECTesterStandalone app = new ECTesterStandalone();
+        app.run(args);
+    }
+}
-- 
cgit v1.2.3-70-g09d2