From 7302ddf38c3cc322b76bbba83a0ba6943cb16bf5 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Wed, 6 Dec 2017 01:22:48 +0100
Subject: Fix CommandTest getDescription.

---
 src/cz/crcs/ectester/common/test/BaseTestable.java |  3 +-
 src/cz/crcs/ectester/reader/command/Command.java   | 67 +++++++++++++++++++++-
 src/cz/crcs/ectester/reader/test/CommandTest.java  |  6 +-
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/src/cz/crcs/ectester/common/test/BaseTestable.java b/src/cz/crcs/ectester/common/test/BaseTestable.java
index 6a63b13..f8ebf48 100644
--- a/src/cz/crcs/ectester/common/test/BaseTestable.java
+++ b/src/cz/crcs/ectester/common/test/BaseTestable.java
@@ -2,6 +2,7 @@ package cz.crcs.ectester.common.test;
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -11,7 +12,7 @@ public abstract class BaseTestable implements Testable {
     protected boolean ok;
     protected boolean error;
 
-    protected Map<String, Object> meta;
+    protected Map<String, Object> meta = new TreeMap<>();
 
     @Override
     public boolean hasRun() {
diff --git a/src/cz/crcs/ectester/reader/command/Command.java b/src/cz/crcs/ectester/reader/command/Command.java
index b60db53..922a33a 100644
--- a/src/cz/crcs/ectester/reader/command/Command.java
+++ b/src/cz/crcs/ectester/reader/command/Command.java
@@ -214,13 +214,19 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Allocate(response, elapsed, keyPair, keyLength, keyClass);
         }
+
+        @Override
+        public String toString() {
+            return "Allocate";
+        }
     }
-    
-    public static class AllocateKeyAgreement extends Command {
 
+    /**
+     *
+     */
+    public static class AllocateKeyAgreement extends Command {
         private byte kaType;
 
-
         /**
          * Creates the INS_ALLOCATE_KA instruction.
          *
@@ -241,6 +247,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.AllocateKeyAgreement(response, elapsed, kaType);
         }
+
+        @Override
+        public String toString() {
+            return "AllocateKeyAgreement";
+        }
     }    
 
     /**
@@ -267,6 +278,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Clear(response, elapsed, keyPair);
         }
+
+        @Override
+        public String toString() {
+            return "Clear";
+        }
     }
 
     /**
@@ -311,6 +327,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Set(response, elapsed, keyPair, curve, params);
         }
+
+        @Override
+        public String toString() {
+            return "Set";
+        }
     }
 
     /**
@@ -350,6 +371,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Corrupt(response, elapsed, keyPair, key, params, corruption);
         }
+
+        @Override
+        public String toString() {
+            return "Corrupt";
+        }
     }
 
     /**
@@ -378,6 +404,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Generate(response, elapsed, keyPair);
         }
+
+        @Override
+        public String toString() {
+            return "Generate";
+        }
     }
 
     /**
@@ -415,6 +446,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Export(response, elapsed, keyPair, key, params);
         }
+
+        @Override
+        public String toString() {
+            return "Export";
+        }
     }
 
     /**
@@ -458,6 +494,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.ECDH(response, elapsed, pubkey, privkey, export, corruption, type);
         }
+
+        @Override
+        public String toString() {
+            return "ECDH";
+        }
     }
 
     /**
@@ -503,6 +544,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.ECDH(response, elapsed, ECTesterApplet.KEYPAIR_REMOTE, privkey, export, corruption, type);
         }
+
+        @Override
+        public String toString() {
+            return "ECDH_direct";
+        }
     }
 
     public static class ECDSA extends Command {
@@ -541,6 +587,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.ECDSA(response, elapsed, keyPair, export, raw);
         }
+
+        @Override
+        public String toString() {
+            return "ECDSA";
+        }
     }
 
     /**
@@ -564,6 +615,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Cleanup(response, elapsed);
         }
+
+        @Override
+        public String toString() {
+            return "Cleanup";
+        }
     }
 
     /**
@@ -587,6 +643,11 @@ public abstract class Command {
             elapsed += System.nanoTime();
             return new Response.Support(response, elapsed);
         }
+
+        @Override
+        public String toString() {
+            return "Support";
+        }
     }
 }
 
diff --git a/src/cz/crcs/ectester/reader/test/CommandTest.java b/src/cz/crcs/ectester/reader/test/CommandTest.java
index e88f476..a08d820 100644
--- a/src/cz/crcs/ectester/reader/test/CommandTest.java
+++ b/src/cz/crcs/ectester/reader/test/CommandTest.java
@@ -67,6 +67,10 @@ public class CommandTest extends SimpleTest<CommandTestable> {
 
     @Override
     public String getDescription() {
-        return null;
+        if (hasRun) {
+            return testable.getResponse().getDescription();
+        } else {
+            return testable.getCommand().toString();
+        }
     }
 }
-- 
cgit v1.2.3-70-g09d2