fix: integration and unit test

Author: ChengShi-1

test/integration/files/FilesRepository.test.ts

@@ -62,8 +62,6 @@ describe('FilesRepository', () => {
 
   let testFileId: number
   let testFilePersistentId: string
-  let deaccessionedTestFileId: number
-  let deaccessionedFileTestDatasetIds: CreatedDatasetIdentifiers
 
   beforeAll(async () => {
     ApiConfig.init(
@@ -505,46 +503,36 @@ describe('FilesRepository', () => {
     describe('getFile with deaccessioned dataset', () => {
       test('should return file if dataset is deaccessioned, and includeDeaccessioned is true', async () => {
         const testTextFile1Name = 'test-file-1.txt'
-        deaccessionedFileTestDatasetIds = await createDataset.execute(
+
+        const deaccessionedFileTestDatasetIds = await createDataset.execute(
           TestConstants.TEST_NEW_DATASET_DTO
         )
 
-        await publishDatasetViaApi(deaccessionedFileTestDatasetIds.numericId)
-        await waitForNoLocks(deaccessionedFileTestDatasetIds.numericId, 10)
-
-        uploadFileViaApi(deaccessionedFileTestDatasetIds.numericId, testTextFile1Name).catch(() => {
-          throw new Error(`Error while uploading file ${testTextFile1Name}`)
+        await uploadFileViaApi(deaccessionedFileTestDatasetIds.numericId, testTextFile1Name).catch(
+          () => {
+            throw new Error(`Error while uploading file ${testTextFile1Name}`)
+          }
+        )
+        await publishDatasetViaApi(deaccessionedFileTestDatasetIds.numericId).catch(() => {
+          throw new Error('Error while publishing test Dataset')
+        })
+        await waitForNoLocks(deaccessionedFileTestDatasetIds.numericId, 10).catch(() => {
+          throw new Error('Error while waiting for no locks')
         })
-
-        await deaccessionDatasetViaApi(deaccessionedFileTestDatasetIds.numericId, '1.0')
 
         const datasetFiles = await sut.getDatasetFiles(
           deaccessionedFileTestDatasetIds.numericId,
           latestDatasetVersionId,
           false,
           FileOrderCriteria.NAME_AZ
         )
-        deaccessionedTestFileId = datasetFiles.files[0].id
-
-        const actual = (await sut.getFile(
-          deaccessionedTestFileId,
-          DatasetNotNumberedVersion.LATEST,
-          false,
-          true
-        )) as FileModel
-
-        expect(actual.name).toBe(testTextFile1Name)
-      })
+        const deaccessionedTestFileId = datasetFiles.files[0].id
 
-      test('should return error if dataset is deaccessioned, and includeDeaccessioned is false', async () => {
-        const expectedError = new ReadError(
-          `[404] "File metadata for file with id ${deaccessionedTestFileId} in dataset version 1.0 not found"`
-        )
+        await deaccessionDatasetViaApi(deaccessionedFileTestDatasetIds.numericId, '1.0')
 
-        await expect(sut.getFile(deaccessionedTestFileId, '1.0', false, false)).rejects.toThrow(
-          expectedError
-        )
+        const actual = (await sut.getFile(deaccessionedTestFileId, '1.0', false, true)) as FileModel
 
+        expect(actual.name).toBe(testTextFile1Name)
         deletePublishedDatasetViaApi(deaccessionedFileTestDatasetIds.persistentId)
       })
     })

test/unit/files/FilesRepository.test.ts

@@ -1043,13 +1043,13 @@ describe('FilesRepository', () => {
         jest.spyOn(axios, 'get').mockResolvedValue(testGetFileResponse)
 
         // API Key auth
-        let actual = await sut.getFile(testFile.id, DatasetNotNumberedVersion.LATEST, false)
+        let actual = await sut.getFile(testFile.id, DatasetNotNumberedVersion.LATEST, false, false)
         expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
         expect(actual).toEqual(createFileModel())
 
         // Session cookie auth
         ApiConfig.init(TestConstants.TEST_API_URL, DataverseApiAuthMechanism.SESSION_COOKIE)
-        actual = await sut.getFile(testFile.id, DatasetNotNumberedVersion.LATEST, false)
+        actual = await sut.getFile(testFile.id, DatasetNotNumberedVersion.LATEST, false, false)
         expect(axios.get).toHaveBeenCalledWith(
           expectedApiEndpoint,
           expectedRequestConfigSessionCookie
@@ -1061,7 +1061,7 @@ describe('FilesRepository', () => {
         jest.spyOn(axios, 'get').mockRejectedValue(TestConstants.TEST_ERROR_RESPONSE)
 
         await expect(
-          sut.getFile(testFile.id, DatasetNotNumberedVersion.LATEST, false)
+          sut.getFile(testFile.id, DatasetNotNumberedVersion.LATEST, false, false)
         ).rejects.toThrow(ReadError)
       })
     })
@@ -1076,6 +1076,7 @@ describe('FilesRepository', () => {
         let actual = await sut.getFile(
           TestConstants.TEST_DUMMY_PERSISTENT_ID,
           DatasetNotNumberedVersion.LATEST,
+          false,
           false
         )
         expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
@@ -1086,6 +1087,7 @@ describe('FilesRepository', () => {
         actual = await sut.getFile(
           TestConstants.TEST_DUMMY_PERSISTENT_ID,
           DatasetNotNumberedVersion.LATEST,
+          false,
           false
         )
         expect(axios.get).toHaveBeenCalledWith(
@@ -1102,6 +1104,7 @@ describe('FilesRepository', () => {
           sut.getFile(
             TestConstants.TEST_DUMMY_PERSISTENT_ID,
             DatasetNotNumberedVersion.LATEST,
+            false,
             false
           )
         ).rejects.toThrow(ReadError)