Iterate-Test Suite Move (#701)

Test suite move of iterator functions from `exchange-service-test.go` to `iterators_test.go`

src/internal/connector/exchange/exchange_service_test.go

@@ -5,9 +5,6 @@ import (
 	"testing"
 	"time"
 
-	absser "github.com/microsoft/kiota-abstractions-go/serialization"
-	msgraphgocore "github.com/microsoftgraph/msgraph-sdk-go-core"
-	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -409,87 +406,6 @@ func (suite *ExchangeServiceSuite) TestGetContainerID() {
 	}
 }
 
-// TestIterativeFunctions verifies that GraphQuery to Iterate
-// functions are valid for current versioning of msgraph-go-sdk
-func (suite *ExchangeServiceSuite) TestIterativeFunctions() {
-	var (
-		mailScope, contactScope selectors.ExchangeScope
-		userID                  = tester.M365UserID(suite.T())
-		sel                     = selectors.NewExchangeBackup()
-	)
-
-	sel.Include(sel.Users([]string{userID}))
-
-	eb, err := sel.ToExchangeBackup()
-	require.NoError(suite.T(), err)
-
-	scopes := eb.Scopes()
-
-	for _, scope := range scopes {
-		if scope.IncludesCategory(selectors.ExchangeContactFolder) {
-			contactScope = scope
-		}
-
-		if scope.IncludesCategory(selectors.ExchangeMail) {
-			mailScope = scope
-		}
-	}
-
-	tests := []struct {
-		name              string
-		queryFunction     GraphQuery
-		iterativeFunction GraphIterateFunc
-		scope             selectors.ExchangeScope
-		transformer       absser.ParsableFactory
-	}{
-		{
-			name:              "Mail Iterative Check",
-			queryFunction:     GetAllMessagesForUser,
-			iterativeFunction: IterateSelectAllDescendablesForCollections,
-			scope:             mailScope,
-			transformer:       models.CreateMessageCollectionResponseFromDiscriminatorValue,
-		}, {
-			name:              "Contacts Iterative Check",
-			queryFunction:     GetAllContactsForUser,
-			iterativeFunction: IterateSelectAllDescendablesForCollections,
-			scope:             contactScope,
-			transformer:       models.CreateContactFromDiscriminatorValue,
-		}, {
-			name:              "Folder Iterative Check",
-			queryFunction:     GetAllFolderNamesForUser,
-			iterativeFunction: IterateFilterFolderDirectoriesForCollections,
-			scope:             mailScope,
-			transformer:       models.CreateMailFolderCollectionResponseFromDiscriminatorValue,
-		},
-	}
-	for _, test := range tests {
-		suite.T().Run(test.name, func(t *testing.T) {
-			response, err := test.queryFunction(suite.es, userID)
-			require.NoError(t, err)
-			// Create Iterator
-			pageIterator, err := msgraphgocore.NewPageIterator(response,
-				&suite.es.adapter,
-				test.transformer)
-			require.NoError(t, err)
-			// Create collection for iterate test
-			collections := make(map[string]*Collection)
-			var errs error
-			// callbackFunc iterates through all models.Messageable and fills exchange.Collection.jobs[]
-			// with corresponding item IDs. New collections are created for each directory
-			callbackFunc := test.iterativeFunction(
-				userID,
-				test.scope,
-				errs, false,
-				suite.es.credentials,
-				collections,
-				nil)
-
-			iterateError := pageIterator.Iterate(callbackFunc)
-			require.NoError(t, iterateError)
-		})
-	}
-}
-
 // TestRestoreContact ensures contact object can be created, placed into
 // the Corso Folder. The function handles test clean-up.
 func (suite *ExchangeServiceSuite) TestRestoreContact() {

src/internal/connector/exchange/iterators_test.go

@@ -3,12 +3,17 @@ package exchange
 import (
 	"testing"
 
+	absser "github.com/microsoft/kiota-abstractions-go/serialization"
+	msgraphgocore "github.com/microsoftgraph/msgraph-sdk-go-core"
+	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/alcionai/corso/internal/connector/mockconnector"
 	"github.com/alcionai/corso/internal/connector/support"
+	"github.com/alcionai/corso/internal/tester"
+	"github.com/alcionai/corso/pkg/selectors"
 )
 
 type ExchangeIteratorSuite struct {
@@ -16,6 +21,13 @@ type ExchangeIteratorSuite struct {
 }
 
 func TestExchangeIteratorSuite(t *testing.T) {
+	if err := tester.RunOnAny(
+		tester.CorsoCITests,
+		tester.CorsoGraphConnectorTests,
+	); err != nil {
+		t.Skip(err)
+	}
+
 	suite.Run(t, new(ExchangeIteratorSuite))
 }
 
@@ -42,3 +54,102 @@ func (suite *ExchangeIteratorSuite) TestDescendable() {
 	assert.NotNil(t, aDescendable.GetId())
 	assert.NotNil(t, aDescendable.GetParentFolderId())
 }
+
+func loadService(t *testing.T) *exchangeService {
+	_, err := tester.GetRequiredEnvVars(tester.M365AcctCredEnvs...)
+	require.NoError(t, err)
+
+	a := tester.NewM365Account(t)
+	require.NoError(t, err)
+
+	m365, err := a.M365Config()
+	require.NoError(t, err)
+
+	service, err := createService(m365, false)
+	require.NoError(t, err)
+
+	return service
+}
+
+// TestIterativeFunctions verifies that GraphQuery to Iterate
+// functions are valid for current versioning of msgraph-go-sdk
+func (suite *ExchangeIteratorSuite) TestIterativeFunctions() {
+	var (
+		t                       = suite.T()
+		mailScope, contactScope selectors.ExchangeScope
+		userID                  = tester.M365UserID(t)
+		sel                     = selectors.NewExchangeBackup()
+		service                 = loadService(t)
+	)
+
+	sel.Include(sel.Users([]string{userID}))
+
+	eb, err := sel.ToExchangeBackup()
+	require.NoError(suite.T(), err)
+
+	scopes := eb.Scopes()
+
+	for _, scope := range scopes {
+		if scope.IncludesCategory(selectors.ExchangeContactFolder) {
+			contactScope = scope
+		}
+
+		if scope.IncludesCategory(selectors.ExchangeMail) {
+			mailScope = scope
+		}
+	}
+
+	tests := []struct {
+		name              string
+		queryFunction     GraphQuery
+		iterativeFunction GraphIterateFunc
+		scope             selectors.ExchangeScope
+		transformer       absser.ParsableFactory
+	}{
+		{
+			name:              "Mail Iterative Check",
+			queryFunction:     GetAllMessagesForUser,
+			iterativeFunction: IterateSelectAllDescendablesForCollections,
+			scope:             mailScope,
+			transformer:       models.CreateMessageCollectionResponseFromDiscriminatorValue,
+		}, {
+			name:              "Contacts Iterative Check",
+			queryFunction:     GetAllContactsForUser,
+			iterativeFunction: IterateSelectAllDescendablesForCollections,
+			scope:             contactScope,
+			transformer:       models.CreateContactFromDiscriminatorValue,
+		}, {
+			name:              "Folder Iterative Check",
+			queryFunction:     GetAllFolderNamesForUser,
+			iterativeFunction: IterateFilterFolderDirectoriesForCollections,
+			scope:             mailScope,
+			transformer:       models.CreateMailFolderCollectionResponseFromDiscriminatorValue,
+		},
+	}
+	for _, test := range tests {
+		suite.T().Run(test.name, func(t *testing.T) {
+			response, err := test.queryFunction(service, userID)
+			require.NoError(t, err)
+			// Create Iterator
+			pageIterator, err := msgraphgocore.NewPageIterator(response,
+				&service.adapter,
+				test.transformer)
+			require.NoError(t, err)
+			// Create collection for iterate test
+			collections := make(map[string]*Collection)
+			var errs error
+			// callbackFunc iterates through all models.Messageable and fills exchange.Collection.jobs[]
+			// with corresponding item IDs. New collections are created for each directory
+			callbackFunc := test.iterativeFunction(
+				userID,
+				test.scope,
+				errs, false,
+				service.credentials,
+				collections,
+				nil)
+
+			iterateError := pageIterator.Iterate(callbackFunc)
+			require.NoError(t, iterateError)
+		})
+	}
+}