@@ -380,9 +380,14 @@ describe('CollectionsRepository', () => {
380380
381381 const testTextFile1Name = 'test-file-1.txt'
382382 const testSubCollectionAlias = 'collectionsRepositoryTestSubCollection'
383-
383+ const testCollectionItemsAlias = 'collectionsRepositoryTestCollectionItems'
384384 beforeAll ( async ( ) => {
385- await createCollectionViaApi ( testSubCollectionAlias , testCollectionAlias ) . catch ( ( ) => {
385+ await createCollectionViaApi ( testCollectionItemsAlias , ROOT_COLLECTION_ALIAS ) . catch ( ( ) => {
386+ throw new Error (
387+ `Tests beforeAll(): Error while creating collection ${ testCollectionItemsAlias } `
388+ )
389+ } )
390+ await createCollectionViaApi ( testSubCollectionAlias , testCollectionItemsAlias ) . catch ( ( ) => {
386391 throw new Error (
387392 `Tests beforeAll(): Error while creating subcollection ${ testSubCollectionAlias } `
388393 )
@@ -421,7 +426,7 @@ describe('CollectionsRepository', () => {
421426 // Give enough time to Solr for indexing
422427 await new Promise ( ( resolve ) => setTimeout ( resolve , 5000 ) )
423428
424- let actual = await sut . getCollectionItems ( testCollectionAlias )
429+ let actual = await sut . getCollectionItems ( testCollectionItemsAlias )
425430 const actualFilePreview = actual . items [ 1 ] as FilePreview
426431 const actualDatasetPreview = actual . items [ 0 ] as DatasetPreview
427432 const actualCollectionPreview = actual . items [ 2 ] as CollectionPreview
@@ -539,12 +544,12 @@ describe('CollectionsRepository', () => {
539544 expect ( actualCollectionPreview . alias ) . toBe ( testSubCollectionAlias )
540545 expect ( actualCollectionPreview . description ) . toBe ( 'We do all the science.' )
541546 expect ( actualCollectionPreview . imageUrl ) . toBe ( undefined )
542- expect ( actualCollectionPreview . parentAlias ) . toBe ( testCollectionAlias )
547+ expect ( actualCollectionPreview . parentAlias ) . toBe ( testCollectionItemsAlias )
543548 expect ( actualCollectionPreview . parentName ) . toBe ( expectedCollectionsName )
544549 expect ( actualCollectionPreview . publicationStatuses ) . toContain ( PublicationStatus . Unpublished )
545550 expect ( actualCollectionPreview . releaseOrCreateDate ) . not . toBeUndefined ( )
546551 expect ( actualCollectionPreview . affiliation ) . toBe ( 'Scientific Research University' )
547- expect ( actualCollectionPreview . parentAlias ) . toBe ( 'collectionsRepositoryTestCollection ' )
552+ expect ( actualCollectionPreview . parentAlias ) . toBe ( 'collectionsRepositoryTestCollectionItems ' )
548553 expect ( actualCollectionPreview . parentName ) . toBe ( expectedCollectionsName )
549554 expect ( actualCollectionPreview . type ) . toBe ( CollectionItemType . COLLECTION )
550555
@@ -553,7 +558,7 @@ describe('CollectionsRepository', () => {
553558 expect ( actual . facets ) . toEqual ( expectedFacetsAll )
554559
555560 // Test limit and offset
556- actual = await sut . getCollectionItems ( testCollectionAlias , 1 , 1 )
561+ actual = await sut . getCollectionItems ( testCollectionItemsAlias , 1 , 1 )
557562 expect ( ( actual . items [ 0 ] as FilePreview ) . name ) . toBe ( expectedFileName )
558563 expect ( actual . items . length ) . toBe ( 1 )
559564 expect ( actual . totalItemCount ) . toBe ( 3 )
@@ -563,7 +568,7 @@ describe('CollectionsRepository', () => {
563568 'test-fi'
564569 )
565570 actual = await sut . getCollectionItems (
566- testCollectionAlias ,
571+ testCollectionItemsAlias ,
567572 undefined ,
568573 undefined ,
569574 collectionSearchCriteriaForFile
@@ -575,7 +580,7 @@ describe('CollectionsRepository', () => {
575580 'Dataset created using'
576581 )
577582 actual = await sut . getCollectionItems (
578- testCollectionAlias ,
583+ testCollectionItemsAlias ,
579584 undefined ,
580585 undefined ,
581586 collectionSearchCriteriaForDataset
@@ -587,7 +592,7 @@ describe('CollectionsRepository', () => {
587592 const collectionSearchCriteriaForDatasetAndCollection =
588593 new CollectionSearchCriteria ( ) . withSearchText ( 'the' )
589594 actual = await sut . getCollectionItems (
590- testCollectionAlias ,
595+ testCollectionItemsAlias ,
591596 undefined ,
592597 undefined ,
593598 collectionSearchCriteriaForDatasetAndCollection
@@ -598,7 +603,7 @@ describe('CollectionsRepository', () => {
598603
599604 // Test search text, limit and offset
600605 actual = await sut . getCollectionItems (
601- testCollectionAlias ,
606+ testCollectionItemsAlias ,
602607 1 ,
603608 1 ,
604609 collectionSearchCriteriaForDatasetAndCollection
@@ -611,7 +616,7 @@ describe('CollectionsRepository', () => {
611616 const collectionSearchCriteriaForCollectionType =
612617 new CollectionSearchCriteria ( ) . withItemTypes ( [ CollectionItemType . COLLECTION ] )
613618 actual = await sut . getCollectionItems (
614- testCollectionAlias ,
619+ testCollectionItemsAlias ,
615620 undefined ,
616621 undefined ,
617622 collectionSearchCriteriaForCollectionType
@@ -626,7 +631,7 @@ describe('CollectionsRepository', () => {
626631 CollectionItemType . DATASET
627632 ] )
628633 actual = await sut . getCollectionItems (
629- testCollectionAlias ,
634+ testCollectionItemsAlias ,
630635 undefined ,
631636 undefined ,
632637 collectionSearchCriteriaForDatasetType
@@ -641,7 +646,7 @@ describe('CollectionsRepository', () => {
641646 CollectionItemType . FILE
642647 ] )
643648 actual = await sut . getCollectionItems (
644- testCollectionAlias ,
649+ testCollectionItemsAlias ,
645650 undefined ,
646651 undefined ,
647652 collectionSearchCriteriaForFileType
@@ -657,7 +662,7 @@ describe('CollectionsRepository', () => {
657662 CollectionItemType . COLLECTION
658663 ] )
659664 actual = await sut . getCollectionItems (
660- testCollectionAlias ,
665+ testCollectionItemsAlias ,
661666 undefined ,
662667 undefined ,
663668 collectionSearchCriteriaForMultiTypes
@@ -674,7 +679,7 @@ describe('CollectionsRepository', () => {
674679 . withOrder ( OrderType . ASC )
675680
676681 actual = await sut . getCollectionItems (
677- testCollectionAlias ,
682+ testCollectionItemsAlias ,
678683 undefined ,
679684 undefined ,
680685 collectionSearchCriteriaNameAscending
@@ -691,7 +696,7 @@ describe('CollectionsRepository', () => {
691696 . withOrder ( OrderType . DESC )
692697
693698 actual = await sut . getCollectionItems (
694- testCollectionAlias ,
699+ testCollectionItemsAlias ,
695700 undefined ,
696701 undefined ,
697702 collectionSearchCriteriaNameDescending
@@ -708,7 +713,7 @@ describe('CollectionsRepository', () => {
708713 . withOrder ( OrderType . ASC )
709714
710715 actual = await sut . getCollectionItems (
711- testCollectionAlias ,
716+ testCollectionItemsAlias ,
712717 undefined ,
713718 undefined ,
714719 collectionSearchCriteriaDateAscending
@@ -725,7 +730,7 @@ describe('CollectionsRepository', () => {
725730 . withOrder ( OrderType . DESC )
726731
727732 actual = await sut . getCollectionItems (
728- testCollectionAlias ,
733+ testCollectionItemsAlias ,
729734 undefined ,
730735 undefined ,
731736 collectionSearchCriteriaDateDescending
@@ -741,7 +746,7 @@ describe('CollectionsRepository', () => {
741746 new CollectionSearchCriteria ( ) . withFilterQueries ( [ 'dvCategory:Laboratory' ] )
742747
743748 actual = await sut . getCollectionItems (
744- testCollectionAlias ,
749+ testCollectionItemsAlias ,
745750 undefined ,
746751 undefined ,
747752 collectionSearchCriteriaFilterQueryCollection
@@ -758,7 +763,7 @@ describe('CollectionsRepository', () => {
758763 ] )
759764
760765 actual = await sut . getCollectionItems (
761- testCollectionAlias ,
766+ testCollectionItemsAlias ,
762767 undefined ,
763768 undefined ,
764769 collectionSearchCriteriaFilterQueryDataset
@@ -773,7 +778,7 @@ describe('CollectionsRepository', () => {
773778 new CollectionSearchCriteria ( ) . withFilterQueries ( [ 'fileAccess:Public' ] )
774779
775780 actual = await sut . getCollectionItems (
776- testCollectionAlias ,
781+ testCollectionItemsAlias ,
777782 undefined ,
778783 undefined ,
779784 collectionSearchCriteriaFilterQuerieCollAndFile
@@ -786,7 +791,7 @@ describe('CollectionsRepository', () => {
786791
787792 // Test with showTypeCounts param in true
788793 actual = await sut . getCollectionItems (
789- testCollectionAlias ,
794+ testCollectionItemsAlias ,
790795 undefined ,
791796 undefined ,
792797 undefined ,
0 commit comments