spectre-reporter-vstest 1.0.8 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d053b6759cb2f87556b4a4163804f927f3a6b2d9bc68c038953905a99f7a0d27
-  data.tar.gz: d50e42462846b6832a6f7d7ba6993365861f47ecb9506d91140ebef1b4c67683
+  metadata.gz: 4a4186606520095c92be1b5c621e422811fe64da40b892e9e571f008ada86708
+  data.tar.gz: e48157c99d11f1f46c5750678fb198a1b8da8e1d0234290d186962b04b659134
 SHA512:
-  metadata.gz: bbe6029d5708cd812dd233954f8159bd2c8391965ef111df8b3895f1c113a52575ca37b77fe309b301ffbcca2bda5e7b9b653e4dac4a8393192c25b50d326d3f
-  data.tar.gz: 634b41c6a50742313d9af6e5435ac0979c0beb8f0ff5a26835a22fffac52b92e8159cf36739de2b6debd0b78de0daf0abdd6897e90176530d6320a0fce021032
+  metadata.gz: 465f7af992614df34a4741a60b7b3e2f29c9f0c4e79445397ea94f5050419391ecfd04467481cb6cf1ad1ff862e381db4669c3a4211b20d6b7d32b9231af1203
+  data.tar.gz: b53a7cc5c12930566fa2e0bccfac1bf35dd37bdbb4397c2033561dea3f70abf0844c0aefb9031082a44bc9e08126e8705cb2b6ff3583e2cf461385d72a391c82

data/lib/spectre/reporter/vstest.rb

@@ -1,8 +1,6 @@
 require 'cgi'
 require 'socket'
 require 'securerandom'
-require 'spectre'
-require 'spectre/reporter'
 
 # Azure mappings: https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/test/publish-test-results?view=azure-devops&tabs=trx%2Cyaml
 
@@ -18,72 +16,77 @@ module Spectre
         now = Time.now.getutc
 
         xml_str = '<?xml version="1.0" encoding="UTF-8" ?>'
-        xml_str += %{<TestRun xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">}
+        xml_str += %(<TestRun xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">)
 
         started = run_infos[0].started
         finished = run_infos[-1].finished
 
         computer_name = Socket.gethostname
 
-        xml_str += %{<Times start="#{started.strftime(@date_format)}" finish="#{finished.strftime(@date_format)}" />}
-
+        xml_str += %(<Times start="#{started.strftime(@date_format)}" finish="#{finished.strftime(@date_format)}" />)
 
         # Write summary with file attachments
         xml_str += '<ResultSummary>'
         xml_str += '<ResultFiles>'
-        xml_str += %{<ResultFile path="#{File.absolute_path(@config['log_file'])}"></ResultFile>} if File.exist? @config['log_file']
+        if File.exist? @config['log_file']
+          xml_str += %(<ResultFile path="#{File.absolute_path(@config['log_file'])}"></ResultFile>)
+        end
 
         report_files = Dir[File.join(@config['out_path'], '*')]
 
         if report_files.any?
           report_files.each do |report_file|
-            xml_str += %{<ResultFile path="#{File.absolute_path(report_file)}"></ResultFile>}
+            xml_str += %(<ResultFile path="#{File.absolute_path(report_file)}"></ResultFile>)
           end
         end
 
         xml_str += '</ResultFiles>'
         xml_str += '</ResultSummary>'
 
-
         # Write test definitions
         test_definitions = run_infos
-          .sort_by { |x| x.spec.name }
-          .map { |x| [SecureRandom.uuid(), SecureRandom.uuid(), x] }
+          .sort_by { |x| x.parent.name }
+          .map { |x| [SecureRandom.uuid, SecureRandom.uuid, x] }
 
         xml_str += '<TestDefinitions>'
         test_definitions.each do |test_id, execution_id, run_info|
-          xml_str += %{<UnitTest name="#{CGI::escapeHTML get_name(run_info)}" storage="#{CGI::escapeHTML(run_info.spec.file.to_s)}" id="#{test_id}">}
-          xml_str += %{<Execution id="#{execution_id}" />}
+          xml_str += %(<UnitTest name="#{CGI.escapeHTML get_name(run_info)}" \
+            storage="#{CGI.escapeHTML(run_info.parent.file.to_s)}" id="#{test_id}">)
+          xml_str += %(<Execution id="#{execution_id}" />)
           xml_str += '</UnitTest>'
         end
         xml_str += '</TestDefinitions>'
 
-
         # Write test results
         xml_str += '<Results>'
         test_definitions.each do |test_id, execution_id, run_info|
-          duration_str = Time.at(run_info.duration).gmtime.strftime('%T.%L')
-
-          if run_info.failed?
-            outcome = 'Failed'
-          elsif run_info.error?
-            outcome = 'Failed'
-          elsif run_info.skipped?
-            outcome = 'Skipped'
-          else
-            outcome = 'Passed'
-          end
-
-          xml_str += %{<UnitTestResult executionId="#{execution_id}" testId="#{test_id}" testName="#{CGI::escapeHTML get_name(run_info)}" computerName="#{computer_name}" duration="#{duration_str}" startTime="#{run_info.started.strftime(@date_format)}" endTime="#{run_info.finished.strftime(@date_format)}" outcome="#{outcome}">}
-
-          if run_info.log.any? or run_info.failed? or run_info.error?
+          duration_str = Time.at(run_info.finished - run_info.started).gmtime.strftime('%T.%L')
+
+          outcome = if [:failed, :error].include? run_info.status
+                      'Failed'
+                    elsif run_info.status == :skipped
+                      'Skipped'
+                    else
+                      'Passed'
+                    end
+
+          xml_str += %(<UnitTestResult executionId="#{execution_id}" \
+            testId="#{test_id}" \
+            testName="#{CGI.escapeHTML get_name(run_info)}" \
+            computerName="#{computer_name}" \
+            duration="#{duration_str}" \
+            startTime="#{run_info.started.strftime(@date_format)}" \
+            endTime="#{run_info.finished.strftime(@date_format)}" \
+            outcome="#{outcome}">)
+
+          if run_info.logs.any?
             xml_str += '<Output>'
 
             # Write log entries
             xml_str += '<StdOut>'
             log_str = ''
 
-            if run_info.properties.count > 0
+            if run_info.properties.count.positive?
               run_info.properties.each do |key, val|
                 log_str += "#{key}: #{val}\n"
               end
@@ -95,52 +98,57 @@ module Spectre
               log_str += "data: #{data_str}\n"
             end
 
-            run_info.log.each do |timestamp, message, level, name|
-              log_text = ""
+            run_info.logs.each do |timestamp, level, progname, _corr_id, message|
+              log_text = ''
               begin
                 log_text = message.dup.to_s
-                  .force_encoding("ISO-8859-1")
-                  .encode!("UTF-8")
-              rescue 
+                  .gsub(/[^[:print:]\n]/, '<np>') # Replace non printable characters
+                  .force_encoding('ISO-8859-1')
+                  .encode!('UTF-8')
+              rescue StandardError
                 puts "ERROR in VSTEST - see message : #{message}"
               end
 
-              log_str += %{#{timestamp.strftime(@date_format)} #{level.to_s.upcase} -- #{name}: #{CGI::escapeHTML(log_text)}\n}
+              log_str += %(#{timestamp} #{level.to_s.upcase} -- \
+                #{progname}: #{CGI.escapeHTML(log_text)}\n)
             end
 
             xml_str += log_str
             xml_str += '</StdOut>'
 
             # Write error information
-            if run_info.failed? or run_info.error?
+            if [:failed, :error].include? run_info.status
               xml_str += '<ErrorInfo>'
 
-              if run_info.failed? and not run_info.failure.cause
+              if run_info.status == :failed
                 xml_str += '<Message>'
 
-                failure_message = "Expected #{run_info.failure.expectation}"
-                failure_message += " with #{run_info.data}" if run_info.data
-                failure_message += " but it failed"
-                failure_message += " with message: #{run_info.failure.message}" if run_info.failure.message
+                failure_message = ''
 
-                xml_str += CGI::escapeHTML(failure_message)
+                run_info.evaluations.each do |evaluation|
+                  evaluation.failures.each do |failure|
+                    failure_message += "#{evaluation.desc}, but #{failure.message} "
+                  end
+                end
+
+                xml_str += CGI.escapeHTML(failure_message)
 
                 xml_str += '</Message>'
               end
 
-              if run_info.error or (run_info.failed? and run_info.failure.cause)
-                error = run_info.error || run_info.failure.cause
+              if run_info.status == :error
+                error = run_info.error
 
                 failure_message = error.message
 
                 xml_str += '<Message>'
-                xml_str += CGI::escapeHTML(failure_message)
+                xml_str += CGI.escapeHTML(failure_message)
                 xml_str += '</Message>'
 
                 stack_trace = error.backtrace.join "\n"
 
                 xml_str += '<StackTrace>'
-                xml_str += CGI::escapeHTML(stack_trace)
+                xml_str += CGI.escapeHTML(stack_trace)
                 xml_str += '</StackTrace>'
               end
 
@@ -150,17 +158,14 @@ module Spectre
             xml_str += '</Output>'
           end
 
-
           xml_str += '</UnitTestResult>'
         end
         xml_str += '</Results>'
 
-
         # End report
         xml_str += '</TestRun>'
 
-
-        Dir.mkdir(@config['out_path']) unless Dir.exist? @config['out_path']
+        FileUtils.mkdir_p(@config['out_path'])
 
         file_path = File.join(@config['out_path'], "spectre-vstest_#{now.strftime('%s')}.trx")
 
@@ -170,14 +175,8 @@ module Spectre
       private
 
       def get_name run_info
-        run_name = "[#{run_info.spec.name}] #{run_info.spec.subject.desc}"
-        run_name += " - #{run_info.spec.context.__desc} -" unless run_info.spec.context.__desc.nil?
-        run_name += " #{run_info.spec.desc}"
-        run_name
-      end
-
-      Spectre.register do |config|
-        Spectre::Reporter.add VSTest.new(config)
+        parent = run_info.parent
+        "[#{parent.name}] #{parent.full_desc}"
       end
     end
   end

metadata

@@ -1,29 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectre-reporter-vstest
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 2.0.1
 platform: ruby
 authors:
 - Christian Neubauer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: spectre-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.3
+date: 2025-03-26 00:00:00.000000000 Z
+dependencies: []
 description: Writes a VSTest report for spectre test run, which can be used in Azure
   DevOps
 email:
@@ -40,7 +25,6 @@ metadata:
   homepage_uri: https://github.com/ionos-spectre/spectre-reporter-vstest
   source_code_uri: https://github.com/ionos-spectre/spectre-reporter-vstest
   changelog_uri: https://github.com/ionos-spectre/spectre-reporter-vstest/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -48,15 +32,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A VSTest reporter for spectre
 test_files: []