Exchange Serialization test finalized (#611)

Finalize graph connector regression tests. Needed to change the use of GC to be singular due to parallel testing.

src/internal/connector/graph_connector_test.go

@@ -27,6 +27,13 @@ type GraphConnectorIntegrationSuite struct {
 	user      string
 }
 
+func loadConnector(t *testing.T) *GraphConnector {
+	a := tester.NewM365Account(t)
+	connector, err := NewGraphConnector(a)
+	require.NoError(t, err)
+	return connector
+}
+
 func TestGraphConnectorIntegrationSuite(t *testing.T) {
 	if err := tester.RunOnAny(
 		tester.CorsoCITests,
@@ -44,12 +51,8 @@ func (suite *GraphConnectorIntegrationSuite) SetupSuite() {
 
 	_, err := tester.GetRequiredEnvVars(tester.M365AcctCredEnvs...)
 	require.NoError(suite.T(), err)
-
+	suite.connector = loadConnector(suite.T())
-	a := tester.NewM365Account(suite.T())
+	suite.user = tester.M365UserID(suite.T())
-
-	suite.connector, err = NewGraphConnector(a)
-	suite.NoError(err)
-	suite.user = "lidiah@8qzvrj.onmicrosoft.com"
 	tester.LogTimeOfTest(suite.T())
 }
 
@@ -78,14 +81,15 @@ func (suite *GraphConnectorIntegrationSuite) TestSetTenantUsers() {
 // for the Exchange Package. Enabled exchange applications:
 // - mail
 func (suite *GraphConnectorIntegrationSuite) TestExchangeDataCollection() {
-	userID := tester.M365UserID(suite.T())
+	t := suite.T()
+	connector := loadConnector(t)
 	sel := selectors.NewExchangeBackup()
-	sel.Include(sel.Users([]string{userID}))
+	sel.Include(sel.Users([]string{suite.user}))
-	collectionList, err := suite.connector.ExchangeDataCollection(context.Background(), sel.Selector)
+	collectionList, err := connector.ExchangeDataCollection(context.Background(), sel.Selector)
-	assert.NotNil(suite.T(), collectionList, "collection list")
+	assert.NotNil(t, collectionList, "collection list")
-	assert.Nil(suite.T(), err)
+	assert.Nil(t, err)
-	assert.True(suite.T(), suite.connector.awaitingMessages > 0)
+	assert.True(t, connector.awaitingMessages > 0)
-	assert.Nil(suite.T(), suite.connector.status)
+	assert.Nil(t, connector.status)
 	// Verify Items() call returns an iterable channel(e.g. a channel that has been closed)
 	channel := collectionList[0].Items()
 	for object := range channel {
@@ -93,9 +97,8 @@ func (suite *GraphConnectorIntegrationSuite) TestExchangeDataCollection() {
 		_, err := buf.ReadFrom(object.ToReader())
 		assert.Nil(suite.T(), err, "received a buf.Read error")
 	}
-	status := suite.connector.AwaitStatus()
+	status := connector.AwaitStatus()
-	assert.NotNil(suite.T(), status, "status not blocking on async call")
+	assert.NotNil(t, status, "status not blocking on async call")
-
 	exchangeData := collectionList[0]
 	suite.Greater(len(exchangeData.FullPath()), 2)
 }
@@ -105,21 +108,15 @@ func (suite *GraphConnectorIntegrationSuite) TestExchangeDataCollection() {
 // M365 mail objects
 func (suite *GraphConnectorIntegrationSuite) TestMailSerializationRegression() {
 	t := suite.T()
-	user := tester.M365UserID(suite.T())
+	connector := loadConnector(t)
 	sel := selectors.NewExchangeBackup()
-	sel.Include(sel.Users([]string{user}))
+	sel.Include(sel.MailFolders([]string{suite.user}, []string{selectors.AnyTgt}))
 	eb, err := sel.ToExchangeBackup()
 	require.NoError(t, err)
-	var mailScope selectors.ExchangeScope
+	scopes := eb.Scopes()
-	all := eb.Scopes()
+	suite.Equal(1, len(scopes))
-	for _, scope := range all {
+	mailScope := scopes[0]
-		fmt.Printf("%v\n", scope)
+	collection, err := connector.createCollections(context.Background(), mailScope)
-		if scope.IncludesCategory(selectors.ExchangeMail) {
-			mailScope = scope
-		}
-	}
-
-	collection, err := suite.connector.createCollections(context.Background(), mailScope)
 	require.NoError(t, err)
 	for _, edc := range collection {
 		testName := strings.Join(edc.FullPath(), " ")
@@ -134,30 +131,29 @@ func (suite *GraphConnectorIntegrationSuite) TestMailSerializationRegression() {
 				message, err := support.CreateMessageFromBytes(buf.Bytes())
 				suite.NotNil(message)
 				suite.NoError(err)
-
 			}
 		})
 	}
+	status := connector.AwaitStatus()
+	suite.NotNil(status)
+	suite.Equal(status.ObjectCount, status.Successful)
 }
 
-// TestContactBackupSequence verifies ability to query contact items
+// TestContactSerializationRegression verifies ability to query contact items
 // and to store contact within Collection. Downloaded contacts are run through
 // a regression test to ensure that downloaded items can be uploaded.
-func (suite *GraphConnectorIntegrationSuite) TestContactBackupSequence() {
+func (suite *GraphConnectorIntegrationSuite) TestContactSerializationRegression() {
-	userID := tester.M365UserID(suite.T())
+	t := suite.T()
 	sel := selectors.NewExchangeBackup()
-	sel.Include(sel.Users([]string{userID}))
+	sel.Include(sel.ContactFolders([]string{suite.user}, []string{selectors.AnyTgt}))
 	eb, err := sel.ToExchangeBackup()
-	require.NoError(suite.T(), err)
+	require.NoError(t, err)
 	scopes := eb.Scopes()
-	var contactsOnly selectors.ExchangeScope
+	connector := loadConnector(t)
-	for _, scope := range scopes {
+	suite.Equal(1, len(scopes))
-		if scope.IncludesCategory(selectors.ExchangeContactFolder) {
+	contactsOnly := scopes[0]
-			contactsOnly = scope
+	collections, err := connector.createCollections(context.Background(), contactsOnly)
-		}
+	assert.NoError(t, err)
-	}
-	collections, err := suite.connector.createCollections(context.Background(), contactsOnly)
-	assert.NoError(suite.T(), err)
 	number := 0
 	for _, edc := range collections {
 		testName := fmt.Sprintf("%s_ContactFolder_%d", edc.FullPath()[1], number)
@@ -176,7 +172,41 @@ func (suite *GraphConnectorIntegrationSuite) TestContactBackupSequence() {
 			number++
 		})
 	}
-	suite.Greater(len(collections), 0)
+	status := connector.AwaitStatus()
+	suite.NotNil(status)
+	suite.Equal(status.ObjectCount, status.Successful)
+}
+
+// TestEventsSerializationRegression ensures functionality of createCollections
+// to be able to successfully query, download and restore event objects
+func (suite *GraphConnectorIntegrationSuite) TestEventsSerializationRegression() {
+	t := suite.T()
+	connector := loadConnector(t)
+	sel := selectors.NewExchangeBackup()
+	sel.Include(sel.Events([]string{suite.user}, []string{selectors.AnyTgt}))
+	scopes := sel.Scopes()
+	suite.Equal(len(scopes), 1)
+	collections, err := connector.createCollections(context.Background(), scopes[0])
+	require.NoError(t, err)
+	for _, edc := range collections {
+		streamChannel := edc.Items()
+		number := 0
+		for stream := range streamChannel {
+			testName := fmt.Sprintf("%s_Event_%d", edc.FullPath()[2], number)
+			suite.T().Run(testName, func(t *testing.T) {
+				buf := &bytes.Buffer{}
+				read, err := buf.ReadFrom(stream.ToReader())
+				suite.NoError(err)
+				suite.NotZero(read)
+				event, err := support.CreateEventFromBytes(buf.Bytes())
+				assert.NotNil(t, event)
+				assert.NoError(t, err)
+			})
+		}
+	}
+	status := connector.AwaitStatus()
+	suite.NotNil(status)
+	suite.Equal(status.ObjectCount, status.Successful)
 }
 
 // TestRestoreMessages uses mock data to ensure GraphConnector
@@ -223,35 +253,6 @@ func (suite *GraphConnectorIntegrationSuite) TestGraphConnector_SingleMailFolder
 	}
 }
 
-// TestEventsBackupSequence ensures functionality of createCollections
-// to be able to successfully query, download and restore event objects
-func (suite *GraphConnectorIntegrationSuite) TestEventsBackupSequence() {
-	t := suite.T()
-	sel := selectors.NewExchangeBackup()
-	sel.Include(sel.Events([]string{suite.user}, []string{selectors.AnyTgt}))
-	scopes := sel.Scopes()
-	assert.Greater(t, len(scopes), 0)
-	collections, err := suite.connector.createCollections(context.Background(), scopes[0])
-	require.NoError(t, err)
-	suite.Greater(len(collections), 0)
-	for _, edc := range collections {
-		streamChannel := edc.Items()
-		number := 0
-		for stream := range streamChannel {
-			testName := fmt.Sprintf("%s_Event_%d", edc.FullPath()[1], number)
-			suite.T().Run(testName, func(t *testing.T) {
-				buf := &bytes.Buffer{}
-				read, err := buf.ReadFrom(stream.ToReader())
-				suite.NoError(err)
-				suite.NotZero(read)
-				event, err := support.CreateEventFromBytes(buf.Bytes())
-				assert.NotNil(t, event)
-				assert.NoError(t, err)
-			})
-		}
-	}
-}
-
 ///------------------------------------------------------------
 // Exchange Functions
 //-------------------------------------------------------