Add feature cache tests

benaadams · benaadams · commit 47216afb912a · 2015-12-11T05:53:40.000Z
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); }
diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ void IFeatureCache.SetFeaturesRevision()`
	`36`	`+ {`
	`37`	`+ _cachedFeaturesRevision = _features.Revision;`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`public void UpdateFeatures(IFeatureCollection features)`
`36`	`41`	`{`
`37`	`42`	`_features = features;`
`@@ -41,7 +46,8 @@ public void UpdateFeatures(IFeatureCollection features)`
`41`	`46`	`private void ResetFeatures()`
`42`	`47`	`{`
`43`	`48`	`_authentication = null;`
`44`		`- _cachedFeaturesRevision = _features.Revision;`
	`49`	`+`
	`50`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`45`	`51`	`}`
`46`	`52`
`47`	`53`	`private IHttpAuthenticationFeature HttpAuthenticationFeature`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ void IFeatureCache.SetFeaturesRevision()`
	`35`	`+ {`
	`36`	`+ _cachedFeaturesRevision = _features.Revision;`
	`37`	`+ }`
	`38`	`+`
`34`	`39`	`public void UpdateFeatures(IFeatureCollection features)`
`35`	`40`	`{`
`36`	`41`	`_features = features;`
`@@ -41,7 +46,8 @@ private void ResetFeatures()`
`41`	`46`	`{`
`42`	`47`	`_connection = null;`
`43`	`48`	`_tlsConnection = null;`
`44`		`- _cachedFeaturesRevision = _features.Revision;`
	`49`	`+`
	`50`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`45`	`51`	`}`
`46`	`52`
`47`	`53`	`private IHttpConnectionFeature HttpConnectionFeature`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ void IFeatureCache.SetFeaturesRevision()`
	`58`	`+ {`
	`59`	`+ _cachedFeaturesRevision = _features.Revision;`
	`60`	`+ }`
	`61`	`+`
`57`	`62`	`public void UpdateFeatures(IFeatureCollection features)`
`58`	`63`	`{`
`59`	`64`	`_features = features;`
`@@ -74,7 +79,8 @@ private void ResetFeatures()`
`74`	`79`	`_authentication = null;`
`75`	`80`	`_lifetime = null;`
`76`	`81`	`_session = null;`
`77`		`- _cachedFeaturesRevision = _features.Revision;`
	`82`	`+`
	`83`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`78`	`84`	`}`
`79`	`85`
`80`	`86`	`IItemsFeature ItemsFeature`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ void IFeatureCache.SetFeaturesRevision()`
	`40`	`+ {`
	`41`	`+ _cachedFeaturesRevision = _features.Revision;`
	`42`	`+ }`
	`43`	`+`
`39`	`44`	`public void UpdateFeatures(IFeatureCollection features)`
`40`	`45`	`{`
`41`	`46`	`_features = features;`
`@@ -48,7 +53,8 @@ private void ResetFeatures()`
`48`	`53`	`_query = null;`
`49`	`54`	`_form = null;`
`50`	`55`	`_cookies = null;`
`51`		`- _cachedFeaturesRevision = _features.Revision;`
	`56`	`+`
	`57`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`52`	`58`	`}`
`53`	`59`
`54`	`60`	`private IHttpRequestFeature HttpRequestFeature`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ void IFeatureCache.SetFeaturesRevision()`
	`37`	`+ {`
	`38`	`+ _cachedFeaturesRevision = _features.Revision;`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`public void UpdateFeatures(IFeatureCollection features)`
`37`	`42`	`{`
`38`	`43`	`_features = features;`
`@@ -43,7 +48,8 @@ private void ResetFeatures()`
`43`	`48`	`{`
`44`	`49`	`_response = null;`
`45`	`50`	`_cookies = null;`
`46`		`- _cachedFeaturesRevision = _features.Revision;`
	`51`	`+`
	`52`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`47`	`53`	`}`
`48`	`54`
`49`	`55`	`private IHttpResponseFeature HttpResponseFeature`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public static T GetAndCache<T>(`
`20`	`20`	`{`
`21`	`21`	`obj = features.Get<T>();`
`22`	`22`	`cachedObject = obj;`
	`23`	`+ cache.SetFeaturesRevision();`
`23`	`24`	`}`
`24`	`25`	`return obj;`
`25`	`26`	`}`
`@@ -56,9 +57,10 @@ public static T GetOrCreateAndCache<T>(`
`56`	`57`	`if (obj == null)`
`57`	`58`	`{`
`58`	`59`	`obj = factory();`
`59`		`- cachedObject = obj;`
`60`		`- features.Set(obj);`
`61`	`60`	`}`
	`61`	`+ cachedObject = obj;`
	`62`	`+ features.Set(obj);`
	`63`	`+ cache.SetFeaturesRevision();`
`62`	`64`	`}`
`63`	`65`	`return obj;`
`64`	`66`	`}`
`@@ -79,9 +81,10 @@ public static T GetOrCreateAndCache<T>(`
`79`	`81`	`if (obj == null)`
`80`	`82`	`{`
`81`	`83`	`obj = factory(features);`
`82`		`- cachedObject = obj;`
`83`		`- features.Set(obj);`
`84`	`84`	`}`
	`85`	`+ cachedObject = obj;`
	`86`	`+ features.Set(obj);`
	`87`	`+ cache.SetFeaturesRevision();`
`85`	`88`	`}`
`86`	`89`	`return obj;`
`87`	`90`	`}`
`@@ -103,9 +106,10 @@ public static T GetOrCreateAndCache<T>(`
`103`	`106`	`if (obj == null)`
`104`	`107`	`{`
`105`	`108`	`obj = factory(request);`
`106`		`- cachedObject = obj;`
`107`		`- features.Set(obj);`
`108`	`109`	`}`
	`110`	`+ cachedObject = obj;`
	`111`	`+ features.Set(obj);`
	`112`	`+ cache.SetFeaturesRevision();`
`109`	`113`	`}`
`110`	`114`	`return obj;`
`111`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace Microsoft.AspNet.Http.Features`
`5`	`5`	`{`
`6`		`- public interface IFeatureCache`
	`6`	`+ internal interface IFeatureCache`
`7`	`7`	`{`
`8`	`8`	`void CheckFeaturesRevision();`
	`9`	`+ void SetFeaturesRevision();`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,15 @@ void IFeatureCache.CheckFeaturesRevision()`
`42`	`42`	`if (_cachedFeaturesRevision != _features.Revision)`
`43`	`43`	`{`
`44`	`44`	`_request = null;`
`45`		`- _cachedFeaturesRevision = _features.Revision;`
	`45`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ void IFeatureCache.SetFeaturesRevision()`
	`50`	`+ {`
	`51`	`+ _cachedFeaturesRevision = _features.Revision;`
	`52`	`+ }`
	`53`	`+`
`49`	`54`	`private IHttpRequestFeature HttpRequestFeature`
`50`	`55`	`{`
`51`	`56`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,15 @@ void IFeatureCache.CheckFeaturesRevision()`
`44`	`44`	`if (_cachedFeaturesRevision != _features.Revision)`
`45`	`45`	`{`
`46`	`46`	`_request = null;`
`47`		`- _cachedFeaturesRevision = _features.Revision;`
	`47`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ void IFeatureCache.SetFeaturesRevision()`
	`52`	`+ {`
	`53`	`+ _cachedFeaturesRevision = _features.Revision;`
	`54`	`+ }`
	`55`	`+`
`51`	`56`	`private IHttpRequestFeature HttpRequestFeature`
`52`	`57`	`{`
`53`	`58`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,15 @@ void IFeatureCache.CheckFeaturesRevision()`
`23`	`23`	`if (_cachedFeaturesRevision != _features.Revision)`
`24`	`24`	`{`
`25`	`25`	`_response = null;`
`26`		`- _cachedFeaturesRevision = _features.Revision;`
	`26`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ void IFeatureCache.SetFeaturesRevision()`
	`31`	`+ {`
	`32`	`+ _cachedFeaturesRevision = _features.Revision;`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`private IHttpResponseFeature HttpResponseFeature`
`31`	`36`	`{`
`32`	`37`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`