From fa5ba0e0e0a3168fdbed27b9c21eada9bb9f1587 Mon Sep 17 00:00:00 2001 From: J08nY Date: Sat, 30 Mar 2024 11:12:17 +0100 Subject: Add more suites to tests. --- .../cz/crcs/ectester/standalone/ECTesterStandalone.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'standalone/src/main/java') diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java index 72ac87e..77eaf85 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java @@ -201,6 +201,7 @@ public class ECTesterStandalone { testOpts.addOption(bits); testOpts.addOption(namedCurve); testOpts.addOption(curveName); + testOpts.addOption(output); testOpts.addOption(Option.builder("gt").longOpt("kpg-type").desc("Set the KeyPairGenerator object [type].").hasArg().argName("type").optionalArg(false).build()); testOpts.addOption(Option.builder("kt").longOpt("ka-type").desc("Set the KeyAgreement object [type].").hasArg().argName("type").optionalArg(false).build()); testOpts.addOption(Option.builder("st").longOpt("sig-type").desc("Set the Signature object [type].").hasArg().argName("type").optionalArg(false).build()); @@ -755,19 +756,26 @@ public class ECTesterStandalone { /** * */ - private void test() throws TestException, ParserConfigurationException { + private void test() throws TestException, ParserConfigurationException, FileNotFoundException { + PrintStream out; + if (cli.hasOption("test.output")) { + out = new PrintStream(FileUtil.openStream(cli.getOptionValues("test.output"))); + } else { + out = System.out; + } + TestWriter writer; switch (cli.getOptionValue("test.format", "text").toLowerCase()) { case "yaml": case "yml": - writer = new YAMLTestWriter(System.out); + writer = new YAMLTestWriter(out); break; case "xml": - writer = new XMLTestWriter(System.out); + writer = new XMLTestWriter(out); break; case "text": default: - writer = new TextTestWriter(System.out); + writer = new TextTestWriter(out); break; } -- cgit v1.2.3-70-g09d2