From 36e96543c763321542f12e59925f20dc358e66c7 Mon Sep 17 00:00:00 2001 From: Michael Mainer Date: Thu, 15 Aug 2019 14:38:01 -0700 Subject: [PATCH] Updating tests and namespaces so that they run against production release of M.G.C --- src/Microsoft.Graph/Microsoft.Graph.csproj | 5 ++- src/Microsoft.Graph/Tasks/PageIterator.cs | 3 +- .../Tasks/PageIteratorTests.cs | 40 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Microsoft.Graph/Microsoft.Graph.csproj b/src/Microsoft.Graph/Microsoft.Graph.csproj index eaef869d820..9e27c56d98c 100644 --- a/src/Microsoft.Graph/Microsoft.Graph.csproj +++ b/src/Microsoft.Graph/Microsoft.Graph.csproj @@ -22,7 +22,10 @@ 1.16.0 - + +- New generated requests and models. +- Add PageIterator from Microsoft.Graph.Core library. + bin\Release\Microsoft.Graph.xml diff --git a/src/Microsoft.Graph/Tasks/PageIterator.cs b/src/Microsoft.Graph/Tasks/PageIterator.cs index 93583300504..7d3cfd8dffb 100644 --- a/src/Microsoft.Graph/Tasks/PageIterator.cs +++ b/src/Microsoft.Graph/Tasks/PageIterator.cs @@ -9,8 +9,7 @@ https://github.com/microsoftgraph/msgraph-sdk-design/blob/master/tasks/PageIteratorTask.md */ -// TODO: Change this back to Microsoft.Graph before publication. -namespace Microsoft.Graph.Tasks +namespace Microsoft.Graph { /// /// Use PageIterator<TEntity> to automatically page through result sets across multiple calls diff --git a/tests/Microsoft.Graph.DotnetCore.Test/Tasks/PageIteratorTests.cs b/tests/Microsoft.Graph.DotnetCore.Test/Tasks/PageIteratorTests.cs index f6bafefd4aa..82e5abe1bde 100644 --- a/tests/Microsoft.Graph.DotnetCore.Test/Tasks/PageIteratorTests.cs +++ b/tests/Microsoft.Graph.DotnetCore.Test/Tasks/PageIteratorTests.cs @@ -10,8 +10,6 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -using TT = Microsoft.Graph.Tasks; -// TODO: Remove this namespace before final build and publication - assumes that Core no longer has PageIterator. /** @@ -23,7 +21,7 @@ namespace Microsoft.Graph.DotnetCore.Test.Tasks { public class PageIteratorTests : GraphTestBase { - private TT.PageIterator eventPageIterator; + private PageIterator eventPageIterator; [Fact(Skip = "No CI set up for e2e tests")] public async Task PageIteratorDevTest() @@ -43,11 +41,11 @@ public async Task PageIteratorDevTest() }; // This requires the dev to specify the generic type in the CollectionPage. - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, iUserEventsCollectionPage, processEachEvent); + eventPageIterator = PageIterator.CreatePageIterator(graphClient, iUserEventsCollectionPage, processEachEvent); await eventPageIterator.IterateAsync(); - Assert.Equal(TT.PagingState.Complete, eventPageIterator.State); + Assert.Equal(PagingState.Complete, eventPageIterator.State); } [Fact(Skip = "No CI set up for e2e tests")] @@ -69,13 +67,13 @@ public async Task DeltaPageIteratorDevTest() }; // This requires the dev to specify the generic type in the CollectionPage. - var messagePageIterator = TT.PageIterator.CreatePageIterator(graphClient, + var messagePageIterator = PageIterator.CreatePageIterator(graphClient, messagesDeltaCollectionPage, processEachMessage); await messagePageIterator.IterateAsync(); - Assert.Equal(TT.PagingState.Delta, messagePageIterator.State); + Assert.Equal(PagingState.Delta, messagePageIterator.State); var me = await graphClient.Me.Request().GetAsync(); var recipients = new List() @@ -100,7 +98,7 @@ public async Task DeltaPageIteratorDevTest() await messagePageIterator.ResumeAsync(); - Assert.Equal(TT.PagingState.Delta, messagePageIterator.State); + Assert.Equal(PagingState.Delta, messagePageIterator.State); } [Fact] @@ -113,20 +111,20 @@ public async Task Given_Concrete_CollectionPage_It_Throws_RuntimeBinderException page.AdditionalData.Add(Constants.OdataInstanceAnnotations.NextLink, "testnextlink"); - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, page, (e) => { return true; }); + eventPageIterator = PageIterator.CreatePageIterator(graphClient, page, (e) => { return true; }); await Assert.ThrowsAsync(() => eventPageIterator.IterateAsync()); } [Fact] public void Given_Null_CollectionPage_It_Throws_ArgumentNullException() { - Assert.Throws(() => TT.PageIterator.CreatePageIterator(graphClient, null, (e) => { return true; })); + Assert.Throws(() => PageIterator.CreatePageIterator(graphClient, null, (e) => { return true; })); } [Fact] public void Given_Null_Delegate_It_Throws_ArgumentNullException() { - Assert.Throws(() => TT.PageIterator.CreatePageIterator(graphClient, new CollectionPage(), null)); + Assert.Throws(() => PageIterator.CreatePageIterator(graphClient, new CollectionPage(), null)); } [Fact] @@ -142,7 +140,7 @@ public async Task Given_Concrete_Generated_CollectionPage_It_Iterates_Page_Items List events = new List(); - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, page, (e) => + eventPageIterator = PageIterator.CreatePageIterator(graphClient, page, (e) => { events.Add(e); return true; @@ -165,7 +163,7 @@ public async Task Given_Concrete_Generated_CollectionPage_It_Stops_Iterating_Pag List events = new List(); - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, page, (e) => + eventPageIterator = PageIterator.CreatePageIterator(graphClient, page, (e) => { if (e.Subject == "Subject7") return false; @@ -177,7 +175,7 @@ public async Task Given_Concrete_Generated_CollectionPage_It_Stops_Iterating_Pag await eventPageIterator.IterateAsync(); Assert.Equal(7, events.Count); - Assert.Equal(TT.PagingState.Paused, eventPageIterator.State); + Assert.Equal(PagingState.Paused, eventPageIterator.State); } [Fact] @@ -225,7 +223,7 @@ public async Task Given_CollectionPage_It_Stops_Iterating_Across_Pages() Mocks.MockUserEventsCollectionRequest mockUserEventsCollectionRequest = new Mocks.MockUserEventsCollectionRequest(nextPage); var mockUserEventsCollectionPage = new Mocks.MockUserEventsCollectionPage(testEvents, mockUserEventsCollectionRequest) as IUserEventsCollectionPage; - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); + eventPageIterator = PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); await eventPageIterator.IterateAsync(pagingToken); Assert.True(cancellationTokenSource.IsCancellationRequested, "The delegate page iterator did not cancel requests to fetch more pages."); @@ -269,11 +267,11 @@ public async Task Given_CollectionPage_It_Iterates_Across_Pages() Mocks.MockUserEventsCollectionRequest mockUserEventsCollectionRequest = new Mocks.MockUserEventsCollectionRequest(nextPage); var mockUserEventsCollectionPage = new Mocks.MockUserEventsCollectionPage(originalCollectionPageEvents, mockUserEventsCollectionRequest, "nextLink") as IUserEventsCollectionPage; - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); + eventPageIterator = PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); await eventPageIterator.IterateAsync(); Assert.True(reachedNextPage, "The delegate page iterator did not reach the next page."); - Assert.Equal(TT.PagingState.Paused, eventPageIterator.State); + Assert.Equal(PagingState.Paused, eventPageIterator.State); } [Fact] @@ -310,7 +308,7 @@ public async Task Given_CollectionPage_It_Detects_Nextlink_Loop() Mocks.MockUserEventsCollectionRequest mockUserEventsCollectionRequest = new Mocks.MockUserEventsCollectionRequest(nextPage); var mockUserEventsCollectionPage = new Mocks.MockUserEventsCollectionPage(originalCollectionPageEvents, mockUserEventsCollectionRequest, "nextLink") as IUserEventsCollectionPage; - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); + eventPageIterator = PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); await Assert.ThrowsAsync(async () => await eventPageIterator.IterateAsync()); } @@ -340,7 +338,7 @@ public async Task Given_CollectionPage_It_Handles_Empty_NextPage() Mocks.MockUserEventsCollectionRequest mockUserEventsCollectionRequest = new Mocks.MockUserEventsCollectionRequest(nextPage); var mockUserEventsCollectionPage = new Mocks.MockUserEventsCollectionPage(originalCollectionPageEvents, mockUserEventsCollectionRequest) as IUserEventsCollectionPage; - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); + eventPageIterator = PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent); await eventPageIterator.IterateAsync(); } catch (Exception) @@ -360,10 +358,10 @@ public void Given_PageIterator_It_Has_PagingState_NotStarted() var mockUserEventsCollectionPage = new Mocks.MockUserEventsCollectionPage(originalCollectionPageEvents, mockUserEventsCollectionRequest, "nextlink") as IUserEventsCollectionPage; // Act - eventPageIterator = TT.PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, (e) => { return true; }); + eventPageIterator = PageIterator.CreatePageIterator(graphClient, mockUserEventsCollectionPage, (e) => { return true; }); // Assert - Assert.Equal(TT.PagingState.NotStarted, eventPageIterator.State); + Assert.Equal(PagingState.NotStarted, eventPageIterator.State); } } }