Fix case comparison in switch cases (#2265)
## Description Fix case comparisons and add more robust tests for service at least ## Does this PR need a docs update or release note? - [ ] ✅ Yes, it's included - [ ] 🕐 Yes, but in a later PR - [x] ⛔ No ## Type of change - [ ] 🌻 Feature - [x] 🐛 Bugfix - [ ] 🗺️ Documentation - [ ] 🤖 Test - [ ] 💻 CI/Deployment - [ ] 🧹 Tech Debt/Cleanup ## Issue(s) * #2259 ## Test Plan - [ ] 💪 Manual - [x] ⚡ Unit test - [ ] 💚 E2E
This commit is contained in:
parent
4852667468
commit
b71e3d9147
@ -35,17 +35,17 @@ func toServiceType(service string) ServiceType {
|
|||||||
s := strings.ToLower(service)
|
s := strings.ToLower(service)
|
||||||
|
|
||||||
switch s {
|
switch s {
|
||||||
case ExchangeService.String():
|
case strings.ToLower(ExchangeService.String()):
|
||||||
return ExchangeService
|
return ExchangeService
|
||||||
case OneDriveService.String():
|
case strings.ToLower(OneDriveService.String()):
|
||||||
return OneDriveService
|
return OneDriveService
|
||||||
case SharePointService.String():
|
case strings.ToLower(SharePointService.String()):
|
||||||
return SharePointService
|
return SharePointService
|
||||||
case ExchangeMetadataService.String():
|
case strings.ToLower(ExchangeMetadataService.String()):
|
||||||
return ExchangeMetadataService
|
return ExchangeMetadataService
|
||||||
case OneDriveMetadataService.String():
|
case strings.ToLower(OneDriveMetadataService.String()):
|
||||||
return OneDriveMetadataService
|
return OneDriveMetadataService
|
||||||
case SharePointMetadataService.String():
|
case strings.ToLower(SharePointMetadataService.String()):
|
||||||
return SharePointMetadataService
|
return SharePointMetadataService
|
||||||
default:
|
default:
|
||||||
return UnknownService
|
return UnknownService
|
||||||
@ -77,21 +77,21 @@ func ToCategoryType(category string) CategoryType {
|
|||||||
cat := strings.ToLower(category)
|
cat := strings.ToLower(category)
|
||||||
|
|
||||||
switch cat {
|
switch cat {
|
||||||
case EmailCategory.String():
|
case strings.ToLower(EmailCategory.String()):
|
||||||
return EmailCategory
|
return EmailCategory
|
||||||
case ContactsCategory.String():
|
case strings.ToLower(ContactsCategory.String()):
|
||||||
return ContactsCategory
|
return ContactsCategory
|
||||||
case EventsCategory.String():
|
case strings.ToLower(EventsCategory.String()):
|
||||||
return EventsCategory
|
return EventsCategory
|
||||||
case FilesCategory.String():
|
case strings.ToLower(FilesCategory.String()):
|
||||||
return FilesCategory
|
return FilesCategory
|
||||||
case LibrariesCategory.String():
|
case strings.ToLower(LibrariesCategory.String()):
|
||||||
return LibrariesCategory
|
return LibrariesCategory
|
||||||
case ListsCategory.String():
|
case strings.ToLower(ListsCategory.String()):
|
||||||
return ListsCategory
|
return ListsCategory
|
||||||
case PagesCategory.String():
|
case strings.ToLower(PagesCategory.String()):
|
||||||
return PagesCategory
|
return PagesCategory
|
||||||
case DetailsCategory.String():
|
case strings.ToLower(DetailsCategory.String()):
|
||||||
return DetailsCategory
|
return DetailsCategory
|
||||||
default:
|
default:
|
||||||
return UnknownCategory
|
return UnknownCategory
|
||||||
|
|||||||
@ -74,14 +74,6 @@ func (suite *ServiceCategoryUnitSuite) TestValidateServiceAndCategory() {
|
|||||||
category: "foo",
|
category: "foo",
|
||||||
check: assert.Error,
|
check: assert.Error,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "DifferentCases",
|
|
||||||
service: strings.ToUpper(ExchangeService.String()),
|
|
||||||
category: strings.ToUpper(EmailCategory.String()),
|
|
||||||
expectedService: ExchangeService,
|
|
||||||
expectedCategory: EmailCategory,
|
|
||||||
check: assert.NoError,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: "ExchangeEmail",
|
name: "ExchangeEmail",
|
||||||
service: ExchangeService.String(),
|
service: ExchangeService.String(),
|
||||||
@ -137,3 +129,51 @@ func (suite *ServiceCategoryUnitSuite) TestValidateServiceAndCategory() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (suite *ServiceCategoryUnitSuite) TestToServiceType() {
|
||||||
|
table := []struct {
|
||||||
|
name string
|
||||||
|
service string
|
||||||
|
expected ServiceType
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "SameCase",
|
||||||
|
service: ExchangeMetadataService.String(),
|
||||||
|
expected: ExchangeMetadataService,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "DifferentCase",
|
||||||
|
service: strings.ToUpper(ExchangeMetadataService.String()),
|
||||||
|
expected: ExchangeMetadataService,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, test := range table {
|
||||||
|
suite.T().Run(test.name, func(t *testing.T) {
|
||||||
|
assert.Equal(t, test.expected, toServiceType(test.service))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *ServiceCategoryUnitSuite) TestToCategoryType() {
|
||||||
|
table := []struct {
|
||||||
|
name string
|
||||||
|
category string
|
||||||
|
expected CategoryType
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "SameCase",
|
||||||
|
category: EmailCategory.String(),
|
||||||
|
expected: EmailCategory,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "DifferentCase",
|
||||||
|
category: strings.ToUpper(EmailCategory.String()),
|
||||||
|
expected: EmailCategory,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, test := range table {
|
||||||
|
suite.T().Run(test.name, func(t *testing.T) {
|
||||||
|
assert.Equal(t, test.expected, ToCategoryType(test.category))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user