Browse Source

Fix sync usages.

pull/6809/head
Halil İbrahim Kalkan 6 years ago
parent
commit
ac652f2a1f
  1. 4
      framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ReadOnlyAppService.cs
  2. 4
      framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/CityRepository.cs
  3. 4
      framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs
  4. 4
      framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/MongoDbAsyncQueryableProvider_Tests.cs
  5. 4
      framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/TestApp/MongoDb/CityRepository.cs
  6. 10
      framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/Repository_Queryable_Tests.cs

4
framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ReadOnlyAppService.cs

@ -38,7 +38,7 @@ namespace Volo.Abp.Application.Services
where TGetOutputDto : IEntityDto<TKey>
where TGetListOutputDto : IEntityDto<TKey>
{
protected new IReadOnlyRepository<TEntity, TKey> Repository { get; }
protected IReadOnlyRepository<TEntity, TKey> Repository { get; }
protected ReadOnlyAppService(IReadOnlyRepository<TEntity, TKey> repository)
: base(repository)
@ -46,7 +46,7 @@ namespace Volo.Abp.Application.Services
Repository = repository;
}
protected async override Task<TEntity> GetEntityByIdAsync(TKey id)
protected override async Task<TEntity> GetEntityByIdAsync(TKey id)
{
return await Repository.GetAsync(id);
}

4
framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/CityRepository.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
{
public class CityRepository : EfCoreRepository<TestAppDbContext, City, Guid>, ICityRepository
{
public CityRepository(IDbContextProvider<TestAppDbContext> dbContextProvider)
public CityRepository(IDbContextProvider<TestAppDbContext> dbContextProvider)
: base(dbContextProvider)
{
}
@ -24,7 +24,7 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
public async Task<List<Person>> GetPeopleInTheCityAsync(string cityName)
{
var city = await FindByNameAsync(cityName);
return await DbContext.People.Where(p => p.CityId == city.Id).ToListAsync();
return await (await GetDbContextAsync()).People.Where(p => p.CityId == city.Id).ToListAsync();
}
}
}

4
framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs

@ -18,7 +18,7 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
public async Task<PersonView> GetViewAsync(string name)
{
return await DbContext.PersonView.Where(x => x.Name == name).FirstOrDefaultAsync();
return await (await GetDbContextAsync()).PersonView.Where(x => x.Name == name).FirstOrDefaultAsync();
}
}
}
}

4
framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/MongoDbAsyncQueryableProvider_Tests.cs

@ -25,10 +25,10 @@ namespace Volo.Abp.MongoDB.Repositories
}
[Fact]
public void CanExecute()
public async Task CanExecuteAsync()
{
_mongoDbAsyncQueryableProvider.CanExecute(_personRepository).ShouldBeTrue();
_mongoDbAsyncQueryableProvider.CanExecute(_personRepository.WithDetails()).ShouldBeTrue();
_mongoDbAsyncQueryableProvider.CanExecute(await _personRepository.WithDetailsAsync()).ShouldBeTrue();
}
[Fact]

4
framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/TestApp/MongoDb/CityRepository.cs

@ -19,13 +19,13 @@ namespace Volo.Abp.TestApp.MongoDB
public async Task<City> FindByNameAsync(string name)
{
return await (await Collection.FindAsync(c => c.Name == name)).FirstOrDefaultAsync();
return await (await (await GetCollectionAsync()).FindAsync(c => c.Name == name)).FirstOrDefaultAsync();
}
public async Task<List<Person>> GetPeopleInTheCityAsync(string cityName)
{
var city = await FindByNameAsync(cityName);
return await DbContext.People.AsQueryable().Where(p => p.CityId == city.Id).ToListAsync();
return await (await GetDbContextAsync()).People.AsQueryable().Where(p => p.CityId == city.Id).ToListAsync();
}
}
}

10
framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/Repository_Queryable_Tests.cs

@ -44,24 +44,22 @@ namespace Volo.Abp.TestApp.Testing
[Fact]
public async Task WithDetails()
{
await WithUnitOfWorkAsync(() =>
await WithUnitOfWorkAsync(async () =>
{
var person = PersonRepository.WithDetails().Single(p => p.Id == TestDataBuilder.UserDouglasId);
var person = (await PersonRepository.WithDetailsAsync()).Single(p => p.Id == TestDataBuilder.UserDouglasId);
person.Name.ShouldBe("Douglas");
person.Phones.Count.ShouldBe(2);
return Task.CompletedTask;
});
}
[Fact]
public async Task WithDetails_Explicit()
{
await WithUnitOfWorkAsync(() =>
await WithUnitOfWorkAsync(async () =>
{
var person = PersonRepository.WithDetails(p => p.Phones).Single(p => p.Id == TestDataBuilder.UserDouglasId);
var person = (await PersonRepository.WithDetailsAsync(p => p.Phones)).Single(p => p.Id == TestDataBuilder.UserDouglasId);
person.Name.ShouldBe("Douglas");
person.Phones.Count.ShouldBe(2);
return Task.CompletedTask;
});
}
}

Loading…
Cancel
Save