Add list-suites option to both reader and standalone.

 - Also add support for specifying the key algo for KDF in standalone ECDH.
 - Add descriptions to standalone options.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
index 1b85f36..148466a 100644
--- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
@@ -27,7 +27,7 @@ public abstract class BaseTextTestWriter implements TestWriter {
     @Override
     public void begin(TestSuite suite) {
         output.println("═══ Running test suite: " + suite.getName() + " ═══");
-        for (String d : suite.getDescription().split("\n")) {
+        for (String d : suite.getDescription()) {
             output.println("═══ " + d);
         }
         DateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
diff --git a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
index 44037bf..4e0c236 100644
--- a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
@@ -39,7 +39,7 @@ public abstract class BaseXMLTestWriter implements TestWriter {
         doc = db.newDocument();
         Element rootElem = doc.createElement("testSuite");
         rootElem.setAttribute("name", suite.getName());
-        rootElem.setAttribute("desc", suite.getDescription());
+        rootElem.setAttribute("desc", suite.getTextDescription());
         DateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
         Date date = new Date();
         rootElem.setAttribute("date", dateFormat.format(date));
diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index 609e46d..cab2632 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -29,7 +29,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         testSuite = new LinkedHashMap<>();
         tests = new LinkedList<>();
         testSuite.put("name", suite.getName());
-        testSuite.put("desc", suite.getDescription());
+        testSuite.put("desc", suite.getTextDescription());
 
         DateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
         Date date = new Date();