Browse Source
Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts: # eShopOnContainers-ServicesAndWebApps.slnpull/809/head
Christian Arenas
7 years ago
126 changed files with 2560 additions and 986 deletions
Split View
Diff Options
-
+8 -7README.md
-
+0 -1docker-compose.override.yml
-
+0 -1docker-compose.prod.yml
-
BINdocs/Enterprise-Application-Patterns-using-XamarinForms.pdf
-
BINdocs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
-
+153 -102eShopOnContainers-ServicesAndWebApps.sln
-
BINimg/ebook_arch_dev_microservices_containers_cover.png
-
BINimg/ebook_arch_dev_microservices_containers_cover_LARGE.png
-
BINimg/ebook_arch_dev_microservices_containers_cover_OLD.png
-
BINimg/xamarin-enterprise-patterns-ebook-cover-small.png
-
+8 -0src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj
-
+13 -0src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs
-
+18 -0src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs
-
+7 -0src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj
-
+8 -0src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj
-
+16 -0src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs
-
+16 -0src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs
-
+35 -0src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs
-
+22 -0src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
-
+56 -0src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
-
+11 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEvent.cs
-
+23 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEventHandler.cs
-
+23 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationOtherEventHandler.cs
-
+13 -0src/BuildingBlocks/EventBus/EventBus/Abstractions/IDynamicIntegrationEventHandler.cs
-
+14 -2src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
-
+0 -4src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
-
+34 -0src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
-
+162 -0src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
-
+28 -0src/BuildingBlocks/EventBus/EventBus/SubscriptionInfo.cs
-
+145 -0src/BuildingBlocks/EventBus/EventBusRabbitMQ/CommandBusRabbitMQ.cs
-
+6 -6src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs
-
+88 -79src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
-
+1 -2src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs
-
+15 -7src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckMiddleware.cs
-
+11 -4src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckStartupFilter.cs
-
+16 -5src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostBuilderExtension.cs
-
+2 -2src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/HealthCheckBuilderSqlServerExtensions.cs
-
+0 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj
-
+109 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs
-
+19 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheckExtensions.cs
-
+30 -24src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/AddCheck.cs
-
+5 -5src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/NumericChecks.cs
-
+1 -64src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/UrlChecks.cs
-
+11 -8src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CompositeHealthCheckResult.cs
-
+15 -49src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheck.cs
-
+102 -7src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckBuilder.cs
-
+0 -18src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckExtensions.cs
-
+37 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckGroup.cs
-
+0 -1src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResult.cs
-
+91 -26src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckService.cs
-
+13 -5src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceCollectionExtensions.cs
-
+0 -38src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceExtensions.cs
-
+1 -4src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheck.cs
-
+46 -1src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckService.cs
-
+18 -42src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Internal/UrlChecker.cs
-
+22 -10src/BuildingBlocks/HealthChecks/src/common/Guard.cs
-
+1 -2src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/EventToCommandBehavior.cs
-
+0 -3src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
-
+5 -7src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
-
+0 -7src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogMockService.cs
-
+11 -24src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs
-
+0 -1src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/ICatalogService.cs
-
+2 -5src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs
-
+3 -33src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs
-
+0 -8src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs
-
+2 -46src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
-
+35 -35src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs
-
+0 -2src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
-
+2 -2src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
-
+1 -4src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs
-
+3 -5src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
-
+2 -80src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
-
+0 -21src/Mobile/eShopOnContainers/eShopOnContainers.Core/packages.config
-
+25 -0src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json
-
+2 -11src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
-
+0 -1src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainActivity.cs
-
+1 -0src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs
-
+6 -0src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
-
+1 -0src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config
-
+120 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs
-
+0 -27src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/DummyTests.cs
-
+12 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockEventToCommandBehavior.cs
-
+53 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs
-
+0 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/BasketServiceTests.cs
-
+0 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/CatalogServiceTests.cs
-
+9 -11src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/OrdersServiceTests.cs
-
+223 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs
-
+54 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs
-
+113 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs
-
+55 -0src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs
-
+26 -4src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
-
+8 -7src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/packages.config
-
+0 -1src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json
-
+0 -4src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
-
+0 -1src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config
-
+0 -1src/Services/Basket/Basket.API/Basket.API.csproj
+ 8
- 7
README.md
View File
+ 0
- 1
docker-compose.override.yml
View File
+ 0
- 1
docker-compose.prod.yml
View File
BIN
docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
View File
BIN
docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
View File
+ 153
- 102
eShopOnContainers-ServicesAndWebApps.sln
View File
BIN
img/ebook_arch_dev_microservices_containers_cover.png
View File
| Before | After |
|---|---|
|
|
| Width: 257 | Height: 336 | Size: 31 KiB | Width: 260 | Height: 336 | Size: 38 KiB |
BIN
img/ebook_arch_dev_microservices_containers_cover_LARGE.png
View File
| Before | After |
|---|---|
|
|
| Width: 1139 | Height: 1469 | Size: 242 KiB |
BIN
img/ebook_arch_dev_microservices_containers_cover_OLD.png
View File
| Before | After |
|---|---|
|
|
| Width: 257 | Height: 336 | Size: 31 KiB |
BIN
img/xamarin-enterprise-patterns-ebook-cover-small.png
View File
| Before | After |
|---|---|
|
|
| Width: 260 | Height: 336 | Size: 28 KiB | Width: 260 | Height: 336 | Size: 25 KiB |
+ 8
- 0
src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj
View File
| @ -0,0 +1,8 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netstandard1.4</TargetFramework> | |||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.CommandBus</RootNamespace> | |||
| </PropertyGroup> | |||
| </Project> | |||
+ 13
- 0
src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs
View File
| @ -0,0 +1,13 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus | |||
| { | |||
| public interface ICommandBus | |||
| { | |||
| Task SendAsync<T>(T command) where T : IntegrationCommand; | |||
| } | |||
| } | |||
+ 18
- 0
src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs
View File
| @ -0,0 +1,18 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus | |||
| { | |||
| public abstract class IntegrationCommand | |||
| { | |||
| public Guid Id { get; private set; } | |||
| public DateTime Sent { get; private set; } | |||
| protected IntegrationCommand() | |||
| { | |||
| Id = Guid.NewGuid(); | |||
| Sent = DateTime.UtcNow; | |||
| } | |||
| } | |||
| } | |||
+ 7
- 0
src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj
View File
| @ -0,0 +1,7 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netstandard1.4</TargetFramework> | |||
| </PropertyGroup> | |||
| </Project> | |||
+ 8
- 0
src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj
View File
| @ -0,0 +1,8 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netstandard1.0</TargetFramework> | |||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.CommandBus</RootNamespace> | |||
| </PropertyGroup> | |||
| </Project> | |||
+ 16
- 0
src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs
View File
| @ -0,0 +1,16 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus | |||
| { | |||
| public interface ICommandBus | |||
| { | |||
| void Send<T>(string name, T data); | |||
| void Handle<TC>(string name, IIntegrationCommandHandler<TC> handler); | |||
| void Handle(string name, IIntegrationCommandHandler handler); | |||
| void Handle<TI, TC>(TI handler) | |||
| where TI : IIntegrationCommandHandler<TC>; | |||
| } | |||
| } | |||
+ 16
- 0
src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs
View File
| @ -0,0 +1,16 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus | |||
| { | |||
| public interface IIntegrationCommandHandler | |||
| { | |||
| void Handle(IntegrationCommand command); | |||
| } | |||
| public interface IIntegrationCommandHandler<T> : IIntegrationCommandHandler | |||
| { | |||
| void Handle(IntegrationCommand<T> command); | |||
| } | |||
| } | |||
+ 35
- 0
src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs
View File
| @ -0,0 +1,35 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus | |||
| { | |||
| public abstract class IntegrationCommand | |||
| { | |||
| public Guid Id { get; } | |||
| public DateTime Sent { get; } | |||
| public abstract object GetDataAsObject(); | |||
| protected IntegrationCommand() | |||
| { | |||
| Id = Guid.NewGuid(); | |||
| Sent = DateTime.UtcNow; | |||
| } | |||
| } | |||
| public class IntegrationCommand<T> : IntegrationCommand | |||
| { | |||
| public T Data { get; } | |||
| public string Name { get; } | |||
| public override object GetDataAsObject() => Data; | |||
| public IntegrationCommand(string name, T data) : base() | |||
| { | |||
| Data = data; | |||
| Name = name; | |||
| } | |||
| } | |||
| } | |||
+ 22
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
View File
| @ -0,0 +1,22 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> | |||
| <PackageReference Include="xunit" Version="2.2.0" /> | |||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||
| <ProjectReference Include="..\EventBus\EventBus.csproj" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 56
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
View File
| @ -0,0 +1,56 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus; | |||
| using System; | |||
| using System.Linq; | |||
| using Xunit; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class InMemory_SubscriptionManager_Tests | |||
| { | |||
| [Fact] | |||
| public void After_Creation_Should_Be_Empty() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| Assert.True(manager.IsEmpty); | |||
| } | |||
| [Fact] | |||
| public void After_One_Event_Subscription_Should_Contain_The_Event() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.AddSubscription<TestIntegrationEvent,TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| Assert.True(manager.HasSubscriptionsForEvent<TestIntegrationEvent>()); | |||
| } | |||
| [Fact] | |||
| public void After_All_Subscriptions_Are_Deleted_Event_Should_No_Longer_Exists() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(); | |||
| Assert.False(manager.HasSubscriptionsForEvent<TestIntegrationEvent>()); | |||
| } | |||
| [Fact] | |||
| public void Deleting_Last_Subscription_Should_Raise_On_Deleted_Event() | |||
| { | |||
| bool raised = false; | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.OnEventRemoved += (o, e) => raised = true; | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(); | |||
| Assert.True(raised); | |||
| } | |||
| [Fact] | |||
| public void Get_Handlers_For_Event_Should_Return_All_Handlers() | |||
| { | |||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationOtherEventHandler>(() => new TestIntegrationOtherEventHandler()); | |||
| var handlers = manager.GetHandlersForEvent<TestIntegrationEvent>(); | |||
| Assert.Equal(2, handlers.Count()); | |||
| } | |||
| } | |||
| } | |||
+ 11
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEvent.cs
View File
| @ -0,0 +1,11 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class TestIntegrationEvent : IntegrationEvent | |||
| { | |||
| } | |||
| } | |||
+ 23
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEventHandler.cs
View File
| @ -0,0 +1,23 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class TestIntegrationOtherEventHandler : IIntegrationEventHandler<TestIntegrationEvent> | |||
| { | |||
| public bool Handled { get; private set; } | |||
| public TestIntegrationOtherEventHandler() | |||
| { | |||
| Handled = false; | |||
| } | |||
| public async Task Handle(TestIntegrationEvent @event) | |||
| { | |||
| Handled = true; | |||
| } | |||
| } | |||
| } | |||
+ 23
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationOtherEventHandler.cs
View File
| @ -0,0 +1,23 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace EventBus.Tests | |||
| { | |||
| public class TestIntegrationEventHandler : IIntegrationEventHandler<TestIntegrationEvent> | |||
| { | |||
| public bool Handled { get; private set; } | |||
| public TestIntegrationEventHandler() | |||
| { | |||
| Handled = false; | |||
| } | |||
| public async Task Handle(TestIntegrationEvent @event) | |||
| { | |||
| Handled = true; | |||
| } | |||
| } | |||
| } | |||
+ 13
- 0
src/BuildingBlocks/EventBus/EventBus/Abstractions/IDynamicIntegrationEventHandler.cs
View File
| @ -0,0 +1,13 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions | |||
| { | |||
| public interface IDynamicIntegrationEventHandler | |||
| { | |||
| Task Handle(dynamic eventData); | |||
| } | |||
| } | |||
+ 14
- 2
src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
View File
| @ -1,11 +1,23 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions | |||
| { | |||
| public interface IEventBus | |||
| { | |||
| void Subscribe<T>(IIntegrationEventHandler<T> handler) where T: IntegrationEvent; | |||
| void Unsubscribe<T>(IIntegrationEventHandler<T> handler) where T : IntegrationEvent; | |||
| void Subscribe<T, TH>(Func<TH> handler) | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T>; | |||
| void SubscribeDynamic<TH>(string eventName, Func<TH> handler) | |||
| where TH : IDynamicIntegrationEventHandler; | |||
| void UnsubscribeDynamic<TH>(string eventName) | |||
| where TH : IDynamicIntegrationEventHandler; | |||
| void Unsubscribe<T, TH>() | |||
| where TH : IIntegrationEventHandler<T> | |||
| where T : IntegrationEvent; | |||
| void Publish(IntegrationEvent @event); | |||
| } | |||
| } | |||
+ 0
- 4
src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
View File
+ 34
- 0
src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
View File
| @ -0,0 +1,34 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using static Microsoft.eShopOnContainers.BuildingBlocks.EventBus.InMemoryEventBusSubscriptionsManager; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus | |||
| { | |||
| public interface IEventBusSubscriptionsManager | |||
| { | |||
| bool IsEmpty { get; } | |||
| event EventHandler<string> OnEventRemoved; | |||
| void AddDynamicSubscription<TH>(string eventName, Func<TH> handler) | |||
| where TH : IDynamicIntegrationEventHandler; | |||
| void AddSubscription<T, TH>(Func<TH> handler) | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T>; | |||
| void RemoveSubscription<T, TH>() | |||
| where TH : IIntegrationEventHandler<T> | |||
| where T : IntegrationEvent; | |||
| void RemoveDynamicSubscription<TH>(string eventName) | |||
| where TH : IDynamicIntegrationEventHandler; | |||
| bool HasSubscriptionsForEvent<T>() where T : IntegrationEvent; | |||
| bool HasSubscriptionsForEvent(string eventName); | |||
| Type GetEventTypeByName(string eventName); | |||
| void Clear(); | |||
| IEnumerable<SubscriptionInfo> GetHandlersForEvent<T>() where T : IntegrationEvent; | |||
| IEnumerable<SubscriptionInfo> GetHandlersForEvent(string eventName); | |||
| string GetEventKey<T>(); | |||
| } | |||
| } | |||
+ 162
- 0
src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
View File
| @ -0,0 +1,162 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Reflection; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus | |||
| { | |||
| public partial class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager | |||
| { | |||
| private readonly Dictionary<string, List<SubscriptionInfo>> _handlers; | |||
| private readonly List<Type> _eventTypes; | |||
| public event EventHandler<string> OnEventRemoved; | |||
| public InMemoryEventBusSubscriptionsManager() | |||
| { | |||
| _handlers = new Dictionary<string, List<SubscriptionInfo>>(); | |||
| _eventTypes = new List<Type>(); | |||
| } | |||
| public bool IsEmpty => !_handlers.Keys.Any(); | |||
| public void Clear() => _handlers.Clear(); | |||
| public void AddDynamicSubscription<TH>(string eventName, Func<TH> handler) | |||
| where TH : IDynamicIntegrationEventHandler | |||
| { | |||
| DoAddSubscription(handler, eventName, isDynamic: true); | |||
| } | |||
| public void AddSubscription<T, TH>(Func<TH> handler) | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T> | |||
| { | |||
| var eventName = GetEventKey<T>(); | |||
| DoAddSubscription(handler, eventName, isDynamic: false); | |||
| _eventTypes.Add(typeof(T)); | |||
| } | |||
| private void DoAddSubscription(Delegate handler, string eventName, bool isDynamic) | |||
| { | |||
| if (!HasSubscriptionsForEvent(eventName)) | |||
| { | |||
| _handlers.Add(eventName, new List<SubscriptionInfo>()); | |||
| } | |||
| if (isDynamic) | |||
| { | |||
| _handlers[eventName].Add(SubscriptionInfo.Dynamic(handler)); | |||
| } | |||
| else | |||
| { | |||
| _handlers[eventName].Add(SubscriptionInfo.Typed(handler)); | |||
| } | |||
| } | |||
| public void RemoveDynamicSubscription<TH>(string eventName) | |||
| where TH : IDynamicIntegrationEventHandler | |||
| { | |||
| var handlerToRemove = FindDynamicSubscriptionToRemove<TH>(eventName); | |||
| DoRemoveHandler(eventName, handlerToRemove); | |||
| } | |||
| public void RemoveSubscription<T, TH>() | |||
| where TH : IIntegrationEventHandler<T> | |||
| where T : IntegrationEvent | |||
| { | |||
| var handlerToRemove = FindSubscriptionToRemove<T, TH>(); | |||
| var eventName = GetEventKey<T>(); | |||
| DoRemoveHandler(eventName, handlerToRemove); | |||
| } | |||
| private void DoRemoveHandler(string eventName, SubscriptionInfo subsToRemove) | |||
| { | |||
| if (subsToRemove != null) | |||
| { | |||
| _handlers[eventName].Remove(subsToRemove); | |||
| if (!_handlers[eventName].Any()) | |||
| { | |||
| _handlers.Remove(eventName); | |||
| var eventType = _eventTypes.SingleOrDefault(e => e.Name == eventName); | |||
| if (eventType != null) | |||
| { | |||
| _eventTypes.Remove(eventType); | |||
| } | |||
| RaiseOnEventRemoved(eventName); | |||
| } | |||
| } | |||
| } | |||
| public IEnumerable<SubscriptionInfo> GetHandlersForEvent<T>() where T : IntegrationEvent | |||
| { | |||
| var key = GetEventKey<T>(); | |||
| return GetHandlersForEvent(key); | |||
| } | |||
| public IEnumerable<SubscriptionInfo> GetHandlersForEvent(string eventName) => _handlers[eventName]; | |||
| private void RaiseOnEventRemoved(string eventName) | |||
| { | |||
| var handler = OnEventRemoved; | |||
| if (handler != null) | |||
| { | |||
| OnEventRemoved(this, eventName); | |||
| } | |||
| } | |||
| private SubscriptionInfo FindDynamicSubscriptionToRemove<TH>(string eventName) | |||
| where TH : IDynamicIntegrationEventHandler | |||
| { | |||
| return DoFindHandlerToRemove(eventName, typeof(TH)); | |||
| } | |||
| private SubscriptionInfo FindSubscriptionToRemove<T, TH>() | |||
| where T : IntegrationEvent | |||
| where TH : IIntegrationEventHandler<T> | |||
| { | |||
| var eventName = GetEventKey<T>(); | |||
| return DoFindHandlerToRemove(eventName, typeof(TH)); | |||
| } | |||
| private SubscriptionInfo DoFindHandlerToRemove(string eventName, Type handlerType) | |||
| { | |||
| if (!HasSubscriptionsForEvent(eventName)) | |||
| { | |||
| return null; | |||
| } | |||
| foreach (var subscription in _handlers[eventName]) | |||
| { | |||
| var genericArgs = subscription.Factory.GetType().GetGenericArguments(); | |||
| if (genericArgs.SingleOrDefault() == handlerType) | |||
| { | |||
| return subscription; | |||
| } | |||
| } | |||
| return null; | |||
| } | |||
| public bool HasSubscriptionsForEvent<T>() where T : IntegrationEvent | |||
| { | |||
| var key = GetEventKey<T>(); | |||
| return HasSubscriptionsForEvent(key); | |||
| } | |||
| public bool HasSubscriptionsForEvent(string eventName) => _handlers.ContainsKey(eventName); | |||
| public Type GetEventTypeByName(string eventName) => _eventTypes.SingleOrDefault(t => t.Name == eventName); | |||
| public string GetEventKey<T>() | |||
| { | |||
| return typeof(T).Name; | |||
| } | |||
| } | |||
| } | |||
+ 28
- 0
src/BuildingBlocks/EventBus/EventBus/SubscriptionInfo.cs
View File
| @ -0,0 +1,28 @@ | |||
| using System; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus | |||
| { | |||
| public partial class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager | |||
| { | |||
| public class SubscriptionInfo | |||
| { | |||
| public bool IsDynamic { get; } | |||
| public Delegate Factory { get; } | |||
| private SubscriptionInfo(bool isDynamic, Delegate factory) | |||
| { | |||
| IsDynamic = isDynamic; | |||
| Factory = factory; | |||
| } | |||
| public static SubscriptionInfo Dynamic(Delegate factory) | |||
| { | |||
| return new SubscriptionInfo(true, factory); | |||
| } | |||
| public static SubscriptionInfo Typed(Delegate factory) | |||
| { | |||
| return new SubscriptionInfo(false, factory); | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 145
- 0
src/BuildingBlocks/EventBus/EventBusRabbitMQ/CommandBusRabbitMQ.cs
View File
| @ -0,0 +1,145 @@ | |||
| //using Microsoft.eShopOnContainers.BuildingBlocks.CommandBus; | |||
| using Microsoft.Extensions.Logging; | |||
| using Newtonsoft.Json; | |||
| using Polly; | |||
| using Polly.Retry; | |||
| using RabbitMQ.Client; | |||
| using RabbitMQ.Client.Events; | |||
| using RabbitMQ.Client.Exceptions; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Net.Sockets; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| /* | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ | |||
| { | |||
| public class CommandBusRabbitMQ : ICommandBus, IDisposable | |||
| { | |||
| const string BROKER_NAME = "eshop_command_bus"; | |||
| private readonly IRabbitMQPersistentConnection _persistentConnection; | |||
| private readonly ILogger<CommandBusRabbitMQ> _logger; | |||
| private IModel _consumerChannel; | |||
| private string _queueName; | |||
| private readonly Dictionary<string, IIntegrationCommandHandler> _handlers; | |||
| private readonly Dictionary<string, Type> _typeMappings; | |||
| public CommandBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, | |||
| ILogger<CommandBusRabbitMQ> logger) | |||
| { | |||
| _logger = logger; | |||
| _persistentConnection = persistentConnection; | |||
| _handlers = new Dictionary<string, IIntegrationCommandHandler>(); | |||
| _typeMappings = new Dictionary<string, Type>(); | |||
| } | |||
| public void Send<T>(string name, T data) | |||
| { | |||
| Send(new IntegrationCommand<T>(name, data)); | |||
| } | |||
| public void Handle<TC>(string name, IIntegrationCommandHandler<TC> handler) | |||
| { | |||
| _handlers.Add(name, handler); | |||
| _typeMappings.Add(name, typeof(TC)); | |||
| } | |||
| public void Handle(string name, IIntegrationCommandHandler handler) | |||
| { | |||
| _handlers.Add(name, handler); | |||
| } | |||
| public void Handle<TI, TC>(TI handler) where TI : IIntegrationCommandHandler<TC> | |||
| { | |||
| var name = typeof(TI).Name; | |||
| _handlers.Add(name, handler); | |||
| _typeMappings.Add(name, typeof(TC)); | |||
| } | |||
| private void Send<T>(IntegrationCommand<T> command) | |||
| { | |||
| if (!_persistentConnection.IsConnected) | |||
| { | |||
| _persistentConnection.TryConnect(); | |||
| } | |||
| var policy = RetryPolicy.Handle<BrokerUnreachableException>() | |||
| .Or<SocketException>() | |||
| .WaitAndRetry(5, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)), (ex, time) => | |||
| { | |||
| _logger.LogWarning(ex.ToString()); | |||
| }); | |||
| using (var channel = _persistentConnection.CreateModel()) | |||
| { | |||
| var commandName = command.Name; | |||
| channel.ExchangeDeclare(exchange: BROKER_NAME, type: "direct"); | |||
| var message = JsonConvert.SerializeObject(command); | |||
| var body = Encoding.UTF8.GetBytes(message); | |||
| policy.Execute(() => | |||
| { | |||
| channel.BasicPublish(exchange: BROKER_NAME, | |||
| routingKey: commandName, | |||
| basicProperties: null, | |||
| body: body); | |||
| }); | |||
| } | |||
| } | |||
| private IModel CreateConsumerChannel() | |||
| { | |||
| if (!_persistentConnection.IsConnected) | |||
| { | |||
| _persistentConnection.TryConnect(); | |||
| } | |||
| var channel = _persistentConnection.CreateModel(); | |||
| channel.ExchangeDeclare(exchange: BROKER_NAME, type: "direct"); | |||
| _queueName = channel.QueueDeclare().QueueName; | |||
| var consumer = new EventingBasicConsumer(channel); | |||
| consumer.Received += async (model, ea) => | |||
| { | |||
| var commandName = ea.RoutingKey; | |||
| var message = Encoding.UTF8.GetString(ea.Body); | |||
| await InvokeHandler(commandName, message); | |||
| }; | |||
| channel.BasicConsume(queue: _queueName, | |||
| noAck: true, | |||
| consumer: consumer); | |||
| channel.CallbackException += (sender, ea) => | |||
| { | |||
| _consumerChannel.Dispose(); | |||
| _consumerChannel = CreateConsumerChannel(); | |||
| }; | |||
| return channel; | |||
| } | |||
| private Task InvokeHandler(string commandName, string message) | |||
| { | |||
| if (_handlers.ContainsKey(commandName)) | |||
| { | |||
| } | |||
| } | |||
| public void Dispose() | |||
| { | |||
| if (_consumerChannel != null) | |||
| { | |||
| _consumerChannel.Dispose(); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| */ | |||
+ 6
- 6
src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs
View File
+ 88
- 79
src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
View File
+ 1
- 2
src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs
View File
+ 15
- 7
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckMiddleware.cs
View File
+ 11
- 4
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckStartupFilter.cs
View File
+ 16
- 5
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostBuilderExtension.cs
View File
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/HealthCheckBuilderDataExtensions.cs → src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/HealthCheckBuilderSqlServerExtensions.cs
View File
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj → src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj
View File
+ 109
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs
View File
| @ -0,0 +1,109 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Reflection; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.Extensions.DependencyInjection; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public abstract class CachedHealthCheck | |||
| { | |||
| private static readonly TypeInfo HealthCheckTypeInfo = typeof(IHealthCheck).GetTypeInfo(); | |||
| private volatile int _writerCount; | |||
| public CachedHealthCheck(string name, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNullOrEmpty(nameof(name), name); | |||
| Guard.ArgumentValid(cacheDuration.TotalMilliseconds >= 0, nameof(cacheDuration), "Cache duration must be zero (disabled) or greater than zero."); | |||
| Name = name; | |||
| CacheDuration = cacheDuration; | |||
| } | |||
| public IHealthCheckResult CachedResult { get; internal set; } | |||
| public TimeSpan CacheDuration { get; } | |||
| public DateTimeOffset CacheExpiration { get; internal set; } | |||
| public string Name { get; } | |||
| protected virtual DateTimeOffset UtcNow => DateTimeOffset.UtcNow; | |||
| protected abstract IHealthCheck Resolve(IServiceProvider serviceProvider); | |||
| public async ValueTask<IHealthCheckResult> RunAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken = default(CancellationToken)) | |||
| { | |||
| while (CacheExpiration <= UtcNow) | |||
| { | |||
| // Can't use a standard lock here because of async, so we'll use this flag to determine when we should write a value, | |||
| // and the waiters who aren't allowed to write will just spin wait for the new value. | |||
| if (Interlocked.Exchange(ref _writerCount, 1) != 0) | |||
| { | |||
| await Task.Delay(5, cancellationToken).ConfigureAwait(false); | |||
| continue; | |||
| } | |||
| try | |||
| { | |||
| var check = Resolve(serviceProvider); | |||
| CachedResult = await check.CheckAsync(cancellationToken); | |||
| } | |||
| catch (OperationCanceledException) | |||
| { | |||
| CachedResult = HealthCheckResult.Unhealthy("The health check operation timed out"); | |||
| } | |||
| catch (Exception ex) | |||
| { | |||
| CachedResult = HealthCheckResult.Unhealthy($"Exception during check: {ex.GetType().FullName}"); | |||
| } | |||
| CacheExpiration = UtcNow + CacheDuration; | |||
| _writerCount = 0; | |||
| break; | |||
| } | |||
| return CachedResult; | |||
| } | |||
| public static CachedHealthCheck FromHealthCheck(string name, TimeSpan cacheDuration, IHealthCheck healthCheck) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(healthCheck), healthCheck); | |||
| return new TypeOrHealthCheck_HealthCheck(name, cacheDuration, healthCheck); | |||
| } | |||
| public static CachedHealthCheck FromType(string name, TimeSpan cacheDuration, Type healthCheckType) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(healthCheckType), healthCheckType); | |||
| Guard.ArgumentValid(HealthCheckTypeInfo.IsAssignableFrom(healthCheckType.GetTypeInfo()), nameof(healthCheckType), $"Health check must implement '{typeof(IHealthCheck).FullName}'."); | |||
| return new TypeOrHealthCheck_Type(name, cacheDuration, healthCheckType); | |||
| } | |||
| class TypeOrHealthCheck_HealthCheck : CachedHealthCheck | |||
| { | |||
| private readonly IHealthCheck _healthCheck; | |||
| public TypeOrHealthCheck_HealthCheck(string name, TimeSpan cacheDuration, IHealthCheck healthCheck) : base(name, cacheDuration) | |||
| => _healthCheck = healthCheck; | |||
| protected override IHealthCheck Resolve(IServiceProvider serviceProvider) => _healthCheck; | |||
| } | |||
| class TypeOrHealthCheck_Type : CachedHealthCheck | |||
| { | |||
| private readonly Type _healthCheckType; | |||
| public TypeOrHealthCheck_Type(string name, TimeSpan cacheDuration, Type healthCheckType) : base(name, cacheDuration) | |||
| => _healthCheckType = healthCheckType; | |||
| protected override IHealthCheck Resolve(IServiceProvider serviceProvider) | |||
| => (IHealthCheck)serviceProvider.GetRequiredService(_healthCheckType); | |||
| } | |||
| } | |||
| } | |||
+ 19
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheckExtensions.cs
View File
| @ -0,0 +1,19 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static class CachedHealthCheckExtensions | |||
| { | |||
| public static ValueTask<IHealthCheckResult> RunAsync(this CachedHealthCheck check, IServiceProvider serviceProvider) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(check), check); | |||
| return check.RunAsync(serviceProvider, CancellationToken.None); | |||
| } | |||
| } | |||
| } | |||
+ 30
- 24
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/AddCheck.cs
View File
+ 5
- 5
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/NumericChecks.cs
View File
+ 1
- 64
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/UrlChecks.cs
View File
+ 11
- 8
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CompositeHealthCheckResult.cs
View File
+ 15
- 49
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheck.cs
View File
+ 102
- 7
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckBuilder.cs
View File
+ 0
- 18
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckExtensions.cs
View File
| @ -1,18 +0,0 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static class HealthCheckExtensions | |||
| { | |||
| public static ValueTask<IHealthCheckResult> CheckAsync(this IHealthCheck healthCheck) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(healthCheck), healthCheck); | |||
| return healthCheck.CheckAsync(CancellationToken.None); | |||
| } | |||
| } | |||
| } | |||
+ 37
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckGroup.cs
View File
| @ -0,0 +1,37 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Collections.Generic; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public class HealthCheckGroup | |||
| { | |||
| private CheckStatus _partialSuccessStatus; | |||
| public HealthCheckGroup(string groupName, CheckStatus partialSuccessStatus) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(groupName), groupName); | |||
| GroupName = groupName; | |||
| PartiallyHealthyStatus = partialSuccessStatus; | |||
| } | |||
| public IReadOnlyList<CachedHealthCheck> Checks => ChecksInternal.AsReadOnly(); | |||
| internal List<CachedHealthCheck> ChecksInternal { get; } = new List<CachedHealthCheck>(); | |||
| public string GroupName { get; } | |||
| public CheckStatus PartiallyHealthyStatus | |||
| { | |||
| get => _partialSuccessStatus; | |||
| internal set | |||
| { | |||
| Guard.ArgumentValid(value != CheckStatus.Unknown, nameof(value), "Check status 'Unknown' is not valid for partial success."); | |||
| _partialSuccessStatus = value; | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 0
- 1
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResult.cs
View File
+ 91
- 26
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckService.cs
View File
+ 13
- 5
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceCollectionExtensions.cs
View File
+ 0
- 38
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceExtensions.cs
View File
| @ -1,38 +0,0 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static class HealthCheckServiceExtensions | |||
| { | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(CheckStatus.Unhealthy, CancellationToken.None); | |||
| } | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CheckStatus partiallyHealthyStatus) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(partiallyHealthyStatus, CancellationToken.None); | |||
| } | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CancellationToken cancellationToken) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(CheckStatus.Unhealthy, cancellationToken); | |||
| } | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CheckStatus partiallyHealthyStatus, CancellationToken cancellationToken) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(partiallyHealthyStatus, cancellationToken); | |||
| } | |||
| } | |||
| } | |||
+ 1
- 4
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheck.cs
View File
+ 46
- 1
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckService.cs
View File
+ 18
- 42
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Internal/UrlChecker.cs
View File
+ 22
- 10
src/BuildingBlocks/HealthChecks/src/common/Guard.cs
View File
+ 1
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
View File
+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/EventToCommandBehavior.cs
View File
+ 0
- 3
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
View File
+ 5
- 7
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
View File
+ 0
- 7
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogMockService.cs
View File
+ 11
- 24
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs
View File
+ 0
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/ICatalogService.cs
View File
+ 2
- 5
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs
View File
| @ -1,11 +1,8 @@ | |||
| using System.Threading.Tasks; | |||
| namespace eShopOnContainers.Core.Services.Identity | |||
| namespace eShopOnContainers.Core.Services.Identity | |||
| { | |||
| public interface IIdentityService | |||
| { | |||
| string CreateAuthorizeRequest(); | |||
| string CreateAuthorizationRequest(); | |||
| string CreateLogoutRequest(string token); | |||
| string DecodeToken(string token); | |||
| } | |||
| } | |||
+ 3
- 33
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs
View File
+ 0
- 8
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs
View File
+ 2
- 46
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
View File
+ 35
- 35
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs
View File
+ 0
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
View File
+ 2
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
View File
+ 1
- 4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs
View File
+ 3
- 5
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
View File
+ 2
- 80
src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
View File
+ 0
- 21
src/Mobile/eShopOnContainers/eShopOnContainers.Core/packages.config
View File
| @ -1,21 +0,0 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <packages> | |||
| <package id="Acr.UserDialogs" version="6.3.3" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="IdentityModel" version="1.3.1" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="modernhttpclient" version="2.4.2" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Newtonsoft.Json" version="9.0.2-beta1" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="SlideOverKit" version="2.1.4" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Splat" version="1.6.2" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Unity" version="4.0.1" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Xamarin.FFImageLoading" version="2.2.6-pre-256" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-256" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Xamarin.Forms.Pages" version="2.3.3.175" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="portable45-net45+win8+wp8+wpa81" /> | |||
| </packages> | |||
+ 25
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json
View File
| @ -0,0 +1,25 @@ | |||
| { | |||
| "dependencies": { | |||
| "Acr.UserDialogs": "6.3.3", | |||
| "Autofac": "4.4.0", | |||
| "CommonServiceLocator": "1.3", | |||
| "IdentityModel": "1.3.1", | |||
| "Microsoft.Bcl": "1.1.10", | |||
| "Microsoft.Bcl.Build": "1.0.21", | |||
| "Microsoft.Net.Http": "2.2.29", | |||
| "modernhttpclient": "2.4.2", | |||
| "Newtonsoft.Json": "9.0.2-beta1", | |||
| "SlideOverKit": "2.1.4", | |||
| "Splat": "1.6.2", | |||
| "Xam.Plugins.Settings": "2.6.0.12-beta", | |||
| "Xamarin.FFImageLoading": "2.2.6-pre-256", | |||
| "Xamarin.FFImageLoading.Forms": "2.2.6-pre-256", | |||
| "Xamarin.Forms": "2.3.3.175", | |||
| "Xamarin.Forms.Pages": "2.3.3.175", | |||
| "Xamarin.Forms.Theme.Base": "1.0.0.43-pre1", | |||
| "Xamarin.Forms.Theme.Light": "1.0.0.43-pre1" | |||
| }, | |||
| "frameworks": { | |||
| ".NETPortable,Version=v4.5,Profile=Profile111": {} | |||
| } | |||
| } | |||
+ 2
- 11
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
View File
+ 0
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
View File
+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainActivity.cs
View File
+ 1
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
View File
+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs
View File
+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs
View File
+ 6
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
View File
+ 1
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config
View File
+ 120
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs
View File
| @ -0,0 +1,120 @@ | |||
| using Xunit; | |||
| using Xamarin.Forms; | |||
| using System; | |||
| using System.Globalization; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class EventToCommandBehaviorTests | |||
| { | |||
| [Fact] | |||
| public void InvalidEventNameShouldThrowArgumentExceptionText() | |||
| { | |||
| var behavior = new MockEventToCommandBehavior | |||
| { | |||
| EventName = "OnItemTapped" | |||
| }; | |||
| var listView = new ListView(); | |||
| Assert.Throws<ArgumentException>(() => listView.Behaviors.Add(behavior)); | |||
| } | |||
| [Fact] | |||
| public void CommandExecutedWhenEventFiresText() | |||
| { | |||
| bool executedCommand = false; | |||
| var behavior = new MockEventToCommandBehavior | |||
| { | |||
| EventName = "ItemTapped", | |||
| Command = new Command(() => | |||
| { | |||
| executedCommand = true; | |||
| }) | |||
| }; | |||
| var listView = new ListView(); | |||
| listView.Behaviors.Add(behavior); | |||
| behavior.RaiseEvent(listView, null); | |||
| Assert.True(executedCommand); | |||
| } | |||
| [Fact] | |||
| public void CommandCanExecuteTest() | |||
| { | |||
| var behavior = new MockEventToCommandBehavior | |||
| { | |||
| EventName = "ItemTapped", | |||
| Command = new Command(() => Assert.True(false), () => false) | |||
| }; | |||
| var listView = new ListView(); | |||
| listView.Behaviors.Add(behavior); | |||
| behavior.RaiseEvent(listView, null); | |||
| } | |||
| [Fact] | |||
| public void CommandCanExecuteWithParameterShouldNotExecuteTest() | |||
| { | |||
| bool shouldExecute = false; | |||
| var behavior = new MockEventToCommandBehavior | |||
| { | |||
| EventName = "ItemTapped", | |||
| CommandParameter = shouldExecute, | |||
| Command = new Command<string>(o => Assert.True(false), o => o.Equals(true)) | |||
| }; | |||
| var listView = new ListView(); | |||
| listView.Behaviors.Add(behavior); | |||
| behavior.RaiseEvent(listView, null); | |||
| } | |||
| [Fact] | |||
| public void CommandWithConverterTest() | |||
| { | |||
| const string item = "ItemProperty"; | |||
| bool executedCommand = false; | |||
| var behavior = new MockEventToCommandBehavior | |||
| { | |||
| EventName = "ItemTapped", | |||
| EventArgsConverter = new ItemTappedEventArgsConverter(false), | |||
| Command = new Command<string>(o => | |||
| { | |||
| executedCommand = true; | |||
| Assert.NotNull(o); | |||
| Assert.Equal(item, o); | |||
| }) | |||
| }; | |||
| var listView = new ListView(); | |||
| listView.Behaviors.Add(behavior); | |||
| behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item)); | |||
| Assert.True(executedCommand); | |||
| } | |||
| private class ItemTappedEventArgsConverter : IValueConverter | |||
| { | |||
| private readonly bool _returnParameter; | |||
| public bool HasConverted { get; private set; } | |||
| public ItemTappedEventArgsConverter(bool returnParameter) | |||
| { | |||
| _returnParameter = returnParameter; | |||
| } | |||
| public object Convert(object value, Type targetType, object parameter, CultureInfo culture) | |||
| { | |||
| HasConverted = true; | |||
| return _returnParameter ? parameter : (value as ItemTappedEventArgs)?.Item; | |||
| } | |||
| public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) | |||
| { | |||
| throw new NotImplementedException(); | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 0
- 27
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/DummyTests.cs
View File
| @ -1,27 +0,0 @@ | |||
| using System; | |||
| using System.Threading.Tasks; | |||
| using Xunit; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class DummyTests | |||
| { | |||
| [Fact] | |||
| public void ThisShouldPass_Sync() | |||
| { | |||
| Assert.True(true); | |||
| } | |||
| [Fact] | |||
| public async Task ThisShouldPass_Async() | |||
| { | |||
| await Task.Run(() => { Assert.True(true); }); | |||
| } | |||
| [Fact] | |||
| public async Task ThisShouldFail_Async() | |||
| { | |||
| await Task.Run(() => { throw new Exception("Oops!"); }); | |||
| } | |||
| } | |||
| } | |||
+ 12
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockEventToCommandBehavior.cs
View File
| @ -0,0 +1,12 @@ | |||
| using eShopOnContainers.Core.Behaviors; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class MockEventToCommandBehavior : EventToCommandBehavior | |||
| { | |||
| public void RaiseEvent(params object[] args) | |||
| { | |||
| _handler.DynamicInvoke(args); | |||
| } | |||
| } | |||
| } | |||
+ 53
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs
View File
| @ -0,0 +1,53 @@ | |||
| using eShopOnContainers.Core.ViewModels.Base; | |||
| using eShopOnContainers.Core.Validations; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class MockViewModel : ViewModelBase | |||
| { | |||
| private ValidatableObject<string> _forename; | |||
| private ValidatableObject<string> _surname; | |||
| public ValidatableObject<string> Forename | |||
| { | |||
| get | |||
| { | |||
| return _forename; | |||
| } | |||
| set | |||
| { | |||
| _forename = value; | |||
| RaisePropertyChanged(() => Forename); | |||
| } | |||
| } | |||
| public ValidatableObject<string> Surname | |||
| { | |||
| get | |||
| { | |||
| return _surname; | |||
| } | |||
| set | |||
| { | |||
| _surname = value; | |||
| RaisePropertyChanged(() => Surname); | |||
| } | |||
| } | |||
| public MockViewModel() | |||
| { | |||
| _forename = new ValidatableObject<string>(); | |||
| _surname = new ValidatableObject<string>(); | |||
| _forename.Validations.Add(new IsNotNullOrEmptyRule<string> { ValidationMessage = "Forename is required." }); | |||
| _surname.Validations.Add(new IsNotNullOrEmptyRule<string> { ValidationMessage = "Surname name is required." }); | |||
| } | |||
| public bool Validate() | |||
| { | |||
| bool isValidForename = _forename.Validate(); | |||
| bool isValidSurname = _surname.Validate(); | |||
| return isValidForename && isValidSurname; | |||
| } | |||
| } | |||
| } | |||
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/BasketServiceTests.cs → src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/BasketServiceTests.cs
View File
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/CatalogServiceTests.cs → src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/CatalogServiceTests.cs
View File
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/OrdersServiceTests.cs → src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/OrdersServiceTests.cs
View File
+ 223
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs
View File
| @ -0,0 +1,223 @@ | |||
| using Xunit; | |||
| using eShopOnContainers.Core.ViewModels; | |||
| using eShopOnContainers.Core.ViewModels.Base; | |||
| using eShopOnContainers.Core.Services.Catalog; | |||
| using eShopOnContainers.Core.Models.Catalog; | |||
| using System.Threading.Tasks; | |||
| using System.Linq; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class CatalogViewModelTests | |||
| { | |||
| public CatalogViewModelTests() | |||
| { | |||
| ViewModelLocator.RegisterDependencies(true); | |||
| } | |||
| [Fact] | |||
| public void AddCatalogItemCommandIsNotNullTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.NotNull(catalogViewModel.AddCatalogItemCommand); | |||
| } | |||
| [Fact] | |||
| public void FilterCommandIsNotNullTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.NotNull(catalogViewModel.FilterCommand); | |||
| } | |||
| [Fact] | |||
| public void ClearFilterCommandIsNotNullTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.NotNull(catalogViewModel.ClearFilterCommand); | |||
| } | |||
| [Fact] | |||
| public void ProductsPropertyIsNullWhenViewModelInstantiatedTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.Null(catalogViewModel.Products); | |||
| } | |||
| [Fact] | |||
| public void BrandsPropertyuIsNullWhenViewModelInstantiatedTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.Null(catalogViewModel.Brands); | |||
| } | |||
| [Fact] | |||
| public void BrandPropertyIsNullWhenViewModelInstantiatedTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.Null(catalogViewModel.Brand); | |||
| } | |||
| [Fact] | |||
| public void TypesPropertyIsNullWhenViewModelInstantiatedTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.Null(catalogViewModel.Types); | |||
| } | |||
| [Fact] | |||
| public void TypePropertyIsNullWhenViewModelInstantiatedTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.Null(catalogViewModel.Type); | |||
| } | |||
| [Fact] | |||
| public void IsFilterPropertyIsFalseWhenViewModelInstantiatedTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Assert.False(catalogViewModel.IsFilter); | |||
| } | |||
| [Fact] | |||
| public async Task ProductsPropertyIsNotNullAfterViewModelInitializationTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| await catalogViewModel.InitializeAsync(null); | |||
| Assert.NotNull(catalogViewModel.Products); | |||
| } | |||
| [Fact] | |||
| public async Task BrandsPropertyIsNotNullAfterViewModelInitializationTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| await catalogViewModel.InitializeAsync(null); | |||
| Assert.NotNull(catalogViewModel.Brands); | |||
| } | |||
| [Fact] | |||
| public async Task TypesPropertyIsNotNullAfterViewModelInitializationTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| await catalogViewModel.InitializeAsync(null); | |||
| Assert.NotNull(catalogViewModel.Types); | |||
| } | |||
| [Fact] | |||
| public async Task SettingProductsPropertyShouldRaisePropertyChanged() | |||
| { | |||
| bool invoked = false; | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| catalogViewModel.PropertyChanged += (sender, e) => | |||
| { | |||
| if (e.PropertyName.Equals("Products")) | |||
| invoked = true; | |||
| }; | |||
| await catalogViewModel.InitializeAsync(null); | |||
| Assert.True(invoked); | |||
| } | |||
| [Fact] | |||
| public async Task SettingBrandsPropertyShouldRaisePropertyChanged() | |||
| { | |||
| bool invoked = false; | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| catalogViewModel.PropertyChanged += (sender, e) => | |||
| { | |||
| if (e.PropertyName.Equals("Brands")) | |||
| invoked = true; | |||
| }; | |||
| await catalogViewModel.InitializeAsync(null); | |||
| Assert.True(invoked); | |||
| } | |||
| [Fact] | |||
| public async Task SettingTypesPropertyShouldRaisePropertyChanged() | |||
| { | |||
| bool invoked = false; | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| catalogViewModel.PropertyChanged += (sender, e) => | |||
| { | |||
| if (e.PropertyName.Equals("Types")) | |||
| invoked = true; | |||
| }; | |||
| await catalogViewModel.InitializeAsync(null); | |||
| Assert.True(invoked); | |||
| } | |||
| [Fact] | |||
| public void AddCatalogItemCommandSendsAddProductMessageTest() | |||
| { | |||
| bool messageReceived = false; | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| Xamarin.Forms.MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessageKeys.AddProduct, (sender, arg) => | |||
| { | |||
| messageReceived = true; | |||
| }); | |||
| catalogViewModel.AddCatalogItemCommand.Execute(null); | |||
| Assert.True(messageReceived); | |||
| } | |||
| [Fact] | |||
| public async Task FilterCommandSendsFilterMessageTest() | |||
| { | |||
| bool messageReceived = false; | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| await catalogViewModel.InitializeAsync(null); | |||
| catalogViewModel.Brand = catalogViewModel.Brands.FirstOrDefault(); | |||
| catalogViewModel.Type = catalogViewModel.Types.FirstOrDefault(); | |||
| Xamarin.Forms.MessagingCenter.Subscribe<CatalogViewModel>(this, MessageKeys.Filter, (sender) => | |||
| { | |||
| messageReceived = true; | |||
| }); | |||
| catalogViewModel.FilterCommand.Execute(null); | |||
| Assert.True(messageReceived); | |||
| } | |||
| [Fact] | |||
| public async Task ClearFilterCommandResetsPropertiesTest() | |||
| { | |||
| var catalogService = new CatalogMockService(); | |||
| var catalogViewModel = new CatalogViewModel(catalogService); | |||
| await catalogViewModel.InitializeAsync(null); | |||
| catalogViewModel.ClearFilterCommand.Execute(null); | |||
| Assert.Null(catalogViewModel.Brand); | |||
| Assert.Null(catalogViewModel.Type); | |||
| Assert.NotNull(catalogViewModel.Products); | |||
| } | |||
| } | |||
| } | |||
+ 54
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs
View File
| @ -0,0 +1,54 @@ | |||
| using Xunit; | |||
| using eShopOnContainers.Core.ViewModels; | |||
| using eShopOnContainers.Core.ViewModels.Base; | |||
| using eShopOnContainers.Core.Models.Navigation; | |||
| using System.Threading.Tasks; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class MainViewModelTests | |||
| { | |||
| public MainViewModelTests() | |||
| { | |||
| ViewModelLocator.RegisterDependencies(true); | |||
| } | |||
| [Fact] | |||
| public void SettingsCommandIsNotNullWhenViewModelInstantiatedTest() | |||
| { | |||
| var mainViewModel = new MainViewModel(); | |||
| Assert.NotNull(mainViewModel.SettingsCommand); | |||
| } | |||
| [Fact] | |||
| public async Task ViewModelInitializationSendsChangeTabMessageTest() | |||
| { | |||
| bool messageReceived = false; | |||
| var mainViewModel = new MainViewModel(); | |||
| var tabParam = new TabParameter { TabIndex = 2 }; | |||
| Xamarin.Forms.MessagingCenter.Subscribe<MainViewModel, int>(this, MessageKeys.ChangeTab, (sender, arg) => | |||
| { | |||
| messageReceived = true; | |||
| }); | |||
| await mainViewModel.InitializeAsync(tabParam); | |||
| Assert.True(messageReceived); | |||
| } | |||
| [Fact] | |||
| public void IsBusyPropertyIsFalseWhenViewModelInstantiatedTest() | |||
| { | |||
| var mainViewModel = new MainViewModel(); | |||
| Assert.False(mainViewModel.IsBusy); | |||
| } | |||
| [Fact] | |||
| public async Task IsBusyPropertyIsTrueAfterViewModelInitializationTest() | |||
| { | |||
| var mainViewModel = new MainViewModel(); | |||
| await mainViewModel.InitializeAsync(null); | |||
| Assert.True(mainViewModel.IsBusy); | |||
| } | |||
| } | |||
| } | |||
+ 113
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs
View File
| @ -0,0 +1,113 @@ | |||
| using Xunit; | |||
| using eShopOnContainers.Core.ViewModels.Base; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class MockViewModelTests | |||
| { | |||
| public MockViewModelTests() | |||
| { | |||
| ViewModelLocator.RegisterDependencies(true); | |||
| } | |||
| [Fact] | |||
| public void CheckValidationFailsWhenPropertiesAreEmptyTest() | |||
| { | |||
| var mockViewModel = new MockViewModel(); | |||
| bool isValid = mockViewModel.Validate(); | |||
| Assert.False(isValid); | |||
| Assert.Null(mockViewModel.Forename.Value); | |||
| Assert.Null(mockViewModel.Surname.Value); | |||
| Assert.False(mockViewModel.Forename.IsValid); | |||
| Assert.False(mockViewModel.Surname.IsValid); | |||
| Assert.NotEmpty(mockViewModel.Forename.Errors); | |||
| Assert.NotEmpty(mockViewModel.Surname.Errors); | |||
| } | |||
| [Fact] | |||
| public void CheckValidationFailsWhenOnlyForenameHasDataTest() | |||
| { | |||
| var mockViewModel = new MockViewModel(); | |||
| mockViewModel.Forename.Value = "John"; | |||
| bool isValid = mockViewModel.Validate(); | |||
| Assert.False(isValid); | |||
| Assert.NotNull(mockViewModel.Forename.Value); | |||
| Assert.Null(mockViewModel.Surname.Value); | |||
| Assert.True(mockViewModel.Forename.IsValid); | |||
| Assert.False(mockViewModel.Surname.IsValid); | |||
| Assert.Empty(mockViewModel.Forename.Errors); | |||
| Assert.NotEmpty(mockViewModel.Surname.Errors); | |||
| } | |||
| [Fact] | |||
| public void CheckValidationPassesWhenOnlySurnameHasDataTest() | |||
| { | |||
| var mockViewModel = new MockViewModel(); | |||
| mockViewModel.Surname.Value = "Smith"; | |||
| bool isValid = mockViewModel.Validate(); | |||
| Assert.False(isValid); | |||
| Assert.Null(mockViewModel.Forename.Value); | |||
| Assert.NotNull(mockViewModel.Surname.Value); | |||
| Assert.False(mockViewModel.Forename.IsValid); | |||
| Assert.True(mockViewModel.Surname.IsValid); | |||
| Assert.NotEmpty(mockViewModel.Forename.Errors); | |||
| Assert.Empty(mockViewModel.Surname.Errors); | |||
| } | |||
| [Fact] | |||
| public void CheckValidationPassesWhenBothPropertiesHaveDataTest() | |||
| { | |||
| var mockViewModel = new MockViewModel(); | |||
| mockViewModel.Forename.Value = "John"; | |||
| mockViewModel.Surname.Value = "Smith"; | |||
| bool isValid = mockViewModel.Validate(); | |||
| Assert.True(isValid); | |||
| Assert.NotNull(mockViewModel.Forename.Value); | |||
| Assert.NotNull(mockViewModel.Surname.Value); | |||
| Assert.True(mockViewModel.Forename.IsValid); | |||
| Assert.True(mockViewModel.Surname.IsValid); | |||
| Assert.Empty(mockViewModel.Forename.Errors); | |||
| Assert.Empty(mockViewModel.Surname.Errors); | |||
| } | |||
| [Fact] | |||
| public void SettingForenamePropertyShouldRaisePropertyChanged() | |||
| { | |||
| bool invoked = false; | |||
| var mockViewModel = new MockViewModel(); | |||
| mockViewModel.Forename.PropertyChanged += (sender, e) => | |||
| { | |||
| if (e.PropertyName.Equals("Value")) | |||
| invoked = true; | |||
| }; | |||
| mockViewModel.Forename.Value = "John"; | |||
| Assert.True(invoked); | |||
| } | |||
| [Fact] | |||
| public void SettingSurnamePropertyShouldRaisePropertyChanged() | |||
| { | |||
| bool invoked = false; | |||
| var mockViewModel = new MockViewModel(); | |||
| mockViewModel.Surname.PropertyChanged += (sender, e) => | |||
| { | |||
| if (e.PropertyName.Equals("Value")) | |||
| invoked = true; | |||
| }; | |||
| mockViewModel.Surname.Value = "Smith"; | |||
| Assert.True(invoked); | |||
| } | |||
| } | |||
| } | |||
+ 55
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs
View File
| @ -0,0 +1,55 @@ | |||
| using Xunit; | |||
| using eShopOnContainers.Core; | |||
| using eShopOnContainers.Core.ViewModels; | |||
| using eShopOnContainers.Core.ViewModels.Base; | |||
| using eShopOnContainers.Core.Services.Order; | |||
| using System.Threading.Tasks; | |||
| namespace eShopOnContainers.UnitTests | |||
| { | |||
| public class OrderViewModelTests | |||
| { | |||
| public OrderViewModelTests() | |||
| { | |||
| ViewModelLocator.RegisterDependencies(true); | |||
| } | |||
| [Fact] | |||
| public void OrderPropertyIsNullWhenViewModelInstantiatedTest() | |||
| { | |||
| var orderService = new OrderMockService(); | |||
| var orderViewModel = new OrderDetailViewModel(orderService); | |||
| Assert.Null(orderViewModel.Order); | |||
| } | |||
| [Fact] | |||
| public async Task OrderPropertyIsNotNullAfterViewModelInitializationTest() | |||
| { | |||
| var orderService = new OrderMockService(); | |||
| var orderViewModel = new OrderDetailViewModel(orderService); | |||
| var order = await orderService.GetOrderAsync(1, GlobalSetting.Instance.AuthToken); | |||
| await orderViewModel.InitializeAsync(order); | |||
| Assert.NotNull(orderViewModel.Order); | |||
| } | |||
| [Fact] | |||
| public async Task SettingOrderPropertyShouldRaisePropertyChanged() | |||
| { | |||
| bool invoked = false; | |||
| var orderService = new OrderMockService(); | |||
| var orderViewModel = new OrderDetailViewModel(orderService); | |||
| orderViewModel.PropertyChanged += (sender, e) => | |||
| { | |||
| if (e.PropertyName.Equals("Order")) | |||
| invoked = true; | |||
| }; | |||
| var order = await orderService.GetOrderAsync(1, GlobalSetting.Instance.AuthToken); | |||
| await orderViewModel.InitializeAsync(order); | |||
| Assert.True(invoked); | |||
| } | |||
| } | |||
| } | |||
+ 26
- 4
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
View File
+ 8
- 7
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/packages.config
View File
| @ -1,10 +1,11 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <packages> | |||
| <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="portable46-net451+win81" /> | |||
| <package id="xunit.abstractions" version="2.0.1" targetFramework="portable46-net451+win81" /> | |||
| <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="portable46-net451+win81" /> | |||
| <package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="portable46-net451+win81" /> | |||
| <package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="portable46-net451+win81" /> | |||
| <package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="portable46-net451+win81" /> | |||
| <package id="xunit.runner.console" version="2.2.0-beta4-build3444" targetFramework="portable46-net451+win81" developmentDependency="true" /> | |||
| <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable46-net451+win81" /> | |||
| <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="portable-net451+win81" /> | |||
| <package id="xunit.abstractions" version="2.0.1" targetFramework="portable-net451+win81" requireReinstallation="True" /> | |||
| <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="portable-net451+win81" requireReinstallation="True" /> | |||
| <package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="portable-net451+win81" requireReinstallation="True" /> | |||
| <package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="portable-net451+win81" requireReinstallation="True" /> | |||
| <package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="portable-net451+win81" requireReinstallation="True" /> | |||
| <package id="xunit.runner.console" version="2.2.0-beta4-build3444" targetFramework="portable-net451+win81" developmentDependency="true" /> | |||
| </packages> | |||