Merge branch 'devel'

1 files changed, 20 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index 7c99a4a..56ecb71 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -83,6 +83,25 @@ public class YAMLTestWriter extends BaseYAMLTestWriter {
         return result;
     }
 
+    private Map<String, Object> appletObject(CardMngr card) {
+        Map<String, Object> result = new LinkedHashMap<>();
+        try {
+            Response.GetInfo info = new Command.GetInfo(card).send();
+            result.put("version", info.getVersion());
+            result.put("javacard", info.getJavaCardVersion());
+            result.put("base", info.getBase());
+            result.put("cleanup", info.getCleanupSupport());
+            Map<String, Integer> arrays = new LinkedHashMap<>();
+            arrays.put("apduBuf", Short.toUnsignedInt(info.getApduBufferLength()));
+            arrays.put("ramArray", Short.toUnsignedInt(info.getRamArrayLength()));
+            arrays.put("ramArray2", Short.toUnsignedInt(info.getRamArray2Length()));
+            arrays.put("apduArray", Short.toUnsignedInt(info.getApduArrayLength()));
+            result.put("arrays", arrays);
+        } catch (CardException ignored) {
+        }
+        return result;
+    }
+
     @Override
     protected Map<String, Object> deviceObject(TestSuite suite) {
         if (suite instanceof CardTestSuite) {
@@ -91,6 +110,7 @@ public class YAMLTestWriter extends BaseYAMLTestWriter {
             result.put("type", "card");
             result.put("ectester", ECTesterReader.VERSION + ECTesterReader.GIT_COMMIT);
             result.put("cplc", cplcObject(cardSuite.getCard()));
+            result.put("applet", appletObject(cardSuite.getCard()));
             result.put("ATR", ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false));
             return result;
         }