Add feature cache tests

aspnet · Dec 11, 2015 · 47216af · 47216af
1 parent 1c04873
commit 47216af
Show file tree

Hide file tree

Showing 12 changed files with 223 additions and 16 deletions.
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -32,6 +32,11 @@ void IFeatureCache.CheckFeaturesRevision()
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         public void UpdateFeatures(IFeatureCollection features)
         {
             _features = features;
@@ -41,7 +46,8 @@ public void UpdateFeatures(IFeatureCollection features)
         private void ResetFeatures()
         {
             _authentication = null;
-            _cachedFeaturesRevision = _features.Revision;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         private IHttpAuthenticationFeature HttpAuthenticationFeature

diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
@@ -31,6 +31,11 @@ void IFeatureCache.CheckFeaturesRevision()
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         public void UpdateFeatures(IFeatureCollection features)
         {
             _features = features;
@@ -41,7 +46,8 @@ private void ResetFeatures()
         {
             _connection = null;
             _tlsConnection = null;
-            _cachedFeaturesRevision = _features.Revision;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         private IHttpConnectionFeature HttpConnectionFeature

diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
@@ -54,6 +54,11 @@ void IFeatureCache.CheckFeaturesRevision()
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         public void UpdateFeatures(IFeatureCollection features)
         {
             _features = features;
@@ -74,7 +79,8 @@ private void ResetFeatures()
             _authentication = null;
             _lifetime = null;
             _session = null;
-            _cachedFeaturesRevision = _features.Revision;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         IItemsFeature ItemsFeature

diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
@@ -36,6 +36,11 @@ void IFeatureCache.CheckFeaturesRevision()
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         public void UpdateFeatures(IFeatureCollection features)
         {
             _features = features;
@@ -48,7 +53,8 @@ private void ResetFeatures()
             _query = null;
             _form = null;
             _cookies = null;
-            _cachedFeaturesRevision = _features.Revision;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         private IHttpRequestFeature HttpRequestFeature

diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
@@ -33,6 +33,11 @@ void IFeatureCache.CheckFeaturesRevision()
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         public void UpdateFeatures(IFeatureCollection features)
         {
             _features = features;
@@ -43,7 +48,8 @@ private void ResetFeatures()
         {
             _response = null;
             _cookies = null;
-            _cachedFeaturesRevision = _features.Revision;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         private IHttpResponseFeature HttpResponseFeature

diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
@@ -31,6 +31,11 @@ void IFeatureCache.CheckFeaturesRevision()
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         public void UpdateFeatures(IFeatureCollection features)
         {
             _features = features;
@@ -41,7 +46,8 @@ private void ResetFeatures()
         {
             _request = null;
             _webSockets = null;
-            _cachedFeaturesRevision = _features.Revision;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         private IHttpRequestFeature HttpRequestFeature

diff --git a/src/Microsoft.AspNet.Http/Features/FeatureHelpers.cs b/src/Microsoft.AspNet.Http/Features/FeatureHelpers.cs
@@ -20,6 +20,7 @@ public static T GetAndCache<T>(
             {
                 obj = features.Get<T>();
                 cachedObject = obj;
+                cache.SetFeaturesRevision();
             }
             return obj;
         }
@@ -56,9 +57,10 @@ public static T GetOrCreateAndCache<T>(
                 if (obj == null)
                 {
                     obj = factory();
-                    cachedObject = obj;
-                    features.Set(obj);
                 }
+                cachedObject = obj;
+                features.Set(obj);
+                cache.SetFeaturesRevision();
             }
             return obj;
         }
@@ -79,9 +81,10 @@ public static T GetOrCreateAndCache<T>(
                 if (obj == null)
                 {
                     obj = factory(features);
-                    cachedObject = obj;
-                    features.Set(obj);
                 }
+                cachedObject = obj;
+                features.Set(obj);
+                cache.SetFeaturesRevision();
             }
             return obj;
         }
@@ -103,9 +106,10 @@ public static T GetOrCreateAndCache<T>(
                 if (obj == null)
                 {
                     obj = factory(request);
-                    cachedObject = obj;
-                    features.Set(obj);
                 }
+                cachedObject = obj;
+                features.Set(obj);
+                cache.SetFeaturesRevision();
             }
             return obj;
         }

diff --git a/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs b/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs
@@ -3,8 +3,9 @@
 
 namespace Microsoft.AspNet.Http.Features
 {
-    public interface IFeatureCache
+    internal interface IFeatureCache
     {
         void CheckFeaturesRevision();
+        void SetFeaturesRevision();
     }
 }
diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
@@ -42,10 +42,15 @@ void IFeatureCache.CheckFeaturesRevision()
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 _request = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ((IFeatureCache)this).SetFeaturesRevision();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }

diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
@@ -44,10 +44,15 @@ void IFeatureCache.CheckFeaturesRevision()
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 _request = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ((IFeatureCache)this).SetFeaturesRevision();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }

diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
@@ -23,10 +23,15 @@ void IFeatureCache.CheckFeaturesRevision()
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 _response = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ((IFeatureCache)this).SetFeaturesRevision();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpResponseFeature HttpResponseFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }