Skip to content

Commit

Permalink
Fixed report content validation test
Browse files Browse the repository at this point in the history
  • Loading branch information
gmazzo committed Nov 28, 2024
1 parent 82cc9ad commit 0c41c8b
Show file tree
Hide file tree
Showing 15 changed files with 59 additions and 50 deletions.
13 changes: 11 additions & 2 deletions demo-project/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,29 @@ tasks.jacocoAggregatedReport {
}

val reportsSpec = copySpec {
includeEmptyDirs = false
val tookRegEx = "\\b\\d+\\.\\d+s\\b".toRegex()

from(tasks.jacocoAggregatedReport) { include("**/*.csv") }
from(tasks.testAggregatedReport) {
into("tests")
filter { if (it.startsWith("<a href=\"http://www.gradle.org\">")) "" else it }
filter {
when {
it.startsWith("<a href=\"http://www.gradle.org\">") -> ""
else -> it.replace(tookRegEx, "0.100s")
}
}
}
includeEmptyDirs = false
}

tasks.register<Sync>("collectExpectedReports") {
outputs.upToDateWhen { false }
with(reportsSpec)
into(aggregatedReportsSpecs)
}

val checkAggregatedReportsContent by tasks.registering(Sync::class) {
outputs.upToDateWhen { false }
with(reportsSpec) { into("actual") }
into(temporaryDir)
doLast {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class MyUseCaseTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.008s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -76,7 +76,7 @@ <h2>Tests</h2>
</thead>
<tr>
<td class="success">testIsDone</td>
<td class="success">0.008s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class com.example.kmp.KMPObjectAndroidTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.067s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -76,12 +76,12 @@ <h2>Tests</h2>
</thead>
<tr>
<td class="success">testKMPObject</td>
<td class="success">0.034s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">testKMPObject</td>
<td class="success">0.033s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class com.example.kmp.KMPObjectJVMTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.060s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -78,7 +78,7 @@ <h2>Tests</h2>
<tr>
<td class="success">testKMPObject[jvm]</td>
<td class="success">testKMPObject</td>
<td class="success">0.060s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class com.example.kmp.KMPObjectTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.003s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -78,19 +78,19 @@ <h2>Tests</h2>
<tr>
<td class="success">testKMPObject</td>
<td class="success">testKMPObject</td>
<td class="success">0s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">testKMPObject[jvm]</td>
<td class="success">testKMPObject</td>
<td class="success">0.002s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">testKMPObject</td>
<td class="success">testKMPObject</td>
<td class="success">0.001s</td>
<td class="success">0s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class com.example.login.ExampleUnitTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.001s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -76,7 +76,7 @@ <h2>Tests</h2>
</thead>
<tr>
<td class="success">addition_isCorrect</td>
<td class="success">0.001s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class com.example.login.ui.data.LoginDataSourceTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.003s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -76,7 +76,7 @@ <h2>Tests</h2>
</thead>
<tr>
<td class="success">testLogin</td>
<td class="success">0.003s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class com.example.myapplication.ExampleUnitTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.006s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -76,12 +76,12 @@ <h2>Tests</h2>
</thead>
<tr>
<td class="success">addition_isCorrect</td>
<td class="success">0.001s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">addition_isCorrect</td>
<td class="success">0.005s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Class com.example.myapplication.MainActivityTest</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">6.137s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -79,12 +79,12 @@ <h2>Tests</h2>
</thead>
<tr>
<td class="success">shouldStart</td>
<td class="success">3.048s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">shouldStart</td>
<td class="success">3.089s</td>
<td class="success">0.100s</td>
<td class="success">passed</td>
</tr>
</table>
Expand Down
28 changes: 14 additions & 14 deletions demo-project/specs/aggregated-reports/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h1>Test Summary</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">6.285s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -85,7 +85,7 @@ <h2>Packages</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.008s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -95,7 +95,7 @@ <h2>Packages</h2>
<td>6</td>
<td>0</td>
<td>0</td>
<td>0.130s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -105,7 +105,7 @@ <h2>Packages</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.001s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -115,7 +115,7 @@ <h2>Packages</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.003s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -125,7 +125,7 @@ <h2>Packages</h2>
<td>4</td>
<td>0</td>
<td>0</td>
<td>6.143s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
</tbody>
Expand All @@ -152,7 +152,7 @@ <h2>Classes</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.008s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -162,7 +162,7 @@ <h2>Classes</h2>
<td>2</td>
<td>0</td>
<td>0</td>
<td>0.067s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -172,7 +172,7 @@ <h2>Classes</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.060s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -182,7 +182,7 @@ <h2>Classes</h2>
<td>3</td>
<td>0</td>
<td>0</td>
<td>0.003s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -192,7 +192,7 @@ <h2>Classes</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.001s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -202,7 +202,7 @@ <h2>Classes</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.003s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -212,7 +212,7 @@ <h2>Classes</h2>
<td>2</td>
<td>0</td>
<td>0</td>
<td>0.006s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -222,7 +222,7 @@ <h2>Classes</h2>
<td>2</td>
<td>0</td>
<td>0</td>
<td>6.137s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
</tbody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h1>Package com.example.kmp</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.130s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -83,7 +83,7 @@ <h2>Classes</h2>
<td>2</td>
<td>0</td>
<td>0</td>
<td>0.067s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -93,7 +93,7 @@ <h2>Classes</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.060s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
<tr>
Expand All @@ -103,7 +103,7 @@ <h2>Classes</h2>
<td>3</td>
<td>0</td>
<td>0</td>
<td>0.003s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h1>Package com.example.login</h1>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.001s</div>
<div class="counter">0.100s</div>
<p>duration</p>
</div>
</td>
Expand Down Expand Up @@ -83,7 +83,7 @@ <h2>Classes</h2>
<td>1</td>
<td>0</td>
<td>0</td>
<td>0.001s</td>
<td>0.100s</td>
<td class="success">100%</td>
</tr>
</table>
Expand Down
Loading

0 comments on commit 0c41c8b

Please sign in to comment.