From 24813643bb511b9aa3febfa983c139bc491c5ea6 Mon Sep 17 00:00:00 2001 From: David Lednik Date: Thu, 4 Dec 2014 15:14:46 +0000 Subject: [PATCH 1/3] Added code to grab average time taken for performance tests --- bin/ocunit2junit | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/ocunit2junit b/bin/ocunit2junit index 2f1adab..0c4f540 100755 --- a/bin/ocunit2junit +++ b/bin/ocunit2junit @@ -88,6 +88,11 @@ class ReportParser test_case = $1 @last_description = nil + when /Test Case '-\[\S+\s+(\S+)\]' measured [Time, seconds] average: (.*),/ + test_case = get_test_case_name($1, @last_description) + test_case_duration = $2.to_f + handle_test_passed(test_case,test_case_duration) + when /Test Case '-\[\S+\s+(\S+)\]' passed \((.*) seconds\)/ test_case = get_test_case_name($1, @last_description) test_case_duration = $2.to_f @@ -170,7 +175,9 @@ class ReportParser def handle_test_passed(test_case,test_case_duration) @total_passed_test_cases += 1 - @tests_results[test_case] = test_case_duration + if !@tests_results.has_key?(test_case) + @tests_results[test_case] = test_case_duration + end end def handle_test_error(test_suite,test_case,error_message,error_location) From 87646854e6cdd259a32e8a57fe73bf9ccb9ed6de Mon Sep 17 00:00:00 2001 From: David Lednik Date: Thu, 4 Dec 2014 17:19:59 +0000 Subject: [PATCH 2/3] Working fix for performance tests --- bin/ocunit2junit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ocunit2junit b/bin/ocunit2junit index 0c4f540..196464f 100755 --- a/bin/ocunit2junit +++ b/bin/ocunit2junit @@ -88,7 +88,7 @@ class ReportParser test_case = $1 @last_description = nil - when /Test Case '-\[\S+\s+(\S+)\]' measured [Time, seconds] average: (.*),/ + when /Test Case '-\[\S+\s+(\S+)\]' measured \[Time, seconds\] average: (.*),/ test_case = get_test_case_name($1, @last_description) test_case_duration = $2.to_f handle_test_passed(test_case,test_case_duration) From 607f3e6f9c3fd25406452c8bf3898ebe1a2a0cf0 Mon Sep 17 00:00:00 2001 From: David Lednik Date: Thu, 4 Dec 2014 17:23:20 +0000 Subject: [PATCH 3/3] FIX: only count if no performance test exists --- bin/ocunit2junit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ocunit2junit b/bin/ocunit2junit index 196464f..d73501a 100755 --- a/bin/ocunit2junit +++ b/bin/ocunit2junit @@ -174,8 +174,8 @@ class ReportParser end def handle_test_passed(test_case,test_case_duration) - @total_passed_test_cases += 1 if !@tests_results.has_key?(test_case) + @total_passed_test_cases += 1 @tests_results[test_case] = test_case_duration end end