workaround for slashes in name/classname

Author: stask

src/practitest_firecracker/const.clj

@@ -1,6 +1,6 @@
 (ns practitest-firecracker.const)
 
-(def ^:const fc-version "2.1.2")
+(def ^:const fc-version "2.1.4")
 
 (def ^:const testset-instances-uri "/projects/%d/instances.json")
 (def ^:const test-uri "/projects/%d/tests/%d.json")

src/practitest_firecracker/parser/core.clj

@@ -4,8 +4,9 @@
     [clojure.string :as str]
     [clojure.xml :as xml]
     [clojure.zip :as zip])
-  (:import (java.text NumberFormat)
-           (java.io ByteArrayInputStream)))
+  (:import
+    (java.io ByteArrayInputStream)
+    (java.text NumberFormat)))
 
 (defn round
   [x & {p :precision}]
@@ -51,10 +52,27 @@
     {:tag :testsuites :content (flatten-testsuite root)}
     root))
 
+(defn normalize-attribute [value]
+  (when value
+    (str/replace value "/" ".")))
+
+(defn normalize-attributes
+  "Sometimes `classname` and `name` contain '/', we need to replace it with '.'"
+  [element]
+  (if (map? element)
+    (if-let [_attrs (:attrs element)]
+      (-> element
+          (update-in [:attrs :name] normalize-attribute)
+          (update-in [:attrs :classname] normalize-attribute)
+          (update :content #(map normalize-attributes %)))
+      (update element :content #(map normalize-attributes %)))
+    element))
+
 (defn zip-str [s]
   (zip/xml-zip
-    (preprocess-xunit 
-      (xml/parse (ByteArrayInputStream. (.getBytes s "UTF-8"))))))
+    (normalize-attributes
+      (preprocess-xunit 
+        (xml/parse (ByteArrayInputStream. (.getBytes s "UTF-8")))))))
 
 (defn filter-tags [tag-key xml-content]
   (let [filter-result (filter #(= (:tag %) tag-key) xml-content)]
@@ -243,4 +261,9 @@
       (preprocess-xunit
         (xml/parse (ByteArrayInputStream. (.getBytes s "UTF-8"))))))
 
+  (let [s (slurp "test-data/pb/report.xml")]
+    (normalize-attributes
+      (preprocess-xunit
+        (xml/parse (ByteArrayInputStream. (.getBytes s "UTF-8"))))))
+
   )