Output full library name in machine-readable test reports.

crocs-muni · May 6, 2024 · f8ca335 · f8ca335
1 parent 5c82380
commit f8ca335
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java
@@ -104,6 +104,10 @@ public String name() {
         return name;
     }
 
+    public String fullName() {
+        return name() + " (" + provider.getName() + ")";
+    }
+
     public Provider getProvider() {
         return provider;
     }

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java
@@ -48,7 +48,7 @@ protected String deviceString(TestSuite suite) {
             StandaloneTestSuite standaloneSuite = (StandaloneTestSuite) suite;
             StringBuilder sb = new StringBuilder();
             sb.append("═══ ").append(Colors.underline("ECTester version:")).append(" ").append(ECTesterStandalone.VERSION).append(System.lineSeparator());
-            sb.append("═══ ").append(Colors.underline("Library:")).append(" ").append(standaloneSuite.getLibrary().name()).append(" (").append(standaloneSuite.getLibrary().getProvider().getName()).append(")").append(System.lineSeparator());
+            sb.append("═══ ").append(Colors.underline("Library:")).append(" ").append(standaloneSuite.getLibrary().fullName()).append(System.lineSeparator());
             return sb.toString();
         }
         return "";

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/XMLTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/XMLTestWriter.java
@@ -147,7 +147,7 @@ protected Element deviceElement(TestSuite suite) {
             result.setAttribute("ectester", ECTesterStandalone.VERSION);
 
             Element name = doc.createElement("name");
-            name.setTextContent(standaloneSuite.getLibrary().name());
+            name.setTextContent(standaloneSuite.getLibrary().fullName());
             result.appendChild(name);
             return result;
         }

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/YAMLTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/YAMLTestWriter.java
@@ -116,7 +116,7 @@ protected Map<String, Object> deviceObject(TestSuite suite) {
             Map<String, Object> result = new LinkedHashMap<>();
             result.put("type", "library");
             result.put("ectester", ECTesterStandalone.VERSION);
-            result.put("name", standaloneSuite.getLibrary().name());
+            result.put("name", standaloneSuite.getLibrary().fullName());
             return result;
         }
         return null;