Skip to content

Commit 2334648

Browse files
committed
fix tests for refresh dataset
1 parent 7478629 commit 2334648

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
package com.cosmotech.dataset.service
44

55
import com.cosmotech.api.config.CsmPlatformProperties
6+
import com.cosmotech.api.events.CsmEventPublisher
7+
import com.cosmotech.api.events.TwingraphImportEvent
68
import com.cosmotech.api.exceptions.CsmAccessForbiddenException
79
import com.cosmotech.api.exceptions.CsmResourceNotFoundException
810
import com.cosmotech.api.rbac.PERMISSION_CREATE_CHILDREN
@@ -48,6 +50,7 @@ import com.redis.om.spring.RediSearchIndexer
4850
import com.redis.testcontainers.RedisStackContainer
4951
import com.redislabs.redisgraph.impl.api.RedisGraph
5052
import io.mockk.every
53+
import io.mockk.impl.annotations.MockK
5154
import io.mockk.junit5.MockKExtension
5255
import io.mockk.mockk
5356
import io.mockk.mockkStatic
@@ -101,6 +104,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
101104
@Autowired lateinit var connectorApiService: ConnectorApiService
102105
@Autowired lateinit var organizationApiService: OrganizationApiService
103106
@Autowired lateinit var csmPlatformProperties: CsmPlatformProperties
107+
@MockK(relaxUnitFun = true) private lateinit var eventPublisher: CsmEventPublisher
104108

105109
lateinit var connectorSaved: Connector
106110
lateinit var dataset: Dataset
@@ -125,6 +129,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
125129
redisGraph = RedisGraph(jedisPool)
126130
ReflectionTestUtils.setField(datasetApiService, "csmJedisPool", jedisPool)
127131
ReflectionTestUtils.setField(datasetApiService, "csmRedisGraph", redisGraph)
132+
ReflectionTestUtils.setField(datasetApiService, "eventPublisher", eventPublisher)
128133
}
129134

130135
@BeforeEach
@@ -1051,10 +1056,20 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
10511056

10521057
val organization = makeOrganizationWithRole()
10531058
organizationSaved = organizationApiService.registerOrganization(organization)
1054-
val dataset = makeDatasetWithRole(role = role, sourceType = DatasetSourceType.None)
1055-
datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset)
1059+
val dataset =
1060+
makeDatasetWithRole(role = role, sourceType = DatasetSourceType.Twincache)
1061+
val datasetParentSaved =
1062+
datasetApiService.createDataset(organizationSaved.id!!, dataset)
1063+
datasetSaved = datasetParentSaved
10561064
materializeTwingraph()
1065+
datasetSaved =
1066+
datasetApiService.createSubDataset(
1067+
organizationSaved.id!!, datasetParentSaved.id!!, SubDatasetGraphQuery())
10571068

1069+
every { eventPublisher.publishEvent(any<TwingraphImportEvent>()) } answers
1070+
{
1071+
firstArg<TwingraphImportEvent>().response = null
1072+
}
10581073
every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL
10591074

10601075
if (shouldThrow) {

dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ class DatasetServiceImpl(
345345
dataset.takeUnless { it.sourceType == DatasetSourceType.File }
346346
?: throw CsmResourceNotFoundException("Cannot be applied to source type 'File'")
347347
dataset.takeUnless { it.sourceType == DatasetSourceType.None }
348-
?: throw CsmResourceNotFoundException("Cannot be applied to source type 'None'")
348+
?: throw CsmResourceNotFoundException("Cannot be applied to source type 'None'")
349349
dataset.status?.takeUnless { it == Dataset.Status.PENDING }
350350
?: throw CsmClientException("Dataset in use, cannot update. Retry later")
351351

0 commit comments

Comments
 (0)