Check if delta link is populated in tests (#4624)
Update new test framework to populate page delta links and check if a delta value is returned when expected. The exact value is not compared but we do check if the value is non-empty --- #### 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 - [ ] 🐛 Bugfix - [ ] 🗺️ Documentation - [x] 🤖 Supportability/Tests - [ ] 💻 CI/Deployment - [ ] 🧹 Tech Debt/Cleanup #### Test Plan - [x] 💪 Manual - [ ] ⚡ Unit test - [ ] 💚 E2E
This commit is contained in:
parent
7662cfca68
commit
d173551d25
@ -83,8 +83,9 @@ func (ti testItem) GetAdditionalData() map[string]any {
|
|||||||
// mock page
|
// mock page
|
||||||
|
|
||||||
type testPage struct {
|
type testPage struct {
|
||||||
values []testItem
|
values []testItem
|
||||||
nextLink string
|
nextLink string
|
||||||
|
deltaLink string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p testPage) GetOdataNextLink() *string {
|
func (p testPage) GetOdataNextLink() *string {
|
||||||
@ -92,8 +93,7 @@ func (p testPage) GetOdataNextLink() *string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p testPage) GetOdataDeltaLink() *string {
|
func (p testPage) GetOdataDeltaLink() *string {
|
||||||
// delta is not tested here
|
return ptr.To(p.deltaLink)
|
||||||
return ptr.To("")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p testPage) GetValue() []testItem {
|
func (p testPage) GetValue() []testItem {
|
||||||
@ -147,16 +147,22 @@ func (p *testIDsNonDeltaMultiPager) GetPage(
|
|||||||
return testPage{}, err
|
return testPage{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var nextLink string
|
var (
|
||||||
|
nextLink string
|
||||||
|
deltaLink string
|
||||||
|
)
|
||||||
|
|
||||||
if p.pageIdx < len(p.pages) {
|
if p.pageIdx < len(p.pages) {
|
||||||
// Value doesn't matter as long as it's not empty.
|
// Value doesn't matter as long as it's not empty.
|
||||||
nextLink = "next"
|
nextLink = "next"
|
||||||
|
} else {
|
||||||
|
deltaLink = "delta"
|
||||||
}
|
}
|
||||||
|
|
||||||
return testPage{
|
return testPage{
|
||||||
values: res.items,
|
values: res.items,
|
||||||
nextLink: nextLink,
|
nextLink: nextLink,
|
||||||
|
deltaLink: deltaLink,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -421,6 +427,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs() {
|
|||||||
p *testIDsNonDeltaMultiPager,
|
p *testIDsNonDeltaMultiPager,
|
||||||
) (NonDeltaHandler[testItem], DeltaHandler[testItem])
|
) (NonDeltaHandler[testItem], DeltaHandler[testItem])
|
||||||
expectDeltaReset bool
|
expectDeltaReset bool
|
||||||
|
expectDeltaLink assert.ValueAssertionFunc
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "NoPrevDelta",
|
name: "NoPrevDelta",
|
||||||
@ -431,6 +438,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs() {
|
|||||||
return nil, newDeltaPager(p)
|
return nil, newDeltaPager(p)
|
||||||
},
|
},
|
||||||
expectDeltaReset: true,
|
expectDeltaReset: true,
|
||||||
|
expectDeltaLink: assert.NotEmpty,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "PrevDelta",
|
name: "PrevDelta",
|
||||||
@ -441,6 +449,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs() {
|
|||||||
) (NonDeltaHandler[testItem], DeltaHandler[testItem]) {
|
) (NonDeltaHandler[testItem], DeltaHandler[testItem]) {
|
||||||
return nil, newDeltaPager(p)
|
return nil, newDeltaPager(p)
|
||||||
},
|
},
|
||||||
|
expectDeltaLink: assert.NotEmpty,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "DeltaNotAllowed",
|
name: "DeltaNotAllowed",
|
||||||
@ -451,6 +460,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs() {
|
|||||||
return p, nil
|
return p, nil
|
||||||
},
|
},
|
||||||
expectDeltaReset: true,
|
expectDeltaReset: true,
|
||||||
|
expectDeltaLink: assert.Empty,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -631,6 +641,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs() {
|
|||||||
|
|
||||||
assert.Equal(t, modTimeTest.validModTimes, addRemoved.ValidModTimes, "valid mod times")
|
assert.Equal(t, modTimeTest.validModTimes, addRemoved.ValidModTimes, "valid mod times")
|
||||||
assert.Equal(t, pagerTypeTest.expectDeltaReset, addRemoved.DU.Reset, "delta update")
|
assert.Equal(t, pagerTypeTest.expectDeltaReset, addRemoved.DU.Reset, "delta update")
|
||||||
|
pagerTypeTest.expectDeltaLink(t, addRemoved.DU.URL, "delta link")
|
||||||
|
|
||||||
assertAddedAndRemoved(
|
assertAddedAndRemoved(
|
||||||
t,
|
t,
|
||||||
@ -656,9 +667,10 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs() {
|
|||||||
// cancellation, etc.
|
// cancellation, etc.
|
||||||
func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs_FallbackPagers() {
|
func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs_FallbackPagers() {
|
||||||
type expected struct {
|
type expected struct {
|
||||||
errCheck assert.ErrorAssertionFunc
|
errCheck assert.ErrorAssertionFunc
|
||||||
added []testItem
|
added []testItem
|
||||||
removed []testItem
|
removed []testItem
|
||||||
|
deltaLink assert.ValueAssertionFunc
|
||||||
}
|
}
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@ -712,6 +724,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs_FallbackPagers() {
|
|||||||
removed: []testItem{
|
removed: []testItem{
|
||||||
removedItem2,
|
removedItem2,
|
||||||
},
|
},
|
||||||
|
deltaLink: assert.NotEmpty,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -748,7 +761,8 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs_FallbackPagers() {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
expect: expected{
|
expect: expected{
|
||||||
errCheck: assert.NoError,
|
errCheck: assert.NoError,
|
||||||
|
deltaLink: assert.NotEmpty,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -802,6 +816,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs_FallbackPagers() {
|
|||||||
removedItem1,
|
removedItem1,
|
||||||
removedItem2,
|
removedItem2,
|
||||||
},
|
},
|
||||||
|
deltaLink: assert.Empty,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -848,7 +863,8 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs_FallbackPagers() {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
expect: expected{
|
expect: expected{
|
||||||
errCheck: assert.NoError,
|
errCheck: assert.NoError,
|
||||||
|
deltaLink: assert.Empty,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -877,6 +893,7 @@ func (suite *PagerUnitSuite) TestGetAddedAndRemovedItemIDs_FallbackPagers() {
|
|||||||
|
|
||||||
assert.Equal(t, modTimeTest.validModTimes, addRemoved.ValidModTimes, "valid mod times")
|
assert.Equal(t, modTimeTest.validModTimes, addRemoved.ValidModTimes, "valid mod times")
|
||||||
assert.True(t, addRemoved.DU.Reset, "delta update")
|
assert.True(t, addRemoved.DU.Reset, "delta update")
|
||||||
|
test.expect.deltaLink(t, addRemoved.DU.URL, "delta link")
|
||||||
|
|
||||||
assertAddedAndRemoved(
|
assertAddedAndRemoved(
|
||||||
t,
|
t,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user