From 01997f7c6ccdb4eee05f4c6d7a9b2f2f704b7db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 25 Feb 2018 12:33:38 +0300
Subject: [PATCH] Remove DDD dependency from validation tests.

---
 .../Volo.Abp.Validation.Tests.csproj            |  1 -
 .../ApplicationService_Validation_Tests.cs      | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj b/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj
index fc2659b9b6..7d4c9e1c12 100644
--- a/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj
+++ b/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <ProjectReference Include="..\..\src\Volo.Abp.Ddd\Volo.Abp.Ddd.csproj" />
     <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
     <ProjectReference Include="..\..\src\Volo.Abp.Validation\Volo.Abp.Validation.csproj" />
   </ItemGroup>
diff --git a/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs b/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs
index bfdc6f516d..11ce82b563 100644
--- a/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs
+++ b/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Autofac;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.TestBase;
 using Xunit;
@@ -148,16 +149,26 @@ namespace Volo.Abp.Validation
 
         [DependsOn(typeof(AbpAutofacModule))]
         [DependsOn(typeof(AbpValidationModule))]
-        [DependsOn(typeof(AbpDddModule))]
         public class TestModule : AbpModule
         {
+            public override void PreConfigureServices(IServiceCollection services)
+            {
+                services.OnRegistred(context =>
+                {
+                    if (typeof(IMyAppService).IsAssignableFrom(context.ImplementationType))
+                    {
+                        context.Interceptors.TryAdd<ValidationInterceptor>();
+                    }
+                });
+            }
+
             public override void ConfigureServices(IServiceCollection services)
             {
                 services.AddType<MyAppService>();
             }
         }
 
-        public interface IMyAppService : IApplicationService
+        public interface IMyAppService
         {
             MyMethodOutput MyMethod(MyMethodInput input);
             MyMethodOutput MyMethod2(MyMethod2Input input);
@@ -170,7 +181,7 @@ namespace Volo.Abp.Validation
             void MyMethodWithNullableEnum(MyEnum? value);
         }
 
-        public class MyAppService : ApplicationService, IMyAppService
+        public class MyAppService : IMyAppService, ITransientDependency
         {
             public MyMethodOutput MyMethod(MyMethodInput input)
             {