Fixing issue where saving grouped results wasn't setting the test sui…

…te index correctly
craigatk · Jan 17, 2020 · b93de60 · b93de60
1 parent f1f8dcb
commit b93de60
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/server/server-app/src/main/kotlin/projektor/testrun/TestRunDatabaseRepository.kt b/server/server-app/src/main/kotlin/projektor/testrun/TestRunDatabaseRepository.kt
@@ -37,7 +37,7 @@ class TestRunDatabaseRepository(private val dslContext: DSLContext) : TestRunRep
 
                 logger.info("Inserted test run $publicId")
 
-                saveTestSuites(testSuites, testRunDB.id, null, configuration)
+                saveTestSuites(testSuites, testRunDB.id, null, 0, configuration)
             }
 
             testRunSummary
@@ -57,24 +57,34 @@ class TestRunDatabaseRepository(private val dslContext: DSLContext) : TestRunRep
 
                     logger.info("Inserted test run $publicId")
 
+                    var testSuiteStartingIndex = 0
+
                     groupedResults.groupedTestSuites.forEach { groupedTestSuites ->
                         val testSuiteGroupDB = groupedTestSuites.toDB(testRunDB.id)
                         testSuiteGroupDao.insert(testSuiteGroupDB)
 
-                        saveTestSuites(groupedTestSuites.testSuites, testRunDB.id, testSuiteGroupDB.id, configuration)
+                        saveTestSuites(groupedTestSuites.testSuites, testRunDB.id, testSuiteGroupDB.id, testSuiteStartingIndex, configuration)
+
+                        testSuiteStartingIndex += groupedTestSuites.testSuites.size
                     }
                 }
 
                 testRunSummary
             }
 
-    private fun saveTestSuites(testSuites: List<ParsedTestSuite>, testRunId: Long, testGroupId: Long?, configuration: Configuration) {
+    private fun saveTestSuites(
+        testSuites: List<ParsedTestSuite>,
+        testRunId: Long,
+        testGroupId: Long?,
+        testSuiteStartingIndex: Int,
+        configuration: Configuration
+    ) {
         val testSuiteDao = TestSuiteDao(configuration)
         val testCaseDao = TestCaseDao(configuration)
         val testFailureDao = TestFailureDao(configuration)
 
         testSuites.forEachIndexed { testSuiteIdx, testSuite ->
-            val testSuiteDB = testSuite.toDB(testRunId, testGroupId, testSuiteIdx + 1)
+            val testSuiteDB = testSuite.toDB(testRunId, testGroupId, testSuiteStartingIndex + testSuiteIdx + 1)
             testSuiteDao.insert(testSuiteDB)
 
             testSuite.testCases.forEachIndexed { testCaseIdx, testCase ->

diff --git a/...server-app/src/test/kotlin/projektor/incomingresults/SaveGroupedResultsApplicationTest.kt b/...server-app/src/test/kotlin/projektor/incomingresults/SaveGroupedResultsApplicationTest.kt
@@ -16,6 +16,7 @@ import projektor.server.api.SaveResultsResponse
 import strikt.api.expectThat
 import strikt.assertions.hasSize
 import strikt.assertions.isEqualTo
+import strikt.assertions.isNotNull
 
 @KtorExperimentalAPI
 class SaveGroupedResultsApplicationTest : ApplicationTestCase() {
@@ -37,9 +38,24 @@ class SaveGroupedResultsApplicationTest : ApplicationTestCase() {
                 val testRun = await untilNotNull { testRunDao.fetchOneByPublicId(publicId) }
                 assertNotNull(testRun)
 
+                val testSuites = testSuiteDao.fetchByTestRunId(testRun.id)
+                expectThat(testSuites).hasSize(3)
+
+                expectThat(testSuites.find { it.idx == 1 }).isNotNull()
+                expectThat(testSuites.find { it.idx == 2 }).isNotNull()
+                expectThat(testSuites.find { it.idx == 3 }).isNotNull()
+
                 val testSuiteGroups = testSuiteGroupDao.fetchByTestRunId(testRun.id)
                 expectThat(testSuiteGroups)
                         .hasSize(2)
+
+                val testSuiteGroup1 = testSuiteGroups.find { it.groupName == "Group1" }
+                assertNotNull(testSuiteGroup1)
+                expectThat(testSuiteDao.fetchByTestSuiteGroupId(testSuiteGroup1.id)).hasSize(2)
+
+                val testSuiteGroup2 = testSuiteGroups.find { it.groupName == "Group2" }
+                assertNotNull(testSuiteGroup2)
+                expectThat(testSuiteDao.fetchByTestSuiteGroupId(testSuiteGroup2.id)).hasSize(1)
             }
         }
     }