From 298ffc18e590d07eb04d2c5c2b1d553f8fba71bd Mon Sep 17 00:00:00 2001 From: J08nY Date: Mon, 28 May 2018 21:45:19 +0200 Subject: Implement tracking and writing of exceptions in standalone tests. --- src/cz/crcs/ectester/reader/output/YAMLTestWriter.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/cz/crcs/ectester/reader/output/YAMLTestWriter.java') diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java index 4c908cc..820521d 100644 --- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java +++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java @@ -13,10 +13,7 @@ import cz.crcs.ectester.reader.test.CommandTestable; import javax.smartcardio.CardException; import java.io.PrintStream; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author Jan Jancar johny@neuromancer.sk @@ -27,7 +24,7 @@ public class YAMLTestWriter extends BaseYAMLTestWriter { } private Map commandObject(Command c) { - Map commandObj = new HashMap<>(); + Map commandObj = new LinkedHashMap<>(); if (c == null) { return commandObj; } @@ -37,7 +34,7 @@ public class YAMLTestWriter extends BaseYAMLTestWriter { } private Map responseObject(Response r) { - Map responseObj = new HashMap<>(); + Map responseObj = new LinkedHashMap<>(); if (r == null) { return responseObj; } @@ -58,7 +55,7 @@ public class YAMLTestWriter extends BaseYAMLTestWriter { protected Map testableObject(Testable t) { if (t instanceof CommandTestable) { CommandTestable cmd = (CommandTestable) t; - Map result = new HashMap<>(); + Map result = new LinkedHashMap<>(); result.put("type", "command"); result.put("command", commandObject(cmd.getCommand())); result.put("response", responseObject(cmd.getResponse())); @@ -68,7 +65,7 @@ public class YAMLTestWriter extends BaseYAMLTestWriter { } private Map cplcObject(CardMngr card) { - Map result = new HashMap<>(); + Map result = new LinkedHashMap<>(); try { CardMngr.CPLC cplc = card.getCPLC(); if (!cplc.values().isEmpty()) { @@ -87,7 +84,7 @@ public class YAMLTestWriter extends BaseYAMLTestWriter { protected Map deviceObject(TestSuite suite) { if (suite instanceof CardTestSuite) { CardTestSuite cardSuite = (CardTestSuite) suite; - Map result = new HashMap<>(); + Map result = new LinkedHashMap<>(); result.put("type", "card"); result.put("ectester", ECTesterReader.VERSION); result.put("cplc", cplcObject(cardSuite.getCard())); -- cgit v1.2.3-70-g09d2