From 701ae04f65a662b04fefa9623f70f0ee359eaac6 Mon Sep 17 00:00:00 2001
From: Marcin Mielnicki <marcin.mielnicki@gmail.com>
Date: Mon, 16 Oct 2023 21:45:15 +0200
Subject: [PATCH] Remove extra filed parentName

---
 .../TestExecutionResultsRegisterService.kt    |  5 ++---
 .../TestExecutionScheduleTestListener.kt      |  6 ++----
 .../TestExecutionScheduleReportBuilder.kt     |  3 +--
 ...xecutionMermaidDiagramFormatterSpec.groovy | 20 +++++++++----------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionResultsRegisterService.kt b/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionResultsRegisterService.kt
index 89cda91..3046b4a 100644
--- a/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionResultsRegisterService.kt
+++ b/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionResultsRegisterService.kt
@@ -21,11 +21,10 @@ abstract class TestExecutionResultsRegisterService : BuildService<BuildServicePa
             startTime: Long,
             endTime: Long,
             resultType: String,
-            type: TimedTestResult.Type,
-            parentName: String?
+            type: TimedTestResult.Type
         ) {
             val taskResults = results.getOrPut(task) { TestExecutionScheduleReportBuilder() }
-            taskResults.add(className, testName, startTime, endTime, resultType, type, parentName)
+            taskResults.add(className, testName, startTime, endTime, resultType, type)
         }
     }
 
diff --git a/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionScheduleTestListener.kt b/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionScheduleTestListener.kt
index 0642a78..80d1bdb 100644
--- a/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionScheduleTestListener.kt
+++ b/src/main/kotlin/io/github/platan/tests_execution_chart/gradle/TestExecutionScheduleTestListener.kt
@@ -27,8 +27,7 @@ class TestExecutionScheduleTestListener(
                 result.startTime,
                 result.endTime,
                 result.resultType.toString(),
-                TimedTestResult.Type.SUITE,
-                suite.parent?.name
+                TimedTestResult.Type.SUITE
             )
         }
     }
@@ -44,8 +43,7 @@ class TestExecutionScheduleTestListener(
             testResult.startTime,
             testResult.endTime,
             testResult.resultType.toString(),
-            TimedTestResult.Type.TEST,
-            testDescriptor.parent?.name
+            TimedTestResult.Type.TEST
         )
     }
 }
diff --git a/tests-execution-chart-commons/src/main/kotlin/io/github/platan/tests_execution_chart/report/TestExecutionScheduleReportBuilder.kt b/tests-execution-chart-commons/src/main/kotlin/io/github/platan/tests_execution_chart/report/TestExecutionScheduleReportBuilder.kt
index 1bc9d5e..69e351e 100644
--- a/tests-execution-chart-commons/src/main/kotlin/io/github/platan/tests_execution_chart/report/TestExecutionScheduleReportBuilder.kt
+++ b/tests-execution-chart-commons/src/main/kotlin/io/github/platan/tests_execution_chart/report/TestExecutionScheduleReportBuilder.kt
@@ -11,8 +11,7 @@ class TestExecutionScheduleReportBuilder {
         startTime: Long,
         endTime: Long,
         resultType: String,
-        type: TimedTestResult.Type,
-        parentName: String?
+        type: TimedTestResult.Type
     ) {
         results.add(TimedTestResult(className, testName, startTime, endTime, resultType, type))
     }
diff --git a/tests-execution-chart-commons/src/test/groovy/io/github/platan/tests_execution_chart/reporters/mermaid/TestExecutionMermaidDiagramFormatterSpec.groovy b/tests-execution-chart-commons/src/test/groovy/io/github/platan/tests_execution_chart/reporters/mermaid/TestExecutionMermaidDiagramFormatterSpec.groovy
index cb96c07..fbe4ed4 100644
--- a/tests-execution-chart-commons/src/test/groovy/io/github/platan/tests_execution_chart/reporters/mermaid/TestExecutionMermaidDiagramFormatterSpec.groovy
+++ b/tests-execution-chart-commons/src/test/groovy/io/github/platan/tests_execution_chart/reporters/mermaid/TestExecutionMermaidDiagramFormatterSpec.groovy
@@ -16,13 +16,13 @@ class TestExecutionMermaidDiagramFormatterSpec extends Specification {
         def getDefault = TimeZone.getDefault()
         TimeZone.setDefault(SimpleTimeZone.getTimeZone(ZoneOffset.ofHours(2)))
         def reportBuilder = new TestExecutionScheduleReportBuilder()
-        reportBuilder.add('Test1', 'test1', 1681402397000, 1681402397100, 'SUCCESS', TEST, 'parent name')
-        reportBuilder.add('Test1', 'test2', 1681402397100, 1681402397300, 'SUCCESS', TEST, 'parent name')
-        reportBuilder.add('Test1', 'suite', 1681402397000, 1681402397300, 'SUCCESS', SUITE, 'parent name')
-        reportBuilder.add('Test2', 'test1', 1681402397000, 1681402397100, 'FAILURE', TEST, 'parent name')
-        reportBuilder.add('Test2', 'suite', 1681402397000, 1681402397300, 'FAILURE', SUITE, 'parent name')
-        reportBuilder.add('Test3', 'test1', 1681402397100, 1681402397300, 'SKIPPED', TEST, 'parent name')
-        reportBuilder.add('Test3', 'suite', 1681402397000, 1681402397300, 'SKIPPED', SUITE, 'parent name')
+        reportBuilder.add('Test1', 'test1', 1681402397000, 1681402397100, 'SUCCESS', TEST)
+        reportBuilder.add('Test1', 'test2', 1681402397100, 1681402397300, 'SUCCESS', TEST)
+        reportBuilder.add('Test1', 'suite', 1681402397000, 1681402397300, 'SUCCESS', SUITE)
+        reportBuilder.add('Test2', 'test1', 1681402397000, 1681402397100, 'FAILURE', TEST)
+        reportBuilder.add('Test2', 'suite', 1681402397000, 1681402397300, 'FAILURE', SUITE)
+        reportBuilder.add('Test3', 'test1', 1681402397100, 1681402397300, 'SKIPPED', TEST)
+        reportBuilder.add('Test3', 'suite', 1681402397000, 1681402397300, 'SKIPPED', SUITE)
         def report = reportBuilder.getResults()
 
         when:
@@ -55,9 +55,9 @@ suite - 300 ms :2023-04-13T18:13:17.000+0200, 2023-04-13T18:13:17.300+0200
         def getDefault = TimeZone.getDefault()
         TimeZone.setDefault(SimpleTimeZone.getTimeZone(ZoneOffset.ofHours(2)))
         def reportBuilder = new TestExecutionScheduleReportBuilder()
-        reportBuilder.add('Test1', 'test1', 1681402397000, 1681402397100, 'SUCCESS', TEST, 'parent name')
-        reportBuilder.add('Test1', 'test2', 1681402397100, 1681402397300, 'SUCCESS', TEST, 'parent name')
-        reportBuilder.add('Test2', 'test1', 1681402397000, 1681402397100, 'SUCCESS', TEST, 'parent name')
+        reportBuilder.add('Test1', 'test1', 1681402397000, 1681402397100, 'SUCCESS', TEST)
+        reportBuilder.add('Test1', 'test2', 1681402397100, 1681402397300, 'SUCCESS', TEST)
+        reportBuilder.add('Test2', 'test1', 1681402397000, 1681402397100, 'SUCCESS', TEST)
         def results = reportBuilder.getResults()
         def report = results.copy(results.results, [new Mark('mark1', 1681402397400)])