tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clear unused tests.

pull/208/head
Halil İbrahim Kalkan 9 years ago
parent
1040f573ca
commit
d79a4ed070
5 changed files with 61 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/Volo.Abp.Permissions.Application.Contracts/Volo/Abp/Permissions/IPermissionAppService.cs
  2. 7
      src/Volo.Abp.Permissions.Application/Volo/Abp/Permissions/PermissionAppService.cs
  3. 2
      src/Volo.Abp.Permissions.Web/Pages/AbpPermissions/PermissionManagementModal.cshtml.cs
  4. 57
      test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionChecker_User_Tests.cs
  5. 105
      test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs

7
src/Volo.Abp.Permissions.Application.Contracts/Volo/Abp/Permissions/IPermissionAppService.cs
View File

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Volo.Abp.Application.Services;
@ -7,9 +6,7 @@ namespace Volo.Abp.Permissions
{
public interface IPermissionAppService : IApplicationService
{
Task<PermissionGrantInfoDto> GetAsync([NotNull] string name, [NotNull] string providerName, [NotNull] string providerKey);
Task<GetPermissionListResultDto> GetListAsync([NotNull] string providerName, [NotNull] string providerKey);
Task<GetPermissionListResultDto> GetAsync([NotNull] string providerName, [NotNull] string providerKey);
Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdatePermissionsDto input);
}

7
src/Volo.Abp.Permissions.Application/Volo/Abp/Permissions/PermissionAppService.cs
View File

@ -18,12 +18,7 @@ namespace Volo.Abp.Permissions
_permissionDefinitionManager = permissionDefinitionManager;
}
public async Task<PermissionGrantInfoDto> GetAsync(string name, string providerName, string providerKey)
{
throw new NotImplementedException();
}
public async Task<GetPermissionListResultDto> GetListAsync(string providerName, string providerKey)
public async Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
{
var result = new GetPermissionListResultDto
{

2
src/Volo.Abp.Permissions.Web/Pages/AbpPermissions/PermissionManagementModal.cshtml.cs
View File

@ -31,7 +31,7 @@ namespace Volo.Abp.Permissions.Web.Pages.AbpPermissions
public async Task OnGetAsync()
{
var result = await _permissionAppService.GetListAsync(ProviderName, ProviderKey);
var result = await _permissionAppService.GetAsync(ProviderName, ProviderKey);
Groups = ObjectMapper.Map<List<PermissionGroupDto>, List<PermissionGroupViewModel>>(result.Groups);
}

57
test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionChecker_User_Tests.cs
View File

@ -0,0 +1,57 @@
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using NSubstitute;
using Shouldly;
using Volo.Abp.Session;
using Xunit;
namespace Volo.Abp.Permissions
{
public class PermissionChecker_User_Tests : PermissionTestBase
{
private readonly IPermissionChecker _permissionChecker;
private Guid? _currentUserId;
public PermissionChecker_User_Tests()
{
_permissionChecker = GetRequiredService<IPermissionChecker>();
}
protected override void AfterAddApplication(IServiceCollection services)
{
var currentUser = Substitute.For<ICurrentUser>();
currentUser.Id.Returns(ci => _currentUserId);
services.AddSingleton(currentUser);
}
[Fact]
public async Task Should_Return_True_For_Granted_Current_User()
{
_currentUserId = PermissionTestDataBuilder.User1Id;
(await _permissionChecker.IsGrantedAsync(
"MyPermission1"
)).ShouldBeTrue();
}
[Fact]
public async Task Should_Return_False_For_Non_Granted_Current_User()
{
_currentUserId = PermissionTestDataBuilder.User2Id;
(await _permissionChecker.IsGrantedAsync(
"MyPermission1"
)).ShouldBeFalse();
}
[Fact]
public async Task Should_Return_False_For_Current_User_If_Anonymous()
{
(await _permissionChecker.IsGrantedAsync(
"MyPermission1"
)).ShouldBeFalse();
}
}
}

105
test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs
View File

@ -1,105 +0,0 @@
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using NSubstitute;
using Shouldly;
using Volo.Abp.Session;
using Xunit;
namespace Volo.Abp.Permissions
{
public class PermissionManager_User_Tests : PermissionTestBase
{
private readonly IPermissionChecker _permissionChecker;
private Guid? _currentUserId;
public PermissionManager_User_Tests()
{
_permissionChecker = GetRequiredService<IPermissionChecker>();
}
protected override void AfterAddApplication(IServiceCollection services)
{
var currentUser = Substitute.For<ICurrentUser>();
currentUser.Id.Returns(ci => _currentUserId);
services.AddSingleton(currentUser);
}
//[Fact]
//public async Task Should_Return_True_For_Granted_User()
//{
// (await _permissionManager.IsGrantedForUserAsync(
// "MyPermission1",
// PermissionTestDataBuilder.User1Id
// )).ShouldBeTrue();
//}
[Fact]
public async Task Should_Return_True_For_Granted_Current_User()
{
_currentUserId = PermissionTestDataBuilder.User1Id;
(await _permissionChecker.IsGrantedAsync(
"MyPermission1"
)).ShouldBeTrue();
}
//[Fact]
//public async Task Should_Return_False_For_Non_Granted_User()
//{
// (await _permissionManager.IsGrantedForUserAsync(
// "MyPermission1",
// PermissionTestDataBuilder.User2Id
// )).ShouldBeFalse();
//}
[Fact]
public async Task Should_Return_False_For_Non_Granted_Current_User()
{
_currentUserId = PermissionTestDataBuilder.User2Id;
(await _permissionChecker.IsGrantedAsync(
"MyPermission1"
)).ShouldBeFalse();
}
[Fact]
public async Task Should_Return_False_For_Current_User_If_Anonymous()
{
(await _permissionChecker.IsGrantedAsync(
"MyPermission1"
)).ShouldBeFalse();
}
//[Fact]
//public async Task Should_Get_List_Of_Granted_Permissions_For_A_User()
//{
// //User1
// var permission = await _permissionManager.GetAllForUserAsync(PermissionTestDataBuilder.User1Id);
// permission.Count.ShouldBeGreaterThan(0);
// permission.ShouldContain(p => p.Name == "MyPermission1" && p.IsGranted && p.ProviderName == UserPermissionValueProvider.ProviderName);
// //User2
// permission = await _permissionManager.GetAllForUserAsync(PermissionTestDataBuilder.User2Id);
// permission.Count.ShouldBeGreaterThan(0);
// permission.ShouldContain(p => p.Name == "MyPermission1" && !p.IsGranted);
//}
//[Fact]
//public async Task Should_Grant_Permission_For_A_User()
//{
// (await _permissionManager.IsGrantedForUserAsync(
// "MyPermission1",
// PermissionTestDataBuilder.User2Id
// )).ShouldBeFalse();
// await _permissionManager.SetForUserAsync(PermissionTestDataBuilder.User2Id, "MyPermission1", true);
// (await _permissionManager.IsGrantedForUserAsync(
// "MyPermission1",
// PermissionTestDataBuilder.User2Id
// )).ShouldBeTrue();
//}
}
}
Write Preview
Loading…
Cancel
Save