Commit 8106a7d1 authored by yangxiaodong's avatar yangxiaodong

refactor

parent e9f1a8d8
...@@ -5,6 +5,7 @@ using System.Linq.Expressions; ...@@ -5,6 +5,7 @@ using System.Linq.Expressions;
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using Cap.Consistency.Infrastructure; using Cap.Consistency.Infrastructure;
using Cap.Consistency.Store;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
...@@ -30,13 +31,13 @@ namespace Cap.Consistency.Test ...@@ -30,13 +31,13 @@ namespace Cap.Consistency.Test
protected virtual void SetupMessageServices(IServiceCollection services, object context = null) { protected virtual void SetupMessageServices(IServiceCollection services, object context = null) {
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>(); services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
services.AddConsistency<TMessage>(); services.AddConsistency();
AddMessageStore(services, context); AddMessageStore(services, context);
services.AddSingleton<ILogger<ConsistencyMessageManager<TMessage>>>(new TestLogger<ConsistencyMessageManager<TMessage>>()); services.AddSingleton<ILogger<ConsistencyMessageManager>>(new TestLogger<ConsistencyMessageManager>());
} }
protected virtual ConsistencyMessageManager<TMessage> CreateManager(object context = null, IServiceCollection services = null, Action<IServiceCollection> configureServices = null) { protected virtual ConsistencyMessageManager CreateManager(object context = null, IServiceCollection services = null, Action<IServiceCollection> configureServices = null) {
if (services == null) { if (services == null) {
services = new ServiceCollection(); services = new ServiceCollection();
} }
...@@ -47,7 +48,7 @@ namespace Cap.Consistency.Test ...@@ -47,7 +48,7 @@ namespace Cap.Consistency.Test
configureServices?.Invoke(services); configureServices?.Invoke(services);
return services.BuildServiceProvider().GetService<ConsistencyMessageManager<TMessage>>(); return services.BuildServiceProvider().GetService<ConsistencyMessageManager>();
} }
protected abstract object CreateTestContext(); protected abstract object CreateTestContext();
...@@ -68,7 +69,7 @@ namespace Cap.Consistency.Test ...@@ -68,7 +69,7 @@ namespace Cap.Consistency.Test
Assert.NotNull(operateResult); Assert.NotNull(operateResult);
Assert.True(operateResult.Succeeded); Assert.True(operateResult.Succeeded);
var messageId = await manager.GetMessageIdAsync(message); var messageId = await manager.GeConsistencyMessageIdAsync(message);
operateResult = await manager.DeleteAsync(message); operateResult = await manager.DeleteAsync(message);
Assert.Null(await manager.FindByIdAsync(messageId)); Assert.Null(await manager.FindByIdAsync(messageId));
} }
...@@ -85,7 +86,7 @@ namespace Cap.Consistency.Test ...@@ -85,7 +86,7 @@ namespace Cap.Consistency.Test
Assert.NotNull(operateResult); Assert.NotNull(operateResult);
Assert.True(operateResult.Succeeded); Assert.True(operateResult.Succeeded);
var messageId = await manager.GetMessageIdAsync(message); var messageId = await manager.GeConsistencyMessageIdAsync(message);
Assert.NotNull(await manager.FindByIdAsync(messageId)); Assert.NotNull(await manager.FindByIdAsync(messageId));
} }
} }
......
...@@ -4,8 +4,4 @@ using Cap.Consistency.Infrastructure; ...@@ -4,8 +4,4 @@ using Cap.Consistency.Infrastructure;
namespace Cap.Consistency.Test namespace Cap.Consistency.Test
{ {
public class TestConsistencyMessage : ConsistencyMessage
{
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment