Skip to content

Commit b6e3328

Browse files
authored
Merge pull request #12 from kenichiice/xml-format
<error>と<failure>内の余計な改行とタブを削除
2 parents cf418ba + d62e62c commit b6e3328

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

README.ja.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ $ ruby test.rb --runner=junitxml --junitxml-output-file=result.xml
3333
$ cat result.xml
3434
<?xml version="1.0" encoding="UTF-8" ?>
3535
<testsuites>
36-
<testsuite name="MyTest" tests="1" errors="0" failures="1" skipped="0" time="0.0047083">
37-
<testcase classname="MyTest" name="test_1(MyTest)" time="0.0046712" assertions="1">
36+
<testsuite name="MyTest" tests="1" errors="0" failures="1" skipped="0" time="0.005365">
37+
<testcase classname="MyTest" name="test_1(MyTest)" time="0.0053308" assertions="1">
3838
<failure message="&lt;1&gt; expected but was
39-
&lt;2&gt;.">
40-
Failure:
39+
&lt;2&gt;.">Failure:
4140
test_1(MyTest) [test.rb:7]:
4241
&lt;1&gt; expected but was
43-
&lt;2&gt;.
44-
</failure>
42+
&lt;2&gt;.</failure>
4543
<system-out>hello</system-out>
4644
</testcase>
4745
</testsuite>

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ $ ruby test.rb --runner=junitxml --junitxml-output-file=result.xml
3333
$ cat result.xml
3434
<?xml version="1.0" encoding="UTF-8" ?>
3535
<testsuites>
36-
<testsuite name="MyTest" tests="1" errors="0" failures="1" skipped="0" time="0.0047083">
37-
<testcase classname="MyTest" name="test_1(MyTest)" time="0.0046712" assertions="1">
36+
<testsuite name="MyTest" tests="1" errors="0" failures="1" skipped="0" time="0.005365">
37+
<testcase classname="MyTest" name="test_1(MyTest)" time="0.0053308" assertions="1">
3838
<failure message="&lt;1&gt; expected but was
39-
&lt;2&gt;.">
40-
Failure:
39+
&lt;2&gt;.">Failure:
4140
test_1(MyTest) [test.rb:7]:
4241
&lt;1&gt; expected but was
43-
&lt;2&gt;.
44-
</failure>
42+
&lt;2&gt;.</failure>
4543
<system-out>hello</system-out>
4644
</testcase>
4745
</testsuite>

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
% test_suite.test_cases.each do |test_case|
66
<testcase classname="<%=h test_case.class_name %>" name="<%=h test_case.name %>" time="<%=h test_case.time %>" assertions="<%=h test_case.assertion_count %>">
77
% if test_case.error
8-
<error message="<%=h test_case.error.message %>" type="<%=h test_case.error.exception.class.name %>">
9-
<%=h test_case.error.long_display %>
10-
</error>
8+
<error message="<%=h test_case.error.message %>" type="<%=h test_case.error.exception.class.name %>"><%=h test_case.error.long_display %></error>
119
% elsif test_case.failure
12-
<failure message="<%=h test_case.failure.message %>">
13-
<%=h test_case.failure.long_display %>
14-
</failure>
10+
<failure message="<%=h test_case.failure.message %>"><%=h test_case.failure.long_display %></failure>
1511
% elsif test_case.omission
1612
<skipped message="<%=h test_case.omission.message %>"/>
1713
% elsif test_case.pending

0 commit comments

Comments
 (0)