Skip to content

Commit

Permalink
Updating tests and namespaces so that they run against production rel…
Browse files Browse the repository at this point in the history 
…ease of M.G.C
  • Loading branch information
@MIchaelMainer
MIchaelMainer committed Aug 15, 2019
1 parent 0a5a312 commit 36e9654
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
5 changes: 4 additions & 1 deletion src/Microsoft.Graph/Microsoft.Graph.csproj
View file
Expand Up @@ -22,7 +22,10 @@
<VersionPrefix>1.16.0</VersionPrefix>
<!-- VersionPrefix minor version is not required to be manually set. It will be updated automatically. Major and patch versions must be automatically set. -->
<VersionSuffix></VersionSuffix>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageReleaseNotes>
- New generated requests and models.
- Add PageIterator from Microsoft.Graph.Core library.
</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.3|AnyCPU'">
<DocumentationFile>bin\Release\Microsoft.Graph.xml</DocumentationFile>
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.Graph/Tasks/PageIterator.cs
View file
Expand Up @@ -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
{
/// <summary>
/// Use PageIterator&lt;TEntity&gt; to automatically page through result sets across multiple calls
Expand Down
40 changes: 19 additions & 21 deletions tests/Microsoft.Graph.DotnetCore.Test/Tasks/PageIteratorTests.cs
View file
Expand Up @@ -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.

/**
Expand All @@ -23,7 +21,7 @@ namespace Microsoft.Graph.DotnetCore.Test.Tasks
{
public class PageIteratorTests : GraphTestBase
{
private TT.PageIterator<Event> eventPageIterator;
private PageIterator<Event> eventPageIterator;

[Fact(Skip = "No CI set up for e2e tests")]
public async Task PageIteratorDevTest()
Expand All @@ -43,11 +41,11 @@ public async Task PageIteratorDevTest()
};

// This requires the dev to specify the generic type in the CollectionPage.
eventPageIterator = TT.PageIterator<Event>.CreatePageIterator(graphClient, iUserEventsCollectionPage, processEachEvent);
eventPageIterator = PageIterator<Event>.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")]
Expand All @@ -69,13 +67,13 @@ public async Task DeltaPageIteratorDevTest()
};

// This requires the dev to specify the generic type in the CollectionPage.
var messagePageIterator = TT.PageIterator<Message>.CreatePageIterator(graphClient,
var messagePageIterator = PageIterator<Message>.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<Recipient>()
Expand All @@ -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]
Expand All @@ -113,20 +111,20 @@ public async Task Given_Concrete_CollectionPage_It_Throws_RuntimeBinderException

page.AdditionalData.Add(Constants.OdataInstanceAnnotations.NextLink, "testnextlink");

eventPageIterator = TT.PageIterator<Event>.CreatePageIterator(graphClient, page, (e) => { return true; });
eventPageIterator = PageIterator<Event>.CreatePageIterator(graphClient, page, (e) => { return true; });
await Assert.ThrowsAsync<RuntimeBinderException>(() => eventPageIterator.IterateAsync());
}

[Fact]
public void Given_Null_CollectionPage_It_Throws_ArgumentNullException()
{
Assert.Throws<ArgumentNullException>(() => TT.PageIterator<Event>.CreatePageIterator(graphClient, null, (e) => { return true; }));
Assert.Throws<ArgumentNullException>(() => PageIterator<Event>.CreatePageIterator(graphClient, null, (e) => { return true; }));
}

[Fact]
public void Given_Null_Delegate_It_Throws_ArgumentNullException()
{
Assert.Throws<ArgumentNullException>(() => TT.PageIterator<Event>.CreatePageIterator(graphClient, new CollectionPage<Event>(), null));
Assert.Throws<ArgumentNullException>(() => PageIterator<Event>.CreatePageIterator(graphClient, new CollectionPage<Event>(), null));
}

[Fact]
Expand All @@ -142,7 +140,7 @@ public async Task Given_Concrete_Generated_CollectionPage_It_Iterates_Page_Items

List<Event> events = new List<Event>();

eventPageIterator = TT.PageIterator<Event>.CreatePageIterator(graphClient, page, (e) =>
eventPageIterator = PageIterator<Event>.CreatePageIterator(graphClient, page, (e) =>
{
events.Add(e);
return true;
Expand All @@ -165,7 +163,7 @@ public async Task Given_Concrete_Generated_CollectionPage_It_Stops_Iterating_Pag

List<Event> events = new List<Event>();

eventPageIterator = TT.PageIterator<Event>.CreatePageIterator(graphClient, page, (e) =>
eventPageIterator = PageIterator<Event>.CreatePageIterator(graphClient, page, (e) =>
{
if (e.Subject == "Subject7")
return false;
Expand All @@ -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]
Expand Down Expand Up @@ -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<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent);
eventPageIterator = PageIterator<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent);
await eventPageIterator.IterateAsync(pagingToken);

Assert.True(cancellationTokenSource.IsCancellationRequested, "The delegate page iterator did not cancel requests to fetch more pages.");
Expand Down Expand Up @@ -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<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent);
eventPageIterator = PageIterator<Event>.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]
Expand Down Expand Up @@ -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<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent);
eventPageIterator = PageIterator<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent);

await Assert.ThrowsAsync<ServiceException>(async () => await eventPageIterator.IterateAsync());
}
Expand Down Expand Up @@ -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<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent);
eventPageIterator = PageIterator<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, processEachEvent);
await eventPageIterator.IterateAsync();
}
catch (Exception)
Expand All @@ -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<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, (e) => { return true; });
eventPageIterator = PageIterator<Event>.CreatePageIterator(graphClient, mockUserEventsCollectionPage, (e) => { return true; });

// Assert
Assert.Equal<TT.PagingState>(TT.PagingState.NotStarted, eventPageIterator.State);
Assert.Equal<PagingState>(PagingState.NotStarted, eventPageIterator.State);
}
}
}

0 comments on commit 36e9654

Please sign in to comment.