Skip to content

.NET Core 2.2 -> 3.0 #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

.NET Core 2.2 -> 3.0 #595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
24a2ef3
merge: merge into correct email:
wisepotato Oct 23, 2019
adf845b
Merge branch 'feat/upgrade-2.2' into feat/upgrade-2.2-real
wisepotato Oct 23, 2019
4124aa9
feat: upgrade to 2.2
wisepotato Oct 23, 2019
fb6aa66
chore: merge fixes
wisepotato Oct 23, 2019
17f0c8c
chore: spacing fix
wisepotato Oct 23, 2019
10ea6cb
chore: revert silencing error
wisepotato Oct 23, 2019
0a4e322
chore: small spacing fix
wisepotato Oct 23, 2019
9697449
chore: remove unneeeded dependencies
wisepotato Oct 23, 2019
931c97c
chore: fix framework dependencies
wisepotato Oct 23, 2019
dd37d8e
chore: updates
wisepotato Oct 23, 2019
aaa7655
merge: merge from dev-v4
wisepotato Oct 23, 2019
13bfdeb
chore: test fixes
wisepotato Oct 23, 2019
5b10565
chore: start integration tests
wisepotato Oct 23, 2019
487728e
chore: cleanup name of dertest
wisepotato Oct 23, 2019
80ea141
chore: start of getRepostory
wisepotato Oct 23, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: start integration tests
  • Loading branch information
@wisepotato
wisepotato committed Oct 23, 2019
commit 5b10565325162cc2d12e64e036c8a43440fa8ae7
15 changes: 15 additions & 0 deletions JsonApiDotnetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore", "src\Js
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GettingStarted", "src\Examples\GettingStarted\GettingStarted.csproj", "{067FFD7A-C66B-473D-8471-37F5C95DF61C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "test\IntegrationTests\IntegrationTests.csproj", "{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -158,6 +160,18 @@ Global
{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x64.Build.0 = Release|Any CPU
{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.ActiveCfg = Release|Any CPU
{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.Build.0 = Release|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x64.ActiveCfg = Debug|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x64.Build.0 = Debug|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x86.ActiveCfg = Debug|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Debug|x86.Build.0 = Debug|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|Any CPU.Build.0 = Release|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x64.ActiveCfg = Release|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x64.Build.0 = Release|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x86.ActiveCfg = Release|Any CPU
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -173,6 +187,7 @@ Global
{789085E1-048F-4996-B600-791B9CA3A663} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{8BCFF95F-4850-427C-AEDB-B5B4F62B2C7B} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{21D27239-138D-4604-8E49-DCBE41BCE4C8} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
{CEB08B86-6BF1-4227-B20F-45AE9C1CC6D9} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A2421882-8F0A-4905-928F-B550B192F9A4}
Expand Down
7 changes: 5 additions & 2 deletions src/JsonApiDotNetCore/Data/DefaultResourceRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,13 @@ public virtual async Task<IEnumerable<TResource>> PageAsync(IQueryable<TResource
}

// since EntityFramework does not support IQueryable.Reverse(), we need to know the number of queried entities
int numberOfEntities = await this.CountAsync(entities);


entities = entities.Reverse();


// may be negative
int virtualFirstIndex = numberOfEntities - pageSize * Math.Abs(pageNumber);
int virtualFirstIndex = pageSize * Math.Abs(pageNumber);
int numberOfElementsInPage = Math.Min(pageSize, virtualFirstIndex + pageSize);

return await ToListAsync(entities
Expand Down
27 changes: 27 additions & 0 deletions test/IntegrationTests/Data/EntityRepositoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using Xunit;

namespace IntegrationTests.Data
{
public class EntityRepositoryTests
{

[Theory]
[InlineData(6, -1, new[] { 4, 5, 6, 7, 8, 9 })]
[InlineData(6, -2, new[] { 1, 2, 3 })]
[InlineData(20, -1, new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 })]
public async Task Paging_PageNumberIsNegative_PageCorrectIds(int pageSize, int pageNumber, int[] expectedIds)
{
// Arrange
var todoItems = DbSetMock.Create(TodoItems(1, 2, 3, 4, 5, 6, 7, 8, 9)).Object;
var repository = GetRepository();

var result = await repository.PageAsync(todoItems, pageSize, pageNumber);

Assert.Equal(TodoItems(expectedIds), result, new IdComparer<TodoItem>());
}
}
}
16 changes: 16 additions & 0 deletions test/IntegrationTests/IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="coverlet.collector" Version="1.0.1" />
</ItemGroup>

</Project>
14 changes: 14 additions & 0 deletions test/IntegrationTests/UnitTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System;
using Xunit;

namespace IntegrationTests
{
public class UnitTest1
{
[Fact]
public void Test1()
{

}
}
}
12 changes: 0 additions & 12 deletions test/UnitTests/Data/DefaultEntityRepository_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,19 +136,7 @@ public async Task Page_When_PageNumber_Is_Positive_Returns_PageNumberTh_Page_Of_
Assert.Equal(TodoItems(expectedResult), result, new IdComparer<TodoItem>());
}

[Theory]
[InlineData(6, -1, new[] { 4, 5, 6, 7, 8, 9 })]
[InlineData(6, -2, new[] { 1, 2, 3 })]
[InlineData(20, -1, new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 })]
public async Task Paging_PageNumberIsNegative_PageCorrectIds(int pageSize, int pageNumber, int[] expectedIds)
{
var todoItems = DbSetMock.Create(TodoItems(1, 2, 3, 4, 5, 6, 7, 8, 9)).Object;
var repository = GetRepository();

var result = await repository.PageAsync(todoItems, pageSize, pageNumber);

Assert.Equal(TodoItems(expectedIds), result, new IdComparer<TodoItem>());
}

private static TodoItem[] TodoItems(params int[] ids)
{
Expand Down