Skip to content

Commit 347eab9

Browse files
committed
Refactor: using array in DatasetsRepository IT to setup test datasets
1 parent 8e3c0be commit 347eab9

File tree

1 file changed

+15
-29
lines changed

1 file changed

+15
-29
lines changed

test/integration/datasets/DatasetsRepository.test.ts

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ describe('DatasetsRepository', () => {
5555
describe('getAllDatasetPreviews', () => {
5656
const testPageLimit = 1
5757
const expectedTotalDatasetCount = 4
58-
let firstDatasetIds: CreatedDatasetIdentifiers
59-
let secondDatasetIds: CreatedDatasetIdentifiers
60-
let thirdDatasetIds: CreatedDatasetIdentifiers
61-
let fourthDatasetIds: CreatedDatasetIdentifiers
58+
let createdDatasetIds: CreatedDatasetIdentifiers[] = []
6259

6360
beforeAll(async () => {
6461
await createCollection()
@@ -75,22 +72,12 @@ describe('DatasetsRepository', () => {
7572
}
7673

7774
const createDatasets = async () => {
78-
firstDatasetIds = await createDataset.execute(
79-
TestConstants.TEST_NEW_DATASET_DTO,
80-
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
81-
)
82-
secondDatasetIds = await createDataset.execute(
83-
TestConstants.TEST_NEW_DATASET_DTO,
84-
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
85-
)
86-
thirdDatasetIds = await createDataset.execute(
87-
TestConstants.TEST_NEW_DATASET_DTO,
88-
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
89-
)
90-
fourthDatasetIds = await createDataset.execute(
91-
TestConstants.TEST_NEW_DATASET_DTO,
92-
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
93-
)
75+
for (let i = 0; i < expectedTotalDatasetCount; i++) {
76+
createdDatasetIds[i] = await createDataset.execute(
77+
TestConstants.TEST_NEW_DATASET_DTO,
78+
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
79+
)
80+
}
9481

9582
await waitForDatasetsIndexedInSolr(
9683
expectedTotalDatasetCount,
@@ -99,10 +86,9 @@ describe('DatasetsRepository', () => {
9986
}
10087

10188
const deleteDatasets = async () => {
102-
await deleteUnpublishedDatasetViaApi(firstDatasetIds.numericId)
103-
await deleteUnpublishedDatasetViaApi(secondDatasetIds.numericId)
104-
await deleteUnpublishedDatasetViaApi(thirdDatasetIds.numericId)
105-
await deleteUnpublishedDatasetViaApi(fourthDatasetIds.numericId)
89+
for (let i = 0; i < expectedTotalDatasetCount; i++) {
90+
await deleteUnpublishedDatasetViaApi(createdDatasetIds[i].numericId)
91+
}
10692
}
10793

10894
const deleteCollection = async () => {
@@ -116,7 +102,7 @@ describe('DatasetsRepository', () => {
116102
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
117103
)
118104
expect(actual.datasetPreviews.length).toEqual(expectedTotalDatasetCount)
119-
expect(actual.datasetPreviews[0].persistentId).toMatch(fourthDatasetIds.persistentId)
105+
expect(actual.datasetPreviews[0].persistentId).toMatch(createdDatasetIds[3].persistentId)
120106
expect(actual.totalDatasetCount).toEqual(expectedTotalDatasetCount)
121107
})
122108

@@ -127,7 +113,7 @@ describe('DatasetsRepository', () => {
127113
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
128114
)
129115
expect(actual.datasetPreviews.length).toEqual(1)
130-
expect(actual.datasetPreviews[0].persistentId).toMatch(fourthDatasetIds.persistentId)
116+
expect(actual.datasetPreviews[0].persistentId).toMatch(createdDatasetIds[3].persistentId)
131117
expect(actual.totalDatasetCount).toEqual(expectedTotalDatasetCount)
132118
})
133119

@@ -138,7 +124,7 @@ describe('DatasetsRepository', () => {
138124
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
139125
)
140126
expect(actual.datasetPreviews.length).toEqual(1)
141-
expect(actual.datasetPreviews[0].persistentId).toMatch(thirdDatasetIds.persistentId)
127+
expect(actual.datasetPreviews[0].persistentId).toMatch(createdDatasetIds[2].persistentId)
142128
expect(actual.totalDatasetCount).toEqual(expectedTotalDatasetCount)
143129
})
144130

@@ -149,7 +135,7 @@ describe('DatasetsRepository', () => {
149135
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
150136
)
151137
expect(actual.datasetPreviews.length).toEqual(1)
152-
expect(actual.datasetPreviews[0].persistentId).toMatch(secondDatasetIds.persistentId)
138+
expect(actual.datasetPreviews[0].persistentId).toMatch(createdDatasetIds[1].persistentId)
153139
expect(actual.totalDatasetCount).toEqual(expectedTotalDatasetCount)
154140
})
155141

@@ -160,7 +146,7 @@ describe('DatasetsRepository', () => {
160146
TestConstants.TEST_CREATED_COLLECTION_ALIAS_1
161147
)
162148
expect(actual.datasetPreviews.length).toEqual(1)
163-
expect(actual.datasetPreviews[0].persistentId).toMatch(firstDatasetIds.persistentId)
149+
expect(actual.datasetPreviews[0].persistentId).toMatch(createdDatasetIds[0].persistentId)
164150
expect(actual.totalDatasetCount).toEqual(expectedTotalDatasetCount)
165151
})
166152
})

0 commit comments

Comments
 (0)