3 files changed, 19 insertions, 10 deletions

diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
index 148466a..8502704 100644
--- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
@@ -1,5 +1,6 @@
 package cz.crcs.ectester.common.output;
 
+import cz.crcs.ectester.common.cli.Colors;
 import cz.crcs.ectester.common.test.*;
 
 import java.io.PrintStream;
@@ -18,7 +19,7 @@ import java.util.Date;
 public abstract class BaseTextTestWriter implements TestWriter {
     private PrintStream output;
 
-    public static int BASE_WIDTH = 90;
+    public static int BASE_WIDTH = 105;
 
     public BaseTextTestWriter(PrintStream output) {
         this.output = output;
@@ -56,13 +57,21 @@ public abstract class BaseTextTestWriter implements TestWriter {
         Result result = t.getResult();
 
         StringBuilder out = new StringBuilder();
-        out.append(t.ok() ? " OK " : "NOK ");
+        out.append(t.ok() ? Colors.ok(" OK ") : Colors.error("NOK "));
         out.append(compound ? "┳ " : "━ ");
         int width = BASE_WIDTH - (prefix.length() + out.length());
         String widthSpec = "%-" + String.valueOf(width) + "s";
         out.append(String.format(widthSpec, t.getDescription()));
         out.append(" ┃ ");
-        out.append(String.format("%-9s", result.getValue().name()));
+        Colors.Foreground valueColor;
+        if (result.getValue().ok()) {
+            valueColor = Colors.Foreground.GREEN;
+        } else if (result.getValue().equals(Result.Value.ERROR)) {
+            valueColor = Colors.Foreground.RED;
+        } else {
+            valueColor = Colors.Foreground.YELLOW;
+        }
+        out.append(Colors.colored(String.format("%-9s", result.getValue().name()), Colors.Attribute.BOLD, valueColor));
         out.append(" ┃ ");
 
         if (compound) {
diff --git a/src/cz/crcs/ectester/reader/command/Command.java b/src/cz/crcs/ectester/reader/command/Command.java
index b3af731..858b05f 100644
--- a/src/cz/crcs/ectester/reader/command/Command.java
+++ b/src/cz/crcs/ectester/reader/command/Command.java
@@ -606,11 +606,11 @@ public abstract class Command implements Cloneable {
 
             String validity;
             if (transformation == EC_Consts.TRANSFORMATION_NONE) {
-                validity = "unchanged";
+                validity = "";
             } else {
-                validity = CardUtil.getTransformation(transformation);
+                validity = String.format("(%s point)", CardUtil.getTransformation(transformation));
             }
-            return String.format("%s of %s pubkey and %s privkey(%s point)", algo, pub, priv, validity);
+            return String.format("%s of %s pubkey and %s privkey%s", algo, pub, priv, validity);
         }
     }
 
@@ -666,11 +666,11 @@ public abstract class Command implements Cloneable {
 
             String validity;
             if (transformation == EC_Consts.TRANSFORMATION_NONE) {
-                validity = "unchanged";
+                validity = "";
             } else {
-                validity = CardUtil.getTransformation(transformation);
+                validity = String.format("(%s point)", CardUtil.getTransformation(transformation));
             }
-            return String.format("%s of external pubkey and %s privkey(%s point)", algo, priv, validity);
+            return String.format("%s of external pubkey and %s privkey%s", algo, priv, validity);
         }
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
index 3c56110..425fa06 100644
--- a/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
@@ -66,7 +66,7 @@ public class CardInvalidCurvesSuite extends CardTestSuite {
             }
             Test ecdsa = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Verify random ECDSA signature by invalid public points", ecdsaTests.toArray(new Test[0]));
 
-            Test tests = CompoundTest.all(Result.ExpectedValue.SUCCESS, ecdh, ecdsa);
+            Test tests = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Test ECDH and ECDSA with points on invalid curves.", ecdh, ecdsa);
 
             doTest(CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Invalid curve test of " + curve.getId(), prepare, tests));
             new Command.Cleanup(this.card).send();