CI: Bug Fix Iterator Tests (#800)

## Description

Fixes mapping alignment during iterator tests

## Type of change


- [x] 🐛 Bugfix
- [x] 💻 CI/Deployment


## Issue(s)

<!-- Can reference multiple issues. Use one of the following "magic words" - "closes, fixes" to auto-close the Github issue. -->
* closes #797
## Test Plan

- [x]  Unit test
This commit is contained in:
Danny 2022-09-08 21:59:46 -04:00 committed by GitHub
parent 22c0bf5c3a
commit c02817ac86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions

View File

@ -96,13 +96,12 @@ func (suite *EventSuite) TestEventInfo() {
result := EventInfo(event) result := EventInfo(event)
suite.Equal(expected.Subject, result.Subject) suite.Equal(expected.Subject, result.Subject)
suite.Equal(expected.Sender, result.Sender) suite.Equal(expected.Sender, result.Sender)
expYear, expMonth, expDay := expected.EventStart.Date() expYear, expMonth, _ := expected.EventStart.Date() // Day not used at certain times of the day
expHr, expMin, expSec := expected.EventStart.Clock() expHr, expMin, expSec := expected.EventStart.Clock()
recvYear, recvMonth, recvDay := result.EventStart.Date() recvYear, recvMonth, _ := result.EventStart.Date()
recvHr, recvMin, recvSec := result.EventStart.Clock() recvHr, recvMin, recvSec := result.EventStart.Clock()
suite.Equal(expYear, recvYear) suite.Equal(expYear, recvYear)
suite.Equal(expMonth, recvMonth) suite.Equal(expMonth, recvMonth)
suite.Equal(expDay, recvDay)
suite.Equal(expHr, recvHr) suite.Equal(expHr, recvHr)
suite.Equal(expMin, recvMin) suite.Equal(expMin, recvMin)
suite.Equal(expSec, recvSec) suite.Equal(expSec, recvSec)

View File

@ -108,6 +108,7 @@ func (suite *ExchangeIteratorSuite) TestIterativeFunctions() {
iterativeFunction GraphIterateFunc iterativeFunction GraphIterateFunc
scope selectors.ExchangeScope scope selectors.ExchangeScope
transformer absser.ParsableFactory transformer absser.ParsableFactory
folderNames map[string]struct{}
}{ }{
{ {
name: "Mail Iterative Check", name: "Mail Iterative Check",
@ -115,6 +116,10 @@ func (suite *ExchangeIteratorSuite) TestIterativeFunctions() {
iterativeFunction: IterateSelectAllDescendablesForCollections, iterativeFunction: IterateSelectAllDescendablesForCollections,
scope: mailScope, scope: mailScope,
transformer: models.CreateMessageCollectionResponseFromDiscriminatorValue, transformer: models.CreateMessageCollectionResponseFromDiscriminatorValue,
folderNames: map[string]struct{}{
"Inbox": {},
"Sent Items": {},
},
}, { }, {
name: "Contacts Iterative Check", name: "Contacts Iterative Check",
queryFunction: GetAllContactsForUser, queryFunction: GetAllContactsForUser,
@ -127,6 +132,11 @@ func (suite *ExchangeIteratorSuite) TestIterativeFunctions() {
iterativeFunction: IterateFilterFolderDirectoriesForCollections, iterativeFunction: IterateFilterFolderDirectoriesForCollections,
scope: mailScope, scope: mailScope,
transformer: models.CreateMailFolderCollectionResponseFromDiscriminatorValue, transformer: models.CreateMailFolderCollectionResponseFromDiscriminatorValue,
folderNames: map[string]struct{}{
"Inbox": {},
"Sent Items": {},
"Deleted Items": {},
},
}, },
} }
for _, test := range tests { for _, test := range tests {
@ -169,23 +179,17 @@ func (suite *ExchangeIteratorSuite) TestIterativeFunctions() {
return return
} }
expectedFolderNames := map[string]struct{}{
"Inbox": {},
"Sent Items": {},
"Deleted Items": {},
}
for _, c := range collections { for _, c := range collections {
// TODO(ashmrtn): Update these checks when collections support path.Path. // TODO(ashmrtn): Update these checks when collections support path.Path.
require.Greater(t, len(c.FullPath()), 4) require.Greater(t, len(c.FullPath()), 4)
folder := c.FullPath()[4] folder := c.FullPath()[4]
if _, ok := expectedFolderNames[folder]; ok { if _, ok := test.folderNames[folder]; ok {
delete(expectedFolderNames, folder) delete(test.folderNames, folder)
} }
} }
assert.Empty(t, expectedFolderNames) assert.Empty(t, test.folderNames)
}) })
} }
} }