Skip to content

Commit 327d70e

Browse files
zoltanszabo-bitrisezoltanszabo-bitrise
committed
test: fix tests
1 parent 6e0ed4d commit 327d70e

File tree

5 files changed

+129
-42
lines changed

5 files changed

+129
-42
lines changed

‎test/converters/converters_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func TestXCresult3Converters(t *testing.T) {
2626
Name: "rtgtrghtrgTests",
2727
Tests: 2,
2828
Failures: 0,
29+
Errors: 0,
2930
Time: 0.26063,
3031
TestCases: []testreport.TestCase{
3132
{ // plain test case
@@ -44,6 +45,7 @@ func TestXCresult3Converters(t *testing.T) {
4445
Name: "rtgtrghtrgUITests",
4546
Tests: 15,
4647
Failures: 3,
48+
Errors: 0,
4749
Time: 0.759,
4850
TestCases: []testreport.TestCase{
4951
// class rtgtrghtrg3UITests: XCTestCase inside rtgtrghtrgUITests class

‎test/converters/junitxml/junitxml.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func convertErrorToFailure(error *testreport.Error) *testreport.Failure {
330330
}
331331

332332
func enrichWithSystemOutputs(testCase *testreport.TestCase, systemOut, systemErr string) {
333-
var testOutputs []string = []string{}
333+
testOutputs := []string{}
334334

335335
if len(strings.TrimSpace(systemErr)) > 0 {
336336
testOutputs = append(testOutputs, "System error:\n"+systemErr)

‎test/converters/junitxml/junitxml_test.go‎

Lines changed: 118 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ func TestConverter_Convert(t *testing.T) {
427427
Time: 0.17543494701385498,
428428
Failure: &testreport.Failure{
429429
XMLName: xml.Name{Local: "failure"},
430-
Value: "Failure message: XCTAssertTrue failed",
430+
Value: "XCTAssertTrue failed",
431431
},
432432
},
433433
},
@@ -519,6 +519,7 @@ Testmo test management software - https://www.testmo.com/
519519
Name: "Tests.Registration",
520520
Tests: 3,
521521
Failures: 0,
522+
Errors: 0,
522523
Time: 6.605871,
523524
TestCases: []testreport.TestCase{
524525
{
@@ -569,7 +570,7 @@ Testmo test management software - https://www.testmo.com/
569570
XMLName: xml.Name{
570571
Local: "failure",
571572
},
572-
Value: "Failure type: AssertionError\n\nFailure message: Assertion error message",
573+
Value: "AssertionError: Assertion error message",
573574
},
574575
},
575576
},
@@ -636,38 +637,122 @@ func TestConverter_Convert_Grouped_report(t *testing.T) {
636637
XMLName: xml.Name{Space: "", Local: ""},
637638
TestSuites: []testreport.TestSuite{
638639
{
639-
XMLName: xml.Name{Space: "", Local: "testsuite"},
640-
Name: "My Test Suite",
641-
Tests: 7, Failures: 5, Errors: 1, Skipped: 1,
642-
Time: 28.844,
640+
XMLName: xml.Name{Space: "", Local: "testsuite"},
641+
Name: "My Test Suite",
642+
Tests: 7,
643+
Failures: 5,
644+
Errors: 0,
645+
Skipped: 1,
646+
Time: 28.844,
643647
TestCases: []testreport.TestCase{
644-
{XMLName: xml.Name{Space: "", Local: "testcase"}, ConfigurationHash: "", Name: "Testcase number 1", ClassName: "example.exampleTest", Time: 0.764,
645-
Failure: nil,
646-
Skipped: &testreport.Skipped{XMLName: xml.Name{Space: "", Local: "skipped"}},
647-
SystemOut: &testreport.SystemOut{XMLName: xml.Name{Space: "", Local: "system-out"}, Value: "[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 1\n[INFO] 13:12:43:\tLog line 2 1\n"}},
648-
{XMLName: xml.Name{Space: "", Local: "testcase"}, ConfigurationHash: "", Name: "Testcase number 2", ClassName: "example.exampleTest", Time: 0.164,
649-
Failure: nil,
650-
Skipped: nil,
651-
SystemOut: &testreport.SystemOut{XMLName: xml.Name{Space: "", Local: "system-out"}, Value: "[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 2\n[INFO] 13:12:43:\tLog line 2 2\n"},
652-
SystemErr: &testreport.SystemErr{XMLName: xml.Name{Space: "", Local: "system-err"}, Value: "Some error message 2"}},
653-
{XMLName: xml.Name{Space: "", Local: "testcase"}, ConfigurationHash: "", Name: "Testcase number 3", ClassName: "example.exampleTest", Time: 0.445,
654-
Failure: &testreport.Failure{XMLName: xml.Name{Space: "", Local: "failure"}, Value: "Failure message"},
655-
Error: &testreport.Error{XMLName: xml.Name{Space: "", Local: "error"}, Value: "Error"},
656-
Skipped: nil,
657-
SystemOut: &testreport.SystemOut{XMLName: xml.Name{Space: "", Local: "system-out"}, Value: "[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 3\n[INFO] 13:12:43:\tLog line 2 3\n"},
658-
SystemErr: &testreport.SystemErr{XMLName: xml.Name{Space: "", Local: "system-err"}, Value: "Some error message 3"}},
659-
{XMLName: xml.Name{Space: "", Local: "testcase"}, ConfigurationHash: "", Name: "Testcase number 3", ClassName: "example.exampleTest", Time: 0,
660-
Failure: &testreport.Failure{XMLName: xml.Name{Space: "", Local: "failure"}, Value: "System error:\nFlaky failure system error"},
661-
Skipped: nil},
662-
{XMLName: xml.Name{Space: "", Local: "testcase"}, ConfigurationHash: "", Name: "Testcase number 3", ClassName: "example.exampleTest", Time: 0,
663-
Failure: &testreport.Failure{XMLName: xml.Name{Space: "", Local: "failure"}, Value: "System error:\nFlaky error system error"},
664-
Skipped: nil},
665-
{XMLName: xml.Name{Space: "", Local: "testcase"}, ConfigurationHash: "", Name: "Testcase number 3", ClassName: "example.exampleTest", Time: 0,
666-
Failure: &testreport.Failure{XMLName: xml.Name{Space: "", Local: "failure"}, Value: "System error:\nRerun failure system error"},
667-
Skipped: nil},
668-
{XMLName: xml.Name{Space: "", Local: "testcase"}, ConfigurationHash: "", Name: "Testcase number 3", ClassName: "example.exampleTest", Time: 0,
669-
Failure: &testreport.Failure{XMLName: xml.Name{Space: "", Local: "failure"}, Value: "System error:\nRerun error system error"},
670-
Skipped: nil},
648+
{
649+
XMLName: xml.Name{Space: "", Local: "testcase"},
650+
ConfigurationHash: "",
651+
Name: "Testcase number 1",
652+
ClassName: "example.exampleTest",
653+
Time: 0.764,
654+
Failure: nil,
655+
Error: nil,
656+
Skipped: &testreport.Skipped{
657+
XMLName: xml.Name{Space: "", Local: "skipped"},
658+
Value: "System output:\n[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 1\n[INFO] 13:12:43:\tLog line 2 1\n",
659+
},
660+
SystemOut: &testreport.SystemOut{
661+
XMLName: xml.Name{Space: "", Local: "system-out"},
662+
Value: "[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 1\n[INFO] 13:12:43:\tLog line 2 1\n",
663+
},
664+
},
665+
{
666+
XMLName: xml.Name{Space: "", Local: "testcase"},
667+
ConfigurationHash: "",
668+
Name: "Testcase number 2",
669+
ClassName: "example.exampleTest",
670+
Time: 0.164,
671+
Failure: nil,
672+
Skipped: nil,
673+
Error: nil,
674+
SystemOut: &testreport.SystemOut{
675+
XMLName: xml.Name{Space: "", Local: "system-out"},
676+
Value: "[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 2\n[INFO] 13:12:43:\tLog line 2 2\n",
677+
},
678+
SystemErr: &testreport.SystemErr{
679+
XMLName: xml.Name{Space: "", Local: "system-err"},
680+
Value: "Some error message 2",
681+
},
682+
},
683+
{
684+
XMLName: xml.Name{Space: "", Local: "testcase"},
685+
ConfigurationHash: "",
686+
Name: "Testcase number 3",
687+
ClassName: "example.exampleTest",
688+
Time: 0.445,
689+
Error: nil,
690+
Skipped: nil,
691+
Failure: &testreport.Failure{
692+
XMLName: xml.Name{Space: "", Local: "failure"},
693+
Value: "Error\n\nSystem error:\nSome error message 3\n\nSystem output:\n[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 3\n[INFO] 13:12:43:\tLog line 2 3\n",
694+
},
695+
SystemOut: &testreport.SystemOut{
696+
XMLName: xml.Name{Space: "", Local: "system-out"},
697+
Value: "[INFO] 13:12:43:\n[INFO] 13:12:43:\tLog line 1 3\n[INFO] 13:12:43:\tLog line 2 3\n",
698+
},
699+
SystemErr: &testreport.SystemErr{
700+
XMLName: xml.Name{Space: "", Local: "system-err"},
701+
Value: "Some error message 3",
702+
},
703+
},
704+
{
705+
XMLName: xml.Name{Space: "", Local: "testcase"},
706+
ConfigurationHash: "",
707+
Name: "Testcase number 3",
708+
ClassName: "example.exampleTest",
709+
Time: 0,
710+
Skipped: nil,
711+
Error: nil,
712+
Failure: &testreport.Failure{
713+
XMLName: xml.Name{Space: "", Local: "failure"},
714+
Value: "System error:\nFlaky failure system error",
715+
},
716+
},
717+
{
718+
XMLName: xml.Name{Space: "", Local: "testcase"},
719+
ConfigurationHash: "",
720+
Name: "Testcase number 3",
721+
ClassName: "example.exampleTest",
722+
Time: 0,
723+
Skipped: nil,
724+
Error: nil,
725+
Failure: &testreport.Failure{
726+
XMLName: xml.Name{Space: "", Local: "failure"},
727+
Value: "System error:\nFlaky error system error",
728+
},
729+
},
730+
{
731+
XMLName: xml.Name{Space: "", Local: "testcase"},
732+
ConfigurationHash: "",
733+
Name: "Testcase number 3",
734+
ClassName: "example.exampleTest",
735+
Time: 0,
736+
Skipped: nil,
737+
Error: nil,
738+
Failure: &testreport.Failure{
739+
XMLName: xml.Name{Space: "", Local: "failure"},
740+
Value: "System error:\nRerun failure system error",
741+
},
742+
},
743+
{
744+
XMLName: xml.Name{Space: "", Local: "testcase"},
745+
ConfigurationHash: "",
746+
Name: "Testcase number 3",
747+
ClassName: "example.exampleTest",
748+
Time: 0,
749+
Skipped: nil,
750+
Error: nil,
751+
Failure: &testreport.Failure{
752+
XMLName: xml.Name{Space: "", Local: "failure"},
753+
Value: "System error:\nRerun error system error",
754+
},
755+
},
671756
},
672757
},
673758
},

‎test/testdata/ios_device_config_xml_output.golden‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<testsuites>
3-
<testsuite name="DarkAndLightModeTests" tests="3" failures="1" skipped="0" time="0.3711">
3+
<testsuite name="DarkAndLightModeTests" tests="3" failures="1" errors="0" skipped="0" time="0.3711">
44
<testcase configuration-hash="" name="testExample()" classname="DarkAndLightModeTests" time="0.11">
55
<failure>DarkAndLightModeTests.swift:25: failed - Reached 1</failure>
66
</testcase>
77
<testcase configuration-hash="" name="testExample()" classname="DarkAndLightModeTests" time="0.0011"></testcase>
88
<testcase configuration-hash="" name="testPerformanceExample()" classname="DarkAndLightModeTests" time="0.26"></testcase>
99
</testsuite>
10-
<testsuite name="DarkAndLightModeUITests" tests="3" failures="1" skipped="0" time="36">
10+
<testsuite name="DarkAndLightModeUITests" tests="3" failures="1" errors="0" skipped="0" time="36">
1111
<testcase configuration-hash="" name="testExample()" classname="DarkAndLightModeUITests" time="3"></testcase>
1212
<testcase configuration-hash="" name="testLaunchPerformance()" classname="DarkAndLightModeUITests" time="28"></testcase>
1313
<testcase configuration-hash="" name="testLaunch()" classname="DarkAndLightModeUITestsLaunchTests" time="5">

‎test/testdata/ios_xml_output.golden‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<testsuites>
3-
<testsuite name="BitriseBasicUITest" tests="4" failures="0" skipped="0" time="77.06086790561676">
3+
<testsuite name="BitriseBasicUITest" tests="4" failures="0" errors="0" skipped="0" time="77.06086790561676">
44
<testcase configuration-hash="" name="testCollectionView()" classname="BitriseBasicUITest" time="23.776288986206055"></testcase>
55
<testcase configuration-hash="" name="testInReadTopView()" classname="BitriseBasicUITest" time="34.97628891468048"></testcase>
66
<testcase configuration-hash="" name="testInterstitialView()" classname="BitriseBasicUITest" time="10.270301938056946"></testcase>
77
<testcase configuration-hash="" name="testRewardView()" classname="BitriseBasicUITest" time="8.037988066673279"></testcase>
88
</testsuite>
9-
<testsuite name="BitriseCommanderUITests" tests="1" failures="0" skipped="1" time="40.58690905570984">
9+
<testsuite name="BitriseCommanderUITests" tests="1" failures="0" errors="0" skipped="1" time="40.58690905570984">
1010
<testcase configuration-hash="" name="testCommanderUpdate()" classname="BitriseCommanderUITests" time="40.58690905570984">
1111
<skipped></skipped>
1212
</testcase>
1313
</testsuite>
14-
<testsuite name="BitriseComponentUITest" tests="2" failures="0" skipped="0" time="33.92029893398285">
14+
<testsuite name="BitriseComponentUITest" tests="2" failures="0" errors="0" skipped="0" time="33.92029893398285">
1515
<testcase configuration-hash="" name="testAdChoiceIcon()" classname="BitriseComponentUITest" time="15.12886095046997"></testcase>
1616
<testcase configuration-hash="" name="testFullScreenReplay()" classname="BitriseComponentUITest" time="18.79143798351288"></testcase>
1717
</testsuite>
18-
<testsuite name="BitriseOMUITests" tests="3" failures="1" skipped="0" time="80.687903881073">
18+
<testsuite name="BitriseOMUITests" tests="3" failures="1" errors="0" skipped="0" time="80.687903881073">
1919
<testcase configuration-hash="" name="testOMBanner()" classname="BitriseOMUITests" time="15.550718903541565">
2020
<failure>/Users/vagrant/git/BitriseApp/BitriseAppUITests/BitriseOMUITests.swift:70 - XCTAssertTrue failed - No session found</failure>
2121
</testcase>
2222
<testcase configuration-hash="" name="testOMInterstitial()" classname="BitriseOMUITests" time="26.03164303302765"></testcase>
2323
<testcase configuration-hash="" name="testOMScrollView()" classname="BitriseOMUITests" time="39.105541944503784"></testcase>
2424
</testsuite>
25-
<testsuite name="BitriseTrackingsUITest" tests="2" failures="0" skipped="0" time="28.362125039100647">
25+
<testsuite name="BitriseTrackingsUITest" tests="2" failures="0" errors="0" skipped="0" time="28.362125039100647">
2626
<testcase configuration-hash="" name="testTrackingsWithAd()" classname="BitriseTrackingsUITest" time="16.5611629486084"></testcase>
2727
<testcase configuration-hash="" name="testTrackingsWithNoAd()" classname="BitriseTrackingsUITest" time="11.800962090492249"></testcase>
2828
</testsuite>
29-
<testsuite name="bitrErrorUITest" tests="9" failures="0" skipped="0" time="152.8058191537857">
29+
<testsuite name="bitrErrorUITest" tests="9" failures="0" errors="0" skipped="0" time="152.8058191537857">
3030
<testcase configuration-hash="" name="testbitrError403()" classname="bitrErrorUITest" time="16.062182068824768"></testcase>
3131
<testcase configuration-hash="" name="testbitrError405()" classname="bitrErrorUITest" time="16.12081003189087"></testcase>
3232
<testcase configuration-hash="" name="testbitrError901()" classname="bitrErrorUITest" time="16.46643900871277"></testcase>

0 commit comments

Comments
 (0)