Revert change to fix test failures

Author: cnblogs-dudu

MemcachedTest/FailurePolicyTest.cs

@@ -9,88 +9,85 @@
 using Xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Configuration;
 
 namespace MemcachedTest
 {
-    public class FailurePolicyTest
-    {
-        [Fact]
-        public void TestIfCalled()
-        {
-            IServiceProvider serviceProvider = getServiceProvider();
+	public class FailurePolicyTest
+	{
+		[Fact]
+		public void TestIfCalled()
+		{
+            IServiceCollection services = new ServiceCollection();
+            services.AddEnyimMemcached(options => options.AddServer("memcached", 11212));
+            services.AddLogging();
+            IServiceProvider serviceProvider = services.BuildServiceProvider();
+
             var config = serviceProvider.GetService<IMemcachedClientConfiguration>();
             config.SocketPool.FailurePolicyFactory = new FakePolicy();
             config.SocketPool.ConnectionTimeout = TimeSpan.FromSeconds(1);
             config.SocketPool.ReceiveTimeout = TimeSpan.FromSeconds(1);
 
             var logger = serviceProvider.GetService<ILoggerFactory>();
 
-            var client = new MemcachedClient(logger, config);
+            var client = new MemcachedClient(logger, config);            
 
             Assert.Null(client.Get("a"));
-        }
-
-        class FakePolicy : INodeFailurePolicy, INodeFailurePolicyFactory
-        {
-            bool INodeFailurePolicy.ShouldFail()
-            {
-                Assert.True(true);
-
-                return true;
-            }
-
-            INodeFailurePolicy INodeFailurePolicyFactory.Create(IMemcachedNode node)
-            {
-                return new FakePolicy();
-            }
-        }
-
-        [Fact]
-        public void TestThrottlingFailurePolicy()
-        {
-            var serviceProvider = getServiceProvider();
-            var config = serviceProvider.GetService<IMemcachedClientConfiguration>();
-            config.SocketPool.FailurePolicyFactory = new ThrottlingFailurePolicyFactory(4, TimeSpan.FromMilliseconds(2000));
-            config.SocketPool.ConnectionTimeout = TimeSpan.FromMilliseconds(5);
-            config.SocketPool.ReceiveTimeout = TimeSpan.FromMilliseconds(5);
-            config.SocketPool.MinPoolSize = 1;
-            config.SocketPool.MaxPoolSize = 1;
+		}
+
+		class FakePolicy : INodeFailurePolicy, INodeFailurePolicyFactory
+		{
+			bool INodeFailurePolicy.ShouldFail()
+			{
+				Assert.True(true);
+
+				return true;
+			}
+
+			INodeFailurePolicy INodeFailurePolicyFactory.Create(IMemcachedNode node)
+			{
+				return new FakePolicy();
+			}
+		}
+
+		[Fact]
+		public void TestThrottlingFailurePolicy()
+		{
+            IServiceCollection services = new ServiceCollection();
+            services.AddEnyimMemcached(options => options.AddServer("localhost", 11212));
+            services.AddLogging();
+            IServiceProvider serviceProvider = services.BuildServiceProvider();
+
+            var config = serviceProvider.GetService<IMemcachedClientConfiguration>();           
+			config.SocketPool.FailurePolicyFactory = new ThrottlingFailurePolicyFactory(4, TimeSpan.FromMilliseconds(2000));
+			config.SocketPool.ConnectionTimeout = TimeSpan.FromMilliseconds(5);
+			config.SocketPool.ReceiveTimeout = TimeSpan.FromMilliseconds(5);
+			config.SocketPool.MinPoolSize = 1;
+			config.SocketPool.MaxPoolSize = 1;
 
             var logger = serviceProvider.GetService<ILoggerFactory>();
             var client = new MemcachedClient(logger, config);
             var canFail = false;
-            var didFail = false;
+			var didFail = false;
 
-            client.NodeFailed += node =>
-            {
-                Assert.True(canFail, "canfail");
+			client.NodeFailed += node =>
+			{
+				Assert.True(canFail, "canfail");
 
-                didFail = true;
-            };
+				didFail = true;
+			};
 
-            Assert.Null(client.Get("a"));
-            Assert.Null(client.Get("a"));
+			Assert.Null(client.Get("a"));
+			Assert.Null(client.Get("a"));
 
-            canFail = true;
-            Thread.Sleep(2000);
+			canFail = true;
+			Thread.Sleep(2000);
 
-            Assert.Null(client.Get("a"));
-            Assert.Null(client.Get("a"));
-            Assert.Null(client.Get("a"));
-            Assert.Null(client.Get("a"));
+			Assert.Null(client.Get("a"));
+			Assert.Null(client.Get("a"));
+			Assert.Null(client.Get("a"));
+			Assert.Null(client.Get("a"));
 
-            Assert.True(didFail, "didfail");
-        }
-
-        private ServiceProvider getServiceProvider()
-        {
-            IServiceCollection services = new ServiceCollection();
-            var configuration = new ConfigurationBuilder().Build();
-            services.AddSingleton<IConfiguration>(configuration);
-            services.AddEnyimMemcached(options => options.AddServer("localhost", 11212));
-            services.AddLogging();
-            return services.BuildServiceProvider();
-        }
-    }
+			Assert.True(didFail, "didfail");
+		}
+	}
 }

MemcachedTest/MemcachedClientTest.cs

@@ -9,8 +9,6 @@
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
 using System.Linq;
-using Microsoft.Extensions.Configuration;
-using System.IO;
 
 namespace MemcachedTest
 {
@@ -31,13 +29,11 @@ protected virtual MemcachedClient GetClient(MemcachedProtocol protocol = Memcach
                 //    options.Transcoder = "BinaryFormatterTranscoder";
                 //}
             });
-            if (useBinaryFormatterTranscoder)
+            if(useBinaryFormatterTranscoder)
             {
-                services.AddSingleton<ITranscoder, BinaryFormatterTranscoder>();
+                services.AddSingleton<ITranscoder,BinaryFormatterTranscoder>();
             }
 
-            var configuration = new ConfigurationBuilder().Build();
-            services.AddSingleton<IConfiguration>(configuration);
             services.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Error).AddConsole());
 
             IServiceProvider serviceProvider = services.BuildServiceProvider();