This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch SUREFIRE-1922 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 0c22931882ebb9309fc475563f8bee68fcb21513 Author: tibordigana <[email protected]> AuthorDate: Sat Jun 26 17:53:16 2021 +0200 [SUREFIRE-1922] Fixed internal tests after SUREFIRE-1921 --- .../plugins/surefire/report/Surefire597Test.java | 54 +++--- .../surefire/report/SurefireReportMojoTest.java | 214 ++++++++++----------- 2 files changed, 134 insertions(+), 134 deletions(-) diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java index 2f40a9f..3891871 100644 --- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java +++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java @@ -63,12 +63,12 @@ public class Surefire597Test + "<th>Success Rate</th>\n" + "<th>Time</th></tr>\n" + "<tr class=\"b\">\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td>" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td>" + "</tr>" + "</table>" ) ) ); assertThat( xml, containsString( toSystemNewLine( @@ -82,13 +82,13 @@ public class Surefire597Test + "<th>Success Rate</th>\n" + "<th>Time</th></tr>\n" + "<tr class=\"b\">\n" - + "<td><a href=\"#surefire\">surefire</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr></table>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr></table>" ) ) ); assertThat( xml, containsString( toSystemNewLine( "<table border=\"1\" class=\"bodyTable\">\n" + "<tr class=\"a\">\n" @@ -101,25 +101,25 @@ public class Surefire597Test + "<th>Success Rate</th>\n" + "<th>Time</th></tr>\n" + "<tr class=\"b\">\n" - + "<td><a href=\"#surefire.MyTest\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></a></td>\n" - + "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr></table>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire.MyTest\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></a></td>\n" + + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr></table>" ) ) ); assertThat( xml, containsString( toSystemNewLine( "<table border=\"1\" class=\"bodyTable\">\n" + "<tr class=\"a\">\n" - + "<td><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></td>\n" - + "<td><a name=\"surefire.MyTest.test\"></a>test</td></tr>\n" + + "<td align=\"left\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></td>\n" + + "<td align=\"left\"><a name=\"surefire.MyTest.test\"></a>test</td></tr>\n" + "<tr class=\"b\">\n" - + "<td></td>\n" - + "<td>java.lang.RuntimeException: java.lang.IndexOutOfBoundsException: msg</td></tr>\n" + + "<td align=\"left\"></td>\n" + + "<td align=\"left\">java.lang.RuntimeException: java.lang.IndexOutOfBoundsException: msg</td></tr>\n" + "<tr class=\"a\">\n" - + "<td></td>\n" - + "<td>\n" + + "<td align=\"left\"></td>\n" + + "<td align=\"left\">\n" + "<div id=\"test-error\">surefire.MyTest:13</div></td></tr></table>" ) ) ); } } diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java index d4dedd1..4fa4298 100644 --- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java +++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java @@ -221,10 +221,10 @@ public class SurefireReportMojoTest String htmlContent = FileUtils.fileRead( report ); - int idx = htmlContent.indexOf( "<td><a name=\"TC_com.shape.CircleTest.testX\"></a>testX</td>" ); + int idx = htmlContent.indexOf( "<td align=\"left\"><a name=\"TC_com.shape.CircleTest.testX\"></a>testX</td>" ); assertTrue( idx > 0 ); - idx = htmlContent.indexOf( "<td><a name=\"TC_com.shape.CircleTest.testRadius\"></a>" + idx = htmlContent.indexOf( "<td align=\"left\"><a name=\"TC_com.shape.CircleTest.testRadius\"></a>" + "<a href=\"#com.shape.CircleTest.testRadius\">testRadius</a>" ); assertTrue( idx > 0 ); } @@ -243,36 +243,36 @@ public class SurefireReportMojoTest assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td>" ) ) ); + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td><a href=\"#surefire\">surefire</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>" + + "<td align=\"left\">" + "<a href=\"#surefire.MyTest\">" + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>" + "</a>" + "</td>\n" - + "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( ">surefire.MyTest:13</a>" ) ); @@ -328,36 +328,36 @@ public class SurefireReportMojoTest assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td>" ) ) ); + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td><a href=\"#surefire\">surefire</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>" + + "<td align=\"left\">" + "<a href=\"#surefire.MyTest\">" + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>" + "</a>" + "</td>\n" - + "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( ">surefire.MyTest:13</a>" ) ); @@ -391,36 +391,36 @@ public class SurefireReportMojoTest assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td>" ) ) ); + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td><a href=\"#surefire\">surefire</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>" + + "<td align=\"left\">" + "<a href=\"#surefire.MyTest\">" + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>" + "</a>" + "</td>\n" - + "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( ">surefire.MyTest:13</a>" ) ); @@ -478,36 +478,36 @@ public class SurefireReportMojoTest assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td>" ) ) ); + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td><a href=\"#surefire\">surefire</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>" + + "<td align=\"left\">" + "<a href=\"#surefire.MyTest$A\">" + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>" + "</a>" + "</td>\n" - + "<td><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( ">surefire.MyTest$A:45</a>" ) ); @@ -540,36 +540,36 @@ public class SurefireReportMojoTest assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td>" ) ) ); + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td><a href=\"#surefire\">surefire</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( toSystemNewLine( "<tr class=\"b\">\n" - + "<td>" + + "<td align=\"left\">" + "<a href=\"#surefire.MyTest$A\">" + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>" + "</a>" + "</td>\n" - + "<td><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n" - + "<td>1</td>\n" - + "<td>1</td>\n" - + "<td>0</td>\n" - + "<td>0</td>\n" - + "<td>0%</td>\n" - + "<td>0</td></tr>" ) ) ); + + "<td align=\"left\"><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">1</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0</td>\n" + + "<td align=\"left\">0%</td>\n" + + "<td align=\"left\">0</td></tr>" ) ) ); assertThat( htmlContent, containsString( ">surefire.MyTest$A:45</a>" ) );
