Support serialization tests when generating ci.json

aggregate/convert_to_json

@@ -37,11 +37,27 @@ def add_fails(first, *seconds)
 end
 
 def add_kst_adoption(tests, log_dir)
-  kst_tests = File.readlines("#{log_dir}/kst_adoption.log")
+  kst_tests = File.readlines("#{log_dir}/kst_adoption.log").map { |name| name.chomp }
+  kst_test_used = {}
+  kst_tests.each { |name| kst_test_used[name] = false }
+  tests.each_pair { |name, test_result|
+    kst_name = nil
+    if kst_test_used.has_key?(name)
+      kst_name = name
+    elsif name =~ /^(.+?)\./ && kst_test_used.has_key?($1)
+      kst_name = $1
+    end
+
+    if kst_name
+      test_result['is_kst'] = true
+      kst_test_used[kst_name] = true
+    end
+  }
   kst_tests.each { |name|
-    name.chomp!
-    tests[name] ||= {}
-    tests[name]['is_kst'] = true
+    if !kst_test_used.fetch(name)
+      tests[name] ||= {}
+      tests[name]['is_kst'] = true
+    end
   }
   tests
 end
@@ -101,6 +117,11 @@ when 'php', 'python', 'construct'
     JUnitXMLParser.new(infile).to_h,
     infile
   )
+when 'python-write'
+  add_kst_adoption(
+    JUnitXMLParser.new(infile, true).to_h,
+    infile
+  )
 when 'ruby'
   add_kst_adoption(
     RSpecJSONParser.new("#{infile}/test-output-ruby.json").to_h,

aggregate/junit_xml_parser.rb

@@ -3,7 +3,8 @@
 require 'rexml/document'
 
 class JUnitXMLParser < TestParser
-  def initialize(fn)
+  def initialize(fn, include_classname = false)
+    @include_classname = include_classname
     @docs = if not File.exists?(fn)
       []
     elsif File.directory?(fn)
@@ -35,10 +36,19 @@ def each_test
           name = underscore_to_ucamelcase($1)
         else
           raise "Unable to parse name: \"#{name}\"" unless name =~ /^[Tt]est(.*?)$/
-          if $1[0] == '_'
-            name = underscore_to_ucamelcase($1)
+          name = $1
+          if @include_classname
+            classname = tc.attribute('classname').value
+            raise "Unable to parse classname: \"#{classname}\"" unless classname =~ /\.Test([^.]*)$/
+            classname = $1
+            if name[0] == '_'
+              name = underscore_to_lcamelcase(name[1..-1])
+            end
+            name = "#{classname}.#{name}"
           else
-            name = $1
+            if name[0] == '_'
+              name = underscore_to_ucamelcase(name[1..-1])
+            end
           end
         end
 

aggregate/test_parser.rb

@@ -5,6 +5,11 @@ def underscore_to_ucamelcase(s)
   s.split(/_/).map { |x| x.capitalize }.join
 end
 
+def underscore_to_lcamelcase(s)
+  first_word, *rest_words = s.split(/_/)
+  ([first_word] + rest_words.map { |x| x.capitalize }).join
+end
+
 class TestParser
   def each_test
     raise 'Abstract method'

ci-python

@@ -2,8 +2,11 @@
 
 . ./config
 
-rm -rf "$TEST_OUT_DIR/python"
-PYTHONPATH="$PYTHON_RUNTIME_DIR:compiled/python:spec/python/extra" python ./run-python-xml.py spec/python "$TEST_OUT_DIR/python"
+rm -rf "$TEST_OUT_DIR/python" "$TEST_OUT_DIR/python-write"
+PYTHONPATH="$PYTHON_RUNTIME_DIR:compiled/python:spec/python/extra" python ./run-python-xml.py spec/python/spec "$TEST_OUT_DIR/python"
+PYTHONPATH="$PYTHON_RUNTIME_DIR:compiled/python:spec/python:spec/python/extra" python ./run-python-xml.py spec/python/specwrite "$TEST_OUT_DIR/python-write"
 
 ./kst-adoption-report python
+./kst-adoption-report python-write
 aggregate/convert_to_json python "$TEST_OUT_DIR/python" "$TEST_OUT_DIR/python/ci.json"
+aggregate/convert_to_json python-write "$TEST_OUT_DIR/python-write" "$TEST_OUT_DIR/python-write/ci.json"

kst-adoption-report

@@ -29,7 +29,9 @@ def glob_spec_files(lang)
   when 'php'
     Dir.glob('spec/php/*Test.php')
   when 'python'
-    Dir.glob('spec/python/**/test_*.py')
+    Dir.glob("spec/python/spec/test_*.py")
+  when 'python-write'
+    Dir.glob("spec/python/specwrite/test_*.py")
   when 'construct'
     Dir.glob('spec/construct/**/test_*.py')
   when 'ruby'
@@ -68,7 +70,7 @@ def spec_file_to_test_name(lang, fn)
   when 'php'
     raise "Unable to extract test name from #{fn.inspect}" unless fn =~ /^(.*?)Test\.php$/
     $1
-  when 'python', 'construct'
+  when 'python', 'python-write', 'construct'
     raise "Unable to extract test name from #{fn.inspect}" unless fn =~ /^test_(.*?)\.py$/
     underscore_to_ucamelcase($1)
   when 'ruby'