Merge branch 'feature/standalone-lib-testing' into devel

1 files changed, 9 insertions, 5 deletions

diff --git a/src/cz/crcs/ectester/reader/output/ResponseWriter.java b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
index 0f5b6e8..f8837f8 100644
--- a/src/cz/crcs/ectester/reader/output/ResponseWriter.java
+++ b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
@@ -1,6 +1,6 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.common.Util;
+import cz.crcs.ectester.common.util.CardUtil;
 import cz.crcs.ectester.reader.response.Response;
 
 import java.io.PrintStream;
@@ -20,20 +20,24 @@ public class ResponseWriter {
         for (int j = 0; j < r.getNumSW(); ++j) {
             short sw = r.getSW(j);
             if (sw != 0) {
-                suffix.append(" ").append(Util.getSWString(sw));
+                suffix.append(" ").append(CardUtil.getSWString(sw));
             }
         }
         if (suffix.length() == 0) {
-            suffix.append(" [").append(Util.getSW(r.getNaturalSW())).append("]");
+            suffix.append(" [").append(CardUtil.getSW(r.getNaturalSW())).append("]");
         }
         return String.format("%4d ms ┃ %s", r.getDuration() / 1000000, suffix);
     }
 
-    public void outputResponse(Response r) {
+    public String responseString(Response r) {
         String out = "";
         out += String.format("%-70s", r.getDescription()) + " ┃ ";
         out += responseSuffix(r);
-        output.println(out);
+        return out;
+    }
+
+    public void outputResponse(Response r) {
+        output.println(responseString(r));
         output.flush();
     }
 }