Split test package into common.

4 files changed, 21 insertions, 15 deletions

diff --git a/src/cz/crcs/ectester/reader/output/TestWriter.java b/src/cz/crcs/ectester/reader/output/TestWriter.java
index 74c76fb..d79252d 100644
--- a/src/cz/crcs/ectester/reader/output/TestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TestWriter.java
@@ -1,6 +1,6 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.reader.test.Test;
+import cz.crcs.ectester.common.test.Test;
 import cz.crcs.ectester.reader.test.TestSuite;
 
 /**
diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
index bcebcd5..07b2a2f 100644
--- a/src/cz/crcs/ectester/reader/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -1,6 +1,8 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.reader.test.Test;
+import cz.crcs.ectester.common.test.CompoundTest;
+import cz.crcs.ectester.common.test.Test;
+import cz.crcs.ectester.reader.test.SimpleTest;
 import cz.crcs.ectester.reader.test.TestSuite;
 
 import java.io.PrintStream;
@@ -31,8 +33,8 @@ public class TextTestWriter implements TestWriter {
         }
 
         StringBuilder out = new StringBuilder();
-        if (t instanceof Test.Simple) {
-            Test.Simple test = (Test.Simple) t;
+        if (t instanceof SimpleTest) {
+            SimpleTest test = (SimpleTest) t;
             out.append(test.ok() ? "OK  " : "NOK ");
             out.append("━ ");
             int width = BASE_WIDTH - (offset + out.length());
@@ -43,7 +45,7 @@ public class TextTestWriter implements TestWriter {
             out.append(" ┃ ");
             out.append(respWriter.responseSuffix(test.getResponse()));
         } else {
-            Test.Compound test = (Test.Compound) t;
+            CompoundTest test = (CompoundTest) t;
             out.append(test.ok() ? "OK  " : "NOK ");
             out.append("┳ ");
             int width = BASE_WIDTH - (offset + out.length());
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index beb758c..f35e467 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -1,9 +1,11 @@
 package cz.crcs.ectester.reader.output;
 
+import cz.crcs.ectester.common.test.CompoundTest;
 import cz.crcs.ectester.reader.Util;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
-import cz.crcs.ectester.reader.test.Test;
+import cz.crcs.ectester.common.test.Test;
+import cz.crcs.ectester.reader.test.SimpleTest;
 import cz.crcs.ectester.reader.test.TestSuite;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -89,13 +91,13 @@ public class XMLTestWriter implements TestWriter {
     private Element testElement(Test t) {
         Element testElem = doc.createElement("test");
 
-        if (t instanceof Test.Simple) {
-            Test.Simple test = (Test.Simple) t;
+        if (t instanceof SimpleTest) {
+            SimpleTest test = (SimpleTest) t;
             testElem.setAttribute("type", "simple");
             testElem.appendChild(commandElement(test.getCommand()));
             testElem.appendChild(responseElement(test.getResponse()));
-        } else if (t instanceof Test.Compound) {
-            Test.Compound test = (Test.Compound) t;
+        } else if (t instanceof CompoundTest) {
+            CompoundTest test = (CompoundTest) t;
             testElem.setAttribute("type", "compound");
             for (Test innerTest : test.getTests()) {
                 testElem.appendChild(testElement(innerTest));
diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index 3b2b72d..15c0522 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -1,9 +1,11 @@
 package cz.crcs.ectester.reader.output;
 
+import cz.crcs.ectester.common.test.CompoundTest;
 import cz.crcs.ectester.reader.Util;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
-import cz.crcs.ectester.reader.test.Test;
+import cz.crcs.ectester.common.test.Test;
+import cz.crcs.ectester.reader.test.SimpleTest;
 import cz.crcs.ectester.reader.test.TestSuite;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
@@ -64,13 +66,13 @@ public class YAMLTestWriter implements TestWriter {
     private Map<String, Object> testObject(Test t) {
         Map<String, Object> testObj = new HashMap<>();
 
-        if (t instanceof Test.Simple) {
-            Test.Simple test = (Test.Simple) t;
+        if (t instanceof SimpleTest) {
+            SimpleTest test = (SimpleTest) t;
             testObj.put("type", "simple");
             testObj.put("command", commandObject(test.getCommand()));
             testObj.put("response", responseObject(test.getResponse()));
-        } else if (t instanceof Test.Compound) {
-            Test.Compound test = (Test.Compound) t;
+        } else if (t instanceof CompoundTest) {
+            CompoundTest test = (CompoundTest) t;
             testObj.put("type", "compound");
             List<Map<String, Object>> tests = new LinkedList<>();
             for (Test innerTest : test.getTests()) {