Merge pull request #18 from shugo/add_file

Add the file attribute

Author: kenichiice

lib/test/unit/ui/junitxml/testrunner.rb

@@ -15,6 +15,7 @@ class TestRunner < UI::TestRunner
           def initialize(suite, options={})
             super
             @junit_test_suites = []
+            @base_dir_re = /\A#{Regexp.quote(Dir.pwd)}\//
           end
 
           private
@@ -49,7 +50,7 @@ def test_suite_finished(suite)
           end
 
           def test_started(test)
-            test_case = JUnitTestCase.new(test.class.name, test.description)
+            test_case = JUnitTestCase.new(test.class.name, test.description, test_file(test))
             @junit_test_suites.last << test_case
             unless @options[:junitxml_disable_output_capture]
               @stdout_org = $stdout
@@ -59,6 +60,12 @@ def test_started(test)
             end
           end
 
+          def test_file(test)
+            file = (test[:source_location] ||
+                    test.method(test.method_name).source_location).first
+            file.sub(@base_dir_re, "")
+          end
+
           def test_finished(test)
             @junit_test_suites.last.test_cases.last.time = test.elapsed_time
             unless @options[:junitxml_disable_output_capture]
@@ -125,14 +132,15 @@ def errors
         end
 
         class JUnitTestCase
-          attr_reader :class_name, :name
+          attr_reader :class_name, :name, :file
           attr_reader :failure, :error, :omission, :pending
           attr_reader :stdout, :stderr
           attr_accessor :assertion_count, :time
 
-          def initialize(class_name, name)
+          def initialize(class_name, name, file)
             @class_name = class_name
             @name = name
+            @file = file
             @failure = @error = @omission = @pending = nil
             @stdout = StringIO.new
             @stderr = StringIO.new

lib/test/unit/ui/junitxml/xml.erb

@@ -3,7 +3,7 @@
 % @junit_test_suites.each do |test_suite|
 	<testsuite name="<%=h test_suite.name %>" tests="<%=h test_suite.test_cases.size %>" errors="<%=h test_suite.errors.size %>" failures="<%=h test_suite.failures.size %>" skipped="<%=h test_suite.test_cases.count(&:skipped?) %>" time="<%=h test_suite.time %>">
 %	test_suite.test_cases.each do |test_case|
-		<testcase classname="<%=h test_case.class_name %>" name="<%=h test_case.name %>" time="<%=h test_case.time %>" assertions="<%=h test_case.assertion_count %>">
+                <testcase classname="<%=h test_case.class_name %>" name="<%=h test_case.name %>" file="<%=h test_case.file%>" time="<%=h test_case.time %>" assertions="<%=h test_case.assertion_count %>">
 %		if test_case.error
 			<error message="<%=h test_case.error.message %>" type="<%=h test_case.error.exception.class.name %>"><%=h test_case.error.long_display %></error>
 %		elsif test_case.failure

test/check.rb

@@ -63,6 +63,7 @@ def check_testcase_skipped(testcase, class_name, assertions, message = nil, out
 
   def check_test_case(testcase, class_name, assertions, out = nil, err = nil)
     assert_equal(class_name, testcase.attribute("classname").value)
+    assert(caller_locations[1].path.end_with?(testcase.attribute("file").value))
     assert_equal(assertions.to_s, testcase.attribute("assertions").value)
     assert_compare(0, "<", Float(testcase.attribute("time").value))