Fixed Redis cache extension and tests

Author: kichalla

src/Microsoft.Framework.Caching.Redis/CachingServiceExtensions.cs

@@ -3,11 +3,14 @@
 
 using Microsoft.Framework.Caching.Distributed;
 using Microsoft.Framework.Caching.Redis;
+using Microsoft.Framework.DependencyInjection.Extensions;
+using Microsoft.Framework.Internal;
+
 namespace Microsoft.Framework.DependencyInjection
 {
     public static class CachingServicesExtensions
     {
-        public static IServiceCollection AddRedisCache(this IServiceCollection collection)
+        public static IServiceCollection AddRedisCache([NotNull] this IServiceCollection collection)
         {
             collection.AddOptions();
             collection.TryAdd(ServiceDescriptor.Singleton<IDistributedCache, RedisCache>());

test/Microsoft.Framework.Caching.Redis.Tests/CacheServiceExtensionsTests.cs

@@ -4,17 +4,17 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.Framework.Caching.Distributed;
 using Microsoft.Framework.DependencyInjection;
 using Xunit;
+
 namespace Microsoft.Framework.Caching.Redis
 {
     public class CacheServiceExtensionsTests
     {
-        
-
         [Fact]
-        public void AddRedisCache_RegistersDistributedCacheAsTransient()
+        public void AddRedisCache_RegistersDistributedCacheAsSingleton()
         {
             // Arrange
             var services = new ServiceCollection();
@@ -26,7 +26,7 @@ public void AddRedisCache_RegistersDistributedCacheAsTransient()
             var distributedCache = services.FirstOrDefault(desc => desc.ServiceType == typeof(IDistributedCache));
 
             Assert.NotNull(distributedCache);
-            Assert.Equal(ServiceLifetime.Transient, distributedCache.Lifetime);
+            Assert.Equal(ServiceLifetime.Singleton, distributedCache.Lifetime);
         }
 
         [Fact]
@@ -37,7 +37,7 @@ public void AddRedisCache_DoesNotReplaceUserRegisteredServices()
             services.AddScoped<IDistributedCache, TestDistributedCache>();
 
             // Act
-            services.AddCaching();
+            services.AddRedisCache();
 
             // Assert
             var serviceProvider = services.BuildServiceProvider();
@@ -49,25 +49,54 @@ public void AddRedisCache_DoesNotReplaceUserRegisteredServices()
             Assert.IsType<TestDistributedCache>(serviceProvider.GetRequiredService<IDistributedCache>());
         }
 
-
         private class TestDistributedCache : IDistributedCache
         {
             public void Connect()
             {
                 throw new NotImplementedException();
             }
 
+            public Task ConnectAsync()
+            {
+                throw new NotImplementedException();
+            }
+
+            public byte[] Get(string key)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task<byte[]> GetAsync(string key)
+            {
+                throw new NotImplementedException();
+            }
+
             public void Refresh(string key)
             {
                 throw new NotImplementedException();
             }
 
+            public Task RefreshAsync(string key)
+            {
+                throw new NotImplementedException();
+            }
+
             public void Remove(string key)
             {
                 throw new NotImplementedException();
             }
 
-            public Stream Set(string key, object state, Action<ICacheContext> create)
+            public Task RemoveAsync(string key)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void Set(string key, byte[] value, DistributedCacheEntryOptions options)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options)
             {
                 throw new NotImplementedException();
             }

test/Microsoft.Framework.Caching.Redis.Tests/project.json

@@ -1,14 +1,15 @@
 {
-  "dependencies": {
-    "Microsoft.AspNet.Testing": "1.0.0-*",
-    "Microsoft.Framework.Caching.Redis": "1.0.0-*",
-    "Microsoft.Framework.DependencyInjection": "1.0.0-*",
-    "xunit.runner.dnx": "2.1.0-*"
-  },
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
-  "frameworks": {
-    "dnx451": { }
-  }
+    "dependencies": {
+        "Microsoft.AspNet.Testing": "1.0.0-*",
+        "Microsoft.Framework.Caching.Redis": "1.0.0-*",
+        "Microsoft.Framework.DependencyInjection": "1.0.0-*",
+        "xunit": "2.1.0-*",
+        "xunit.runner.dnx": "2.1.0-*"
+    },
+    "commands": {
+        "test": "xunit.runner.dnx"
+    },
+    "frameworks": {
+        "dnx451": { }
+    }
 }