Refactor: test CollectionUtils -> general collectionUtils. (#3535)

* (rebase): remove ec2 changes from this branch

* remove TODO comment

Co-authored-by: JadenSimon <[email protected]>

* delete final remnants of ec2

* delete old file

---------

Co-authored-by: JadenSimon <[email protected]>

Author: Hweinstock

src/shared/utilities/collectionUtils.ts

@@ -488,3 +488,24 @@ export async function* joinAll<T>(iterable: AsyncIterable<AsyncIterable<T>>): As
         }
     } while (!iterables.completed)
 }
+
+export async function* asyncGenerator<T>(items: T[]): AsyncIterableIterator<T> {
+    yield* items
+}
+
+export function intoCollection<T>(arr: T[]): AsyncCollection<T> {
+    return toCollection(async function* () {
+        yield* arr
+    })
+}
+
+export function createCollectionFromPages<T>(...pages: T[]): AsyncCollection<T> {
+    return toCollection(async function* () {
+        for (let i = 0; i < pages.length - 1; i++) {
+            yield pages[i]
+        }
+
+        return pages[pages.length - 1]
+    })
+}
+

src/test/apigateway/explorer/apiGatewayNodes.test.ts

@@ -8,7 +8,7 @@ import {
     assertNodeListOnlyHasErrorNode,
     assertNodeListOnlyHasPlaceholderNode,
 } from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import { ApiGatewayNode } from '../../../apigateway/explorer/apiGatewayNodes'
 import { RestApiNode } from '../../../apigateway/explorer/apiNodes'
 import { DefaultApiGatewayClient } from '../../../shared/clients/apiGatewayClient'

src/test/apprunner/explorer/apprunnerServiceNode.test.ts

@@ -11,7 +11,7 @@ import { AppRunnerNode } from '../../../apprunner/explorer/apprunnerNode'
 import { AppRunnerServiceNode } from '../../../apprunner/explorer/apprunnerServiceNode'
 import { DefaultAppRunnerClient } from '../../../shared/clients/apprunnerClient'
 import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { stub } from '../../utilities/stubber'
 import { getLabel } from '../../../shared/treeview/utils'

src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert'
 import { contextValueCloudwatchLog, LogGroupNode } from '../../../cloudWatchLogs/explorer/logGroupNode'
 import { CloudWatchLogsNode } from '../../../cloudWatchLogs/explorer/cloudWatchLogsNode'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import {
     assertNodeListOnlyHasErrorNode,
     assertNodeListOnlyHasPlaceholderNode,

src/test/codecatalyst/wizards/selectResource.test.ts

@@ -6,17 +6,10 @@
 import { instance, when } from 'ts-mockito'
 import { createOrgPrompter, createProjectPrompter } from '../../../codecatalyst/wizards/selectResource'
 import { CodeCatalystOrg, CodeCatalystClient, CodeCatalystProject } from '../../../shared/clients/codecatalystClient'
-import { AsyncCollection, toCollection } from '../../../shared/utilities/asyncCollection'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
 import { createQuickPickPrompterTester } from '../../shared/ui/testUtils'
 import { mock } from '../../utilities/mockito'
 
-// TODO: move to test utils
-function intoCollection<T>(arr: T[]): AsyncCollection<T> {
-    return toCollection(async function* () {
-        yield* arr
-    })
-}
-
 describe('Prompts', function () {
     let orgs: CodeCatalystOrg[]
     let projects: CodeCatalystProject[]

src/test/dynamicResources/explorer/moreResourcesNode.test.ts

@@ -9,7 +9,7 @@ import { ResourcesNode } from '../../../dynamicResources/explorer/nodes/resource
 import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
 import { CloudFormationClient } from '../../../shared/clients/cloudFormationClient'
 import { assertNodeListOnlyHasPlaceholderNode } from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import { mock, instance, when } from 'ts-mockito'
 import { CloudFormation } from 'aws-sdk'
 import { CloudControlClient } from '../../../shared/clients/cloudControlClient'

src/test/ecs/model.test.ts

@@ -6,7 +6,7 @@
 import { Cluster, Container, Service } from '../../ecs/model'
 import { DefaultEcsClient } from '../../shared/clients/ecsClient'
 import { assertChildren, assertTreeItem } from '../shared/treeview/testUtil'
-import { createCollectionFromPages } from '../utilities/collectionUtils'
+import { createCollectionFromPages } from '../../shared/utilities/collectionUtils'
 import { stub } from '../utilities/stubber'
 
 const clusterData = {

src/test/eventSchemas/commands/searchSchemas.test.ts

@@ -9,7 +9,7 @@ import { Schemas } from 'aws-sdk'
 import * as sinon from 'sinon'
 import { SchemasNode } from '../../../eventSchemas/explorer/schemasNode'
 import { getTabSizeSetting } from '../../../shared/utilities/editorUtilities'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 
 import { MockOutputChannel } from '../../mockOutputChannel'
 import {

src/test/eventSchemas/explorer/registryItemNode.test.ts

@@ -17,7 +17,7 @@ import {
     assertNodeListOnlyHasErrorNode,
     assertNodeListOnlyHasPlaceholderNode,
 } from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import { getIcon } from '../../../shared/icons'
 import { stub } from '../../utilities/stubber'
 

src/test/eventSchemas/providers/schemasDataProvider.test.ts

@@ -10,7 +10,7 @@ import {
     SchemasDataProvider,
 } from '../../../eventSchemas/providers/schemasDataProvider'
 import { DefaultSchemaClient } from '../../../shared/clients/schemaClient'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import { stub } from '../../utilities/stubber'
 
 describe('schemasDataProvider', function () {