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.

6 files changed, 19 insertions, 13 deletions

diff --git a/src/cz/crcs/ectester/common/cli/CLITools.java b/src/cz/crcs/ectester/common/cli/CLITools.java
index 91f121f..4aa58b0 100644
--- a/src/cz/crcs/ectester/common/cli/CLITools.java
+++ b/src/cz/crcs/ectester/common/cli/CLITools.java
@@ -37,7 +37,8 @@ public class CLITools {
             }
             tp.getParsers().forEach((key, value) -> {
                 pw.println();
-                help.printWrapped(pw, HelpFormatter.DEFAULT_WIDTH, String.format("%" + depth + "s" + key + ":", " "));
+                String description = value.getDescription() == null ? "" : "    | " + value.getDescription() + " |";
+                help.printWrapped(pw, HelpFormatter.DEFAULT_WIDTH, String.format("%" + depth + "s" + key + ":" + description, " "));
                 CLITools.help(help, pw, value.getParser(), value.getOptions(), depth + 1);
             });
         }
diff --git a/src/cz/crcs/ectester/common/cli/ParserOptions.java b/src/cz/crcs/ectester/common/cli/ParserOptions.java
index ee2097e..7300cbb 100644
--- a/src/cz/crcs/ectester/common/cli/ParserOptions.java
+++ b/src/cz/crcs/ectester/common/cli/ParserOptions.java
@@ -3,25 +3,22 @@ package cz.crcs.ectester.common.cli;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.Options;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class ParserOptions {
     private CommandLineParser parser;
     private Options options;
-    private List<Argument> arguments;
+    private String description;
 
     public ParserOptions(CommandLineParser parser, Options options) {
         this.parser = parser;
         this.options = options;
     }
 
-    public ParserOptions(CommandLineParser parser, Options options, List<Argument> arguments) {
+    public ParserOptions(CommandLineParser parser, Options options, String description) {
         this(parser, options);
-        this.arguments = arguments;
+        this.description = description;
     }
 
     public CommandLineParser getParser() {
@@ -32,7 +29,7 @@ public class ParserOptions {
         return options;
     }
 
-    public List<Argument> getArguments() {
-        return Collections.unmodifiableList(arguments);
+    public String getDescription() {
+        return description;
     }
 }
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();
diff --git a/src/cz/crcs/ectester/common/test/TestSuite.java b/src/cz/crcs/ectester/common/test/TestSuite.java
index c8bb3f8..5f26f52 100644
--- a/src/cz/crcs/ectester/common/test/TestSuite.java
+++ b/src/cz/crcs/ectester/common/test/TestSuite.java
@@ -69,8 +69,16 @@ public abstract class TestSuite {
         return name;
     }
 
-    public String getDescription() {
+    public String[] getDescription() {
+        return description;
+    }
+
+    public String getTextDescription() {
         return String.join(System.lineSeparator(), description);
     }
 
+    public String toString() {
+        return null;
+    }
+
 }