clearup

yang-xiaodong · yang-xiaodong · commit 2b6c54c44579 · 2017-08-23T18:11:06.000+08:00
diff --git a/test/DotNetCore.CAP.MySql.Test/DatabaseTestHost.cs b/test/DotNetCore.CAP.MySql.Test/DatabaseTestHost.cs
@@ -1,4 +1,3 @@
-using System.Data;
 using System.Threading;
 using Dapper;
 using Microsoft.EntityFrameworkCore;
diff --git a/test/DotNetCore.CAP.MySql.Test/MySqlStorageConnectionTest.cs b/test/DotNetCore.CAP.MySql.Test/MySqlStorageConnectionTest.cs
@@ -85,7 +85,6 @@ public async Task StoreReceivedMessageAsync_Test()
         [Fact]
         public async Task GetReceivedMessageAsync_Test()
         {
-
             var sql = $@"
         INSERT INTO `cap.received`(`Name`,`Group`,`Content`,`Retries`,`Added`,`ExpiresAt`,`StatusName`)
         VALUES(@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName);SELECT @@IDENTITY;";
@@ -129,6 +128,5 @@ public async Task GetNextReceviedMessageToBeEnqueuedAsync_Test()
             Assert.Equal("MySqlStorageConnectionTest", message.Name);
             Assert.Equal("mygroup", message.Group);
         }
-
     }
-}
+}
diff --git a/test/DotNetCore.CAP.MySql.Test/MySqlStorageTest.cs b/test/DotNetCore.CAP.MySql.Test/MySqlStorageTest.cs
@@ -1,5 +1,5 @@
-﻿using Xunit;
-using Dapper;
+﻿using Dapper;
+using Xunit;
 
 namespace DotNetCore.CAP.MySql.Test
 {
@@ -9,7 +9,6 @@ public class MySqlStorageTest : DatabaseTestHost
         private readonly string _dbName;
         private readonly string _masterDbConnectionString;
 
-
         public MySqlStorageTest()
         {
             _dbName = ConnectionUtil.GetDatabaseName();
@@ -44,4 +43,4 @@ public void DatabaseTable_IsExists(string tableName)
             }
         }
     }
-}
+}
diff --git a/test/DotNetCore.CAP.MySql.Test/TestHost.cs b/test/DotNetCore.CAP.MySql.Test/TestHost.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DotNetCore.CAP.MySql.Test
diff --git a/test/DotNetCore.CAP.PostgreSql.Test/DatabaseTestHost.cs b/test/DotNetCore.CAP.PostgreSql.Test/DatabaseTestHost.cs
@@ -1,5 +1,3 @@
-using System.Data;
-using System.Data.SqlClient;
 using System.Threading;
 using Dapper;
 using Microsoft.EntityFrameworkCore;
diff --git a/test/DotNetCore.CAP.PostgreSql.Test/PostgreSqlStorageConnectionTest.cs b/test/DotNetCore.CAP.PostgreSql.Test/PostgreSqlStorageConnectionTest.cs
@@ -85,7 +85,6 @@ public async Task StoreReceivedMessageAsync_Test()
         [Fact]
         public async Task GetReceivedMessageAsync_Test()
         {
-
             var sql = $@"
         INSERT INTO ""cap"".""received""(""Name"",""Group"",""Content"",""Retries"",""Added"",""ExpiresAt"",""StatusName"")
         VALUES(@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName) RETURNING ""Id"";";
@@ -129,6 +128,5 @@ public async Task GetNextReceviedMessageToBeEnqueuedAsync_Test()
             Assert.Equal("PostgreSqlStorageConnectionTest", message.Name);
             Assert.Equal("mygroup", message.Group);
         }
-
     }
-}
+}
diff --git a/test/DotNetCore.CAP.PostgreSql.Test/PostgreSqlStorageTest.cs b/test/DotNetCore.CAP.PostgreSql.Test/PostgreSqlStorageTest.cs
@@ -1,5 +1,5 @@
-﻿using Xunit;
-using Dapper;
+﻿using Dapper;
+using Xunit;
 
 namespace DotNetCore.CAP.PostgreSql.Test
 {
@@ -39,9 +39,9 @@ public void DatabaseTable_IsExists(string tableName)
             using (var connection = ConnectionUtil.CreateConnection(_dbConnectionString))
             {
                 var sql = $"SELECT to_regclass('{tableName}') is not null;";
-                var result = connection.QueryFirstOrDefault<bool>(sql);       
+                var result = connection.QueryFirstOrDefault<bool>(sql);
                 Assert.True(result);
             }
         }
     }
-}
+}
diff --git a/test/DotNetCore.CAP.PostgreSql.Test/TestHost.cs b/test/DotNetCore.CAP.PostgreSql.Test/TestHost.cs
@@ -29,7 +29,7 @@ private void CreateServiceCollection()
 
             _connectionString = ConnectionUtil.GetConnectionString();
             services.AddSingleton(new PostgreSqlOptions { ConnectionString = _connectionString });
-            services.AddSingleton<PostgreSqlStorage>();      
+            services.AddSingleton<PostgreSqlStorage>();
 
             _services = services;
         }
diff --git a/test/DotNetCore.CAP.SqlServer.Test/SqlServerStorageConnectionTest.cs b/test/DotNetCore.CAP.SqlServer.Test/SqlServerStorageConnectionTest.cs
@@ -85,7 +85,6 @@ public async Task StoreReceivedMessageAsync_Test()
         [Fact]
         public async Task GetReceivedMessageAsync_Test()
         {
-
             var sql = $@"
         INSERT INTO [Cap].[Received]([Name],[Group],[Content],[Retries],[Added],[ExpiresAt],[StatusName]) OUTPUT INSERTED.Id
         VALUES(@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName);";
@@ -129,6 +128,5 @@ public async Task GetNextReceviedMessageToBeEnqueuedAsync_Test()
             Assert.Equal("SqlServerStorageConnectionTest", message.Name);
             Assert.Equal("mygroup", message.Group);
         }
-
     }
-}
+}
diff --git a/test/DotNetCore.CAP.SqlServer.Test/SqlServerStorageTest.cs b/test/DotNetCore.CAP.SqlServer.Test/SqlServerStorageTest.cs
@@ -1,5 +1,5 @@
-﻿using Xunit;
-using Dapper;
+﻿using Dapper;
+using Xunit;
 
 namespace DotNetCore.CAP.SqlServer.Test
 {
@@ -14,7 +14,7 @@ public void Database_IsExists()
             {
                 var databaseName = ConnectionUtil.GetDatabaseName();
                 var sql = $@"
-IF EXISTS (SELECT * FROM sysdatabases WHERE name = N'{databaseName}')  
+IF EXISTS (SELECT * FROM sysdatabases WHERE name = N'{databaseName}')
 SELECT 'True'
 ELSE
 SELECT 'False'";
@@ -39,6 +39,6 @@ IF OBJECT_ID(N'{tableName}',N'U') IS NOT NULL
                 var result = connection.QueryFirst<bool>(sql);
                 Assert.True(result);
             }
-        } 
+        }
     }
-}
+}
diff --git a/test/DotNetCore.CAP.SqlServer.Test/TestHost.cs b/test/DotNetCore.CAP.SqlServer.Test/TestHost.cs
@@ -29,7 +29,7 @@ private void CreateServiceCollection()
 
             _connectionString = ConnectionUtil.GetConnectionString();
             services.AddSingleton(new SqlServerOptions { ConnectionString = _connectionString });
-            services.AddSingleton<SqlServerStorage>();      
+            services.AddSingleton<SqlServerStorage>();
 
             _services = services;
         }
diff --git a/test/DotNetCore.CAP.Test/CAP.BuilderTest.cs b/test/DotNetCore.CAP.Test/CAP.BuilderTest.cs
@@ -1,8 +1,8 @@
 ﻿using System;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
-using System.Data;
 
 namespace DotNetCore.CAP.Test
 {
@@ -36,7 +36,6 @@ public void CanAddCapService()
             Assert.NotNull(markService);
         }
 
-
         [Fact]
         public void CanOverridePublishService()
         {
diff --git a/test/DotNetCore.CAP.Test/ConsumerInvokerFactoryTest.cs b/test/DotNetCore.CAP.Test/ConsumerInvokerFactoryTest.cs
@@ -11,7 +11,7 @@ namespace DotNetCore.CAP.Test
 {
     public class ConsumerInvokerFactoryTest
     {
-        IConsumerInvokerFactory consumerInvokerFactory;
+        private IConsumerInvokerFactory consumerInvokerFactory;
 
         public ConsumerInvokerFactoryTest()
         {
@@ -67,6 +67,6 @@ await Assert.ThrowsAsync(typeof(Exception), async () =>
             {
                 await invoker.InvokeAsync();
             });
-        }  
+        }
     }
-}
+}
diff --git a/test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs b/test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs
@@ -1,9 +1,6 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Abstractions;
-using DotNetCore.CAP.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
@@ -20,7 +17,7 @@ public ConsumerServiceSelectorTest()
             services.AddScoped<IFooTest, CandidatesFooTest>();
             services.AddScoped<IBarTest, CandidatesBarTest>();
             services.AddLogging();
-            services.AddCap(x=> { });
+            services.AddCap(x => { });
             _provider = services.BuildServiceProvider();
         }
 
diff --git a/test/DotNetCore.CAP.Test/ModelBinderFactoryTest.cs b/test/DotNetCore.CAP.Test/ModelBinderFactoryTest.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
+﻿using System.Linq;
 using System.Reflection;
 using DotNetCore.CAP.Internal;
 using Xunit;
@@ -10,7 +7,7 @@ namespace DotNetCore.CAP.Test
 {
     public class ModelBinderFactoryTest
     {
-        IModelBinderFactory _factory;
+        private IModelBinderFactory _factory;
 
         public ModelBinderFactoryTest()
         {
@@ -42,6 +39,5 @@ public void CreateComplexTypeBinderTest(string methodName)
             Assert.False(binder is SimpleTypeModelBinder);
             Assert.True(binder is ComplexTypeModelBinder);
         }
-
     }
-}
+}
diff --git a/test/DotNetCore.CAP.Test/Processor/DefaultDispatcherTest.cs b/test/DotNetCore.CAP.Test/Processor/DefaultDispatcherTest.cs
@@ -1,12 +1,8 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using DotNetCore.CAP.Infrastructure;
 using DotNetCore.CAP.Models;
 using DotNetCore.CAP.Processor;
-using DotNetCore.CAP.Processor.States;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -64,12 +60,12 @@ public async void ProcessAsync_CancellationTokenCancelled_ThrowsImmediately()
         public async Task ProcessAsync()
         {
             // Arrange
-            var job = new CapPublishedMessage {
-
+            var job = new CapPublishedMessage
+            {
             };
 
-            var mockFetchedJob = Mock.Get(Mock.Of<IFetchedMessage>(fj =>  fj.MessageId == 42 && fj.MessageType == MessageType.Publish ));
-           
+            var mockFetchedJob = Mock.Get(Mock.Of<IFetchedMessage>(fj => fj.MessageId == 42 && fj.MessageType == MessageType.Publish));
+
             _mockStorageConnection
                 .Setup(m => m.FetchNextMessageAsync())
                 .ReturnsAsync(mockFetchedJob.Object).Verifiable();
@@ -84,7 +80,7 @@ public async Task ProcessAsync()
             await fixture.ProcessAsync(_context);
 
             // Assert
-            _mockStorageConnection.VerifyAll();           
+            _mockStorageConnection.VerifyAll();
         }
 
         private DefaultDispatcher Create()
diff --git a/test/DotNetCore.CAP.Test/Processor/StateChangerTest.cs b/test/DotNetCore.CAP.Test/Processor/StateChangerTest.cs
@@ -56,4 +56,4 @@ public void ChangeState_ExpiresAfter()
 
         private StateChanger Create() => new StateChanger();
     }
-}
+}
diff --git a/test/DotNetCore.CAP.Test/QueueExecutorFactoryTest.cs b/test/DotNetCore.CAP.Test/QueueExecutorFactoryTest.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
@@ -41,8 +39,5 @@ public void CanGetSubscribeExector()
             var publishExecutor = queueExecutorFactory.GetInstance(Models.MessageType.Publish);
             Assert.Null(publishExecutor);
         }
-
-
-
     }
-}
+}
diff --git a/test/DotNetCore.CAP.Test/Sample.cs b/test/DotNetCore.CAP.Test/Sample.cs
@@ -1,41 +1,32 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace DotNetCore.CAP.Test
 {
     public class Sample
     {
-
         public void DateTimeParam(DateTime dateTime)
         {
-
         }
 
         public void StringParam(string @string)
         {
-
         }
 
         public void GuidParam(Guid guid)
         {
-
         }
 
         public void UriParam(Uri uri)
         {
-
         }
 
         public void IntegerParam(int @int)
         {
-
         }
 
         public void ComplexTypeParam(ComplexType complexType)
         {
-
         }
 
         public void ThrowException()
@@ -67,4 +58,4 @@ public class Person
 
         public string Name { get; set; }
     }
-}
+}
diff --git a/test/DotNetCore.CAP.Test/SubscribeFinderTest.cs b/test/DotNetCore.CAP.Test/SubscribeFinderTest.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using DotNetCore.CAP.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
@@ -22,7 +20,6 @@ public SubscribeFinderTest()
         [Fact]
         public void CanFindControllers()
         {
-            
         }
 
         [Fact]
@@ -36,7 +33,6 @@ public void CanFindSubscribeService()
 
     public class HomeController
     {
-
     }
 
     public interface ITestService { }
@@ -46,7 +42,6 @@ public class TestService : ITestService, ICapSubscribe
         [CapSubscribe("test")]
         public void Index()
         {
-
         }
     }
 
@@ -56,4 +51,4 @@ public CapSubscribeAttribute(string name) : base(name)
         {
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Data;`
`2`	`1`	`using System.Threading;`
`3`	`2`	`using Dapper;`
`4`	`3`	`using Microsoft.EntityFrameworkCore;`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ public async Task StoreReceivedMessageAsync_Test()`
`85`	`85`	`[Fact]`
`86`	`86`	`public async Task GetReceivedMessageAsync_Test()`
`87`	`87`	`{`
`88`		`-`
`89`	`88`	`var sql = $@"`
`90`	`89`	INSERT INTO `cap.received`(`Name`,`Group`,`Content`,`Retries`,`Added`,`ExpiresAt`,`StatusName`)
`91`	`90`	`VALUES(@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName);SELECT @@IDENTITY;";`
`@@ -129,6 +128,5 @@ public async Task GetNextReceviedMessageToBeEnqueuedAsync_Test()`
`129`	`128`	`Assert.Equal("MySqlStorageConnectionTest", message.Name);`
`130`	`129`	`Assert.Equal("mygroup", message.Group);`
`131`	`130`	`}`
`132`		`-`
`133`	`131`	`}`
`134`		`-}`
	`132`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Xunit;`
`2`		`-using Dapper;`
	`1`	`+using Dapper;`
	`2`	`+using Xunit;`
`3`	`3`
`4`	`4`	`namespace DotNetCore.CAP.MySql.Test`
`5`	`5`	`{`
`@@ -9,7 +9,6 @@ public class MySqlStorageTest : DatabaseTestHost`
`9`	`9`	`private readonly string _dbName;`
`10`	`10`	`private readonly string _masterDbConnectionString;`
`11`	`11`
`12`		`-`
`13`	`12`	`public MySqlStorageTest()`
`14`	`13`	`{`
`15`	`14`	`_dbName = ConnectionUtil.GetDatabaseName();`
`@@ -44,4 +43,4 @@ public void DatabaseTable_IsExists(string tableName)`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`}`
`47`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using Microsoft.EntityFrameworkCore;`
`3`	`2`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`3`
`5`	`4`	`namespace DotNetCore.CAP.MySql.Test`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System.Data;`
`2`		`-using System.Data.SqlClient;`
`3`	`1`	`using System.Threading;`
`4`	`2`	`using Dapper;`
`5`	`3`	`using Microsoft.EntityFrameworkCore;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ private void CreateServiceCollection()`
`29`	`29`
`30`	`30`	`_connectionString = ConnectionUtil.GetConnectionString();`
`31`	`31`	`services.AddSingleton(new PostgreSqlOptions { ConnectionString = _connectionString });`
`32`		`- services.AddSingleton<PostgreSqlStorage>();`
	`32`	`+ services.AddSingleton<PostgreSqlStorage>();`
`33`	`33`
`34`	`34`	`_services = services;`
`35`	`35`	`}`