Cleanup unit tests

Cleanup unit tests

--- Talifun.Web.Tests/Http/HttpRequestHeaderHelperTests.cs
+++ Talifun.Web.Tests/Http/HttpRequestHeaderHelperTests.cs
@@ -184,13 +184,15 @@
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var identity1 = "gzip";
             var identity2 = "deflate";
-
-            var ifMatchSent = identity1 + "," + identity2;
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(ifMatchSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, HttpRequestHeader.IfMatch);
+            var headerValue = identity1 + "," + identity2;
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -205,13 +207,15 @@
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var identity1 = "gzip";
             var identity2 = "deflate";
-
-            var ifMatchSent = identity1 + " , " + identity2;
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(ifMatchSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, HttpRequestHeader.IfMatch);
+            var headerValue = identity1 + " , " + identity2;
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -226,13 +230,15 @@
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var identity1 = "deflate";
             var identity2 = "gzip, hello";
-
-            var ifMatchSent = identity1 + " , \"" + identity2 + "\"";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(ifMatchSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, HttpRequestHeader.IfMatch);
+            var headerValue = identity1 + " , \"" + identity2 + "\"";
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -246,17 +252,20 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var ifMatchSent = "abcdeF";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(ifMatchSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, HttpRequestHeader.IfMatch);
+            var headerValue = "abcdeF";
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValues = httpRequestHeaderHelper.GetHttpHeaderValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
             Assert.AreEqual(1, headerValues.Count);
-            Assert.AreEqual(ifMatchSent, headerValues[0]);
+            Assert.AreEqual(headerValue, headerValues[0]);
         }
         #endregion

@@ -266,12 +275,15 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var accepEncodingSent = string.Empty;
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(accepEncodingSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, HttpRequestHeader.AcceptEncoding);
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -283,17 +295,20 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var accepEncodingSent = "gzip";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(accepEncodingSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, HttpRequestHeader.AcceptEncoding);
+            var headerValue = "gzip";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
             Assert.AreEqual(1, headerValueWithQValues.Count);
-            Assert.AreEqual(accepEncodingSent.ToLowerInvariant(), headerValueWithQValues[0].Identity);
+            Assert.AreEqual(headerValue.ToLowerInvariant(), headerValueWithQValues[0].Identity);
             Assert.IsNull(headerValueWithQValues[0].QValue);
         }

@@ -304,12 +319,15 @@
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var identity = "gzip";
             var qValue = 0.5f;
-            var accepEncodingSent = identity + ";q=" + qValue.ToString("N1");
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(accepEncodingSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, HttpRequestHeader.AcceptEncoding);
+            var headerValue = identity + ";q=" + qValue.ToString("N1");
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -330,12 +348,15 @@
             var identity2 = "deflate";
             var qValue2 = 0.8f;

-            var accepEncodingSent = identity1 + ";q=" + qValue1.ToString("N1") + "," + identity2 + ";q=" + qValue2.ToString("N1");
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(accepEncodingSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, HttpRequestHeader.AcceptEncoding);
+            var headerValue = identity1 + ";q=" + qValue1.ToString("N1") + "," + identity2 + ";q=" + qValue2.ToString("N1");
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -360,12 +381,15 @@
             var identity2 = "deflate";
             var qValue2 = 0.8f;

-            var accepEncodingSent = identity1 + " ; q = " + qValue1.ToString("N1") + " , " + identity2 + "; q=" + qValue2.ToString("N1");
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(accepEncodingSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, HttpRequestHeader.AcceptEncoding);
+            var headerValue = identity1 + " ; q = " + qValue1.ToString("N1") + " , " + identity2 + "; q=" + qValue2.ToString("N1");
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -390,12 +414,15 @@
             var identity2 = "deflate, test";
             var qValue2 = 0.8f;

-            var accepEncodingSent = identity1 + ";q=" + qValue1.ToString("N1") + ",\"" + identity2 + "\";q=" + qValue2.ToString("N1");
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(accepEncodingSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, HttpRequestHeader.AcceptEncoding);
+            var headerValue = identity1 + ";q=" + qValue1.ToString("N1") + ",\"" + identity2 + "\";q=" + qValue2.ToString("N1");
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
@@ -415,17 +442,20 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var accepEncodingSent = "abcdeF";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(accepEncodingSent);
-
-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, HttpRequestHeader.AcceptEncoding);
+            var headerValue = "abcdeF";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var headerValueWithQValues = httpRequestHeaderHelper.GetHttpHeaderWithQValues(httpRequest, headerType);

             //Assert
             httpRequest.VerifyAllExpectations();
             Assert.AreEqual(1, headerValueWithQValues.Count);
-            Assert.AreEqual(accepEncodingSent, headerValueWithQValues[0].Identity);
+            Assert.AreEqual(headerValue, headerValueWithQValues[0].Identity);
             Assert.IsNull(headerValueWithQValues[0].QValue);
         }
         #endregion
@@ -436,9 +466,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = string.Empty;
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
-
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var compressionMode = httpRequestHeaderHelper.GetCompressionMode(httpRequest);
@@ -453,8 +486,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "compression, test, testdeflater";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "compression, test, testdeflater";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -470,8 +506,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "deflate";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "deflate";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -487,8 +526,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "gzip";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "gzip";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -504,8 +546,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "gzip, deflate";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "gzip, deflate";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -521,8 +566,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "deflate;q=0.5, gzip;q=0.9, compress";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "deflate;q=0.5, gzip;q=0.9, compress";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -538,8 +586,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "*";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "*";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -555,8 +606,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "*, gzip";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "*, gzip";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -572,8 +626,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = " * , gzip ; q = 0.5, deflate; q=0.9";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = " * , gzip ; q = 0.5, deflate; q=0.9";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -590,8 +647,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var acceptEncodingSent = "Gzip";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.AcceptEncoding)]).Return(acceptEncodingSent);
+            var headerValue = "Gzip";
+            var headerType = HttpRequestHeader.AcceptEncoding;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -609,11 +669,11 @@
         public void GetHttpMethod_GetRequest_Get()
         {
             //Arrange
-            var requestHttpMethod = HttpMethod.Get;
-            var requestHttpMethodString = StringifyHttpHeaders.StringFromHttpMethod(requestHttpMethod);
-
-            var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            httpRequest.Expect(x => x.HttpMethod).Return(requestHttpMethodString);
+            var httpMethodType = HttpMethod.Get;
+            var httpMethodValue = StringifyHttpHeaders.StringFromHttpMethod(httpMethodType);
+
+            var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
+            httpRequest.Expect(x => x.HttpMethod).Return(httpMethodValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -621,7 +681,7 @@

             //Assert
             httpRequest.VerifyAllExpectations();
-            Assert.AreEqual(requestHttpMethod, result);
+            Assert.AreEqual(httpMethodType, result);
         }
         #endregion

@@ -631,8 +691,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangeRequestSent = "bytes=500-600,601-999";
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
+            var headerValue = "bytes=500-600,601-999";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -648,8 +711,11 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangeRequestSent = string.Empty;
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -668,10 +734,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = string.Empty;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfModifiedSince)]).Return(lastModifiedSent);
-
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.IfModifiedSince;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasBeenModifiedSince = httpRequestHeaderHelper.CheckIfModifiedSince(httpRequest, lastModified);
@@ -687,9 +755,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = lastModified.AddSeconds(-1).ToString("r");
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfModifiedSince)]).Return(lastModifiedSent);
-
+            var headerValue = lastModified.AddSeconds(-1).ToString("r");
+            var headerType = HttpRequestHeader.IfModifiedSince;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasBeenModifiedSince = httpRequestHeaderHelper.CheckIfModifiedSince(httpRequest, lastModified);
@@ -706,9 +777,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = lastModified.AddSeconds(1).ToString("r");
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfModifiedSince)]).Return(lastModifiedSent);
-
+            var headerValue = lastModified.AddSeconds(1).ToString("r");
+            var headerType = HttpRequestHeader.IfModifiedSince;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasBeenModifiedSince = httpRequestHeaderHelper.CheckIfModifiedSince(httpRequest, lastModified);
@@ -728,10 +802,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = string.Empty;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfUnmodifiedSince)]).Return(lastModifiedSent);
-
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.IfUnmodifiedSince;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasNotBeenModifiedSince = httpRequestHeaderHelper.CheckIfUnmodifiedSince(httpRequest, lastModified);
@@ -747,10 +823,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = lastModified.AddSeconds(1).ToString("r");
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfUnmodifiedSince)]).Return(lastModifiedSent);
-
+            var headerValue = lastModified.AddSeconds(1).ToString("r");
+            var headerType = HttpRequestHeader.IfUnmodifiedSince;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasNotBeenModifiedSince = httpRequestHeaderHelper.CheckIfUnmodifiedSince(httpRequest, lastModified);
@@ -767,9 +845,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = lastModified.AddSeconds(-1).ToString("r");
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfUnmodifiedSince)]).Return(lastModifiedSent);
-
+            var headerValue = lastModified.AddSeconds(-1).ToString("r");
+            var headerType = HttpRequestHeader.IfUnmodifiedSince;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasNotBeenModifiedSince = httpRequestHeaderHelper.CheckIfUnmodifiedSince(httpRequest, lastModified);
@@ -788,29 +869,31 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = string.Empty;
-
-            httpRequest.Expect(x => x.Headers[HttpRequestHeaderHelper.HTTP_HEADER_UNLESS_MODIFIED_SINCE]).Return(lastModifiedSent);
+            var headerValue = string.Empty;
+            var headerName = HttpRequestHeaderHelper.HTTP_HEADER_UNLESS_MODIFIED_SINCE;
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
+            //Act
+            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
+            var hasNotBeenModifiedSince = httpRequestHeaderHelper.CheckUnlessModifiedSince(httpRequest, lastModified);
+
+            //Assert
+            httpRequest.VerifyAllExpectations();
+            Assert.IsNull(hasNotBeenModifiedSince);
+        }
+
+        [Test]
+        public void CheckUnlessModifiedSince_HasNotBeenModifiedSince_True()
+        {
+            //Arrange
+            var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
+            var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
+            var headerValue = lastModified.AddSeconds(1).ToString("r");
+            var headerName = HttpRequestHeaderHelper.HTTP_HEADER_UNLESS_MODIFIED_SINCE;
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

-            //Act
-            var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
-            var hasNotBeenModifiedSince = httpRequestHeaderHelper.CheckUnlessModifiedSince(httpRequest, lastModified);
-
-            //Assert
-            httpRequest.VerifyAllExpectations();
-            Assert.IsNull(hasNotBeenModifiedSince);
-        }
-
-        [Test]
-        public void CheckUnlessModifiedSince_HasNotBeenModifiedSince_True()
-        {
-            //Arrange
-            var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = lastModified.AddSeconds(1).ToString("r");
-
-            httpRequest.Expect(x => x.Headers[HttpRequestHeaderHelper.HTTP_HEADER_UNLESS_MODIFIED_SINCE]).Return(lastModifiedSent);
-
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasNotBeenModifiedSince = httpRequestHeaderHelper.CheckUnlessModifiedSince(httpRequest, lastModified);
@@ -827,10 +910,11 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
-            var lastModifiedSent = lastModified.AddSeconds(-1).ToString("r");
-
-            httpRequest.Expect(x => x.Headers[HttpRequestHeaderHelper.HTTP_HEADER_UNLESS_MODIFIED_SINCE]).Return(lastModifiedSent);
-
+            var headerValue = lastModified.AddSeconds(-1).ToString("r");
+            var headerName = HttpRequestHeaderHelper.HTTP_HEADER_UNLESS_MODIFIED_SINCE;
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var hasNotBeenModifiedSince = httpRequestHeaderHelper.CheckUnlessModifiedSince(httpRequest, lastModified);
@@ -850,14 +934,14 @@
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var headers = MockRepository.GenerateMock<NameValueCollection>();
             httpRequest.Stub(x => x.Headers).Return(headers);
-
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
             var etag = "1234567";
-
-            var rangeRequestSent = string.Empty;
-
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
-
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Headers.Expect(x => x[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var satisfiesRangeCheck = httpRequestHeaderHelper.CheckIfRange(httpRequest, etag, lastModified);
@@ -879,11 +963,16 @@
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
             var etag = "1234567";

-            var rangeRequestSent = "bytes=500-600,601-999";
-            var IfRangeSent = string.Empty;
-
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfRange)]).Return(IfRangeSent);
+            var rangeRequestHeaderValue = "bytes=500-600,601-999";
+            var rangeRequestHeaderType = HttpRequestHeader.Range;
+            var rangeRequestHeaderName = StringifyHttpHeaders.StringFromRequestHeader(rangeRequestHeaderType);
+
+            var ifRangeHeaderValue = string.Empty;
+            var ifRangeHeaderType = HttpRequestHeader.IfRange;
+            var ifRangeHeaderName = StringifyHttpHeaders.StringFromRequestHeader(ifRangeHeaderType);
+
+            httpRequest.Headers.Expect(x => x[rangeRequestHeaderName]).Return(rangeRequestHeaderValue);
+            httpRequest.Headers.Expect(x => x[ifRangeHeaderName]).Return(ifRangeHeaderValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -905,11 +994,16 @@
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
             var etag = "1234567";

-            var rangeRequestSent = "bytes=500-600,601-999";
-            var IfRangeSent = etag;
-
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfRange)]).Return(IfRangeSent);
+            var rangeRequestHeaderValue = "bytes=500-600,601-999";
+            var rangeRequestHeaderType = HttpRequestHeader.Range;
+            var rangeRequestHeaderName = StringifyHttpHeaders.StringFromRequestHeader(rangeRequestHeaderType);
+
+            var ifRangeHeaderValue = etag;
+            var ifRangeHeaderType = HttpRequestHeader.IfRange;
+            var ifRangeHeaderName = StringifyHttpHeaders.StringFromRequestHeader(ifRangeHeaderType);
+
+            httpRequest.Headers.Expect(x => x[rangeRequestHeaderName]).Return(rangeRequestHeaderValue);
+            httpRequest.Headers.Expect(x => x[ifRangeHeaderName]).Return(ifRangeHeaderValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -932,11 +1026,16 @@
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
             var etag = "1234567";

-            var rangeRequestSent = "bytes=500-600,601-999";
-            var IfRangeSent = etag + "8";
-
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfRange)]).Return(IfRangeSent);
+            var rangeRequestHeaderValue = "bytes=500-600,601-999";
+            var rangeRequestHeaderType = HttpRequestHeader.Range;
+            var rangeRequestHeaderName = StringifyHttpHeaders.StringFromRequestHeader(rangeRequestHeaderType);
+
+            var ifRangeHeaderValue = etag + "8";
+            var ifRangeHeaderType = HttpRequestHeader.IfRange;
+            var ifRangeHeaderName = StringifyHttpHeaders.StringFromRequestHeader(ifRangeHeaderType);
+
+            httpRequest.Headers.Expect(x => x[rangeRequestHeaderName]).Return(rangeRequestHeaderValue);
+            httpRequest.Headers.Expect(x => x[ifRangeHeaderName]).Return(ifRangeHeaderValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -959,11 +1058,16 @@
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
             var etag = "1234567";

-            var rangeRequestSent = "bytes=500-600,601-999";
-            var IfRangeSent = lastModified.ToString("r");
-
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfRange)]).Return(IfRangeSent);
+            var rangeRequestHeaderValue = "bytes=500-600,601-999";
+            var rangeRequestHeaderType = HttpRequestHeader.Range;
+            var rangeRequestHeaderName = StringifyHttpHeaders.StringFromRequestHeader(rangeRequestHeaderType);
+
+            var ifRangeHeaderValue = lastModified.ToString("r");
+            var ifRangeHeaderType = HttpRequestHeader.IfRange;
+            var ifRangeHeaderName = StringifyHttpHeaders.StringFromRequestHeader(ifRangeHeaderType);
+
+            httpRequest.Headers.Expect(x => x[rangeRequestHeaderName]).Return(rangeRequestHeaderValue);
+            httpRequest.Headers.Expect(x => x[ifRangeHeaderName]).Return(ifRangeHeaderValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -986,11 +1090,16 @@
             var lastModified = new DateTime(2010, 01, 01, 01, 01, 01);
             var etag = "1234567";

-            var rangeRequestSent = "bytes=500-600,601-999";
-            var IfRangeSent = lastModified.AddSeconds(-1).ToString("r");
-
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangeRequestSent);
-            httpRequest.Headers.Expect(x => x[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfRange)]).Return(IfRangeSent);
+            var rangeRequestHeaderValue = "bytes=500-600,601-999";
+            var rangeRequestHeaderType = HttpRequestHeader.Range;
+            var rangeRequestHeaderName = StringifyHttpHeaders.StringFromRequestHeader(rangeRequestHeaderType);
+
+            var ifRangeHeaderValue = lastModified.AddSeconds(-1).ToString("r");
+            var ifRangeHeaderType = HttpRequestHeader.IfRange;
+            var ifRangeHeaderName = StringifyHttpHeaders.StringFromRequestHeader(ifRangeHeaderType);
+
+            httpRequest.Headers.Expect(x => x[rangeRequestHeaderName]).Return(rangeRequestHeaderValue);
+            httpRequest.Headers.Expect(x => x[ifRangeHeaderName]).Return(ifRangeHeaderValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1013,11 +1122,13 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = string.Empty;
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
-
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var ifMatchSatisfied = httpRequestHeaderHelper.CheckIfMatch(httpRequest, entityTag, doesEntityExists);
@@ -1033,11 +1144,13 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = entityTag;
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
-
+            var headerValue = entityTag;
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var ifMatchSatisfied = httpRequestHeaderHelper.CheckIfMatch(httpRequest, entityTag, doesEntityExists);
@@ -1054,10 +1167,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = "7654321," + entityTag;
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
+            var headerValue = "7654321," + entityTag;
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1075,10 +1190,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = entityTag + "8";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
+            var headerValue = entityTag + "8";
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1096,10 +1213,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = "7654321," + entityTag + "8";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
+            var headerValue = "7654321," + entityTag + "8";
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1117,10 +1236,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "abcdef";
-            var entityTagSent = "abcdeF";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
+            var headerValue = "abcdeF";
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1138,10 +1259,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "abcdef";
-            var entityTagSent = "*";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
+            var headerValue = "*";
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1159,10 +1282,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "abcdef";
-            var entityTagSent = "*";
             var doesEntityExists = false;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfMatch)]).Return(entityTagSent);
+            var headerValue = "*";
+            var headerType = HttpRequestHeader.IfMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1182,10 +1307,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = string.Empty;
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1202,10 +1329,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = entityTag;
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
+            var headerValue = entityTag;
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1223,11 +1352,13 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = "7654321," + entityTag;
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
-
+            var headerValue = "7654321," + entityTag;
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             var ifMatchSatisfied = httpRequestHeaderHelper.CheckIfNoneMatch(httpRequest, entityTag, doesEntityExists);
@@ -1244,10 +1375,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = entityTag + "8";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
+            var headerValue = entityTag + "8";
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1265,10 +1398,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "1234567";
-            var entityTagSent = "7654321," + entityTag + "8";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
+            var headerValue = "7654321," + entityTag + "8";
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1286,10 +1421,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "abcdef";
-            var entityTagSent = "abcdeF";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
+            var headerValue = "abcdeF";
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1307,10 +1444,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "abcdef";
-            var entityTagSent = "*";
             var doesEntityExists = true;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
+            var headerValue = "*";
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1328,10 +1467,12 @@
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
             var entityTag = "abcdef";
-            var entityTagSent = "*";
             var doesEntityExists = false;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.IfNoneMatch)]).Return(entityTagSent);
+            var headerValue = "*";
+            var headerType = HttpRequestHeader.IfNoneMatch;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1350,10 +1491,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = string.Empty;
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = string.Empty;
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1372,10 +1515,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=unknown-9999";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=unknown-9999";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1394,11 +1539,13 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=0-unknown";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
-
+            var headerValue = "bytes=0-unknown";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             IEnumerable<RangeItem> ranges;
@@ -1416,10 +1563,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=0-499,5=100";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=0-499,5=100";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1438,11 +1587,13 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=499-0";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
-
+            var headerValue = "bytes=499-0";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             IEnumerable<RangeItem> ranges;
@@ -1460,10 +1611,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=0-499";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=0-499";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1487,11 +1640,13 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=500-999";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
-
+            var headerValue = "bytes=500-999";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);
+
             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
             IEnumerable<RangeItem> ranges;
@@ -1514,10 +1669,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=0-499,500-999";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=0-499,500-999";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1544,10 +1701,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=-500";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=-500";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1571,10 +1730,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=9500-";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=9500-";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1598,10 +1759,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=0-0";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=0-0";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();
@@ -1625,10 +1788,12 @@
         {
             //Arrange
             var httpRequest = MockRepository.GenerateMock<HttpRequestBase>();
-            var rangesSent = "bytes=-1";
             var contentLength = 10000;
-
-            httpRequest.Expect(x => x.Headers[StringifyHttpHeaders.StringFromRequestHeader(HttpRequestHeader.Range)]).Return(rangesSent);
+            var headerValue = "bytes=-1";
+            var headerType = HttpRequestHeader.Range;
+            var headerName = StringifyHttpHeaders.StringFromRequestHeader(headerType);
+
+            httpRequest.Expect(x => x.Headers[headerName]).Return(headerValue);

             //Act
             var httpRequestHeaderHelper = new HttpRequestHeaderHelper();


Refactor to factory methods.

Refactor to factory methods.

--- Gu.Wpf.UiAutomation/ImageDiffWindow.cs
+++ Gu.Wpf.UiAutomation/ImageDiffWindow.cs
@@ -16,11 +16,6 @@

     public class ImageDiffWindow : System.Windows.Window
     {
-        private readonly System.Windows.Controls.Image expectedImage;
-        private readonly System.Windows.Controls.Image actualImage;
-        private readonly System.Windows.Controls.Primitives.ToggleButton expectedButton;
-        private readonly System.Windows.Controls.Primitives.ToggleButton actualButton;
-
         private ImageDiffWindow(Bitmap expected, Bitmap actual)
         {
             AutomationProperties.SetAutomationId(this, "Gu.Wpf.UiAutomationOverlayWindow");
@@ -35,56 +30,26 @@
             var root = new Grid();
             root.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
             root.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-            this.expectedImage = this.CreateImage(expected);
-            root.Children.Add(this.expectedImage);
+            var expectedImage = CreateImage(expected);
+            root.Children.Add(expectedImage);

-            this.actualImage = this.CreateImage(actual);
-            root.Children.Add(this.actualImage);
+            var actualImage = CreateImage(actual);
+            root.Children.Add(actualImage);

             var buttonGrid = new UniformGrid
             {
                 Rows = 1,
             };
             Grid.SetRow(buttonGrid, 1);
-            this.expectedButton = new System.Windows.Controls.Primitives.ToggleButton
-            {
-                Content = "Expected",
-                IsChecked = true,
-            };
-            BindingOperations.SetBinding(
-                                 this.expectedImage,
-                                 VisibilityProperty,
-                                 new Binding
-                                 {
-                                     Path = new PropertyPath("IsChecked"),
-                                     Mode = BindingMode.TwoWay,
-                                     Converter = new BooleanToVisibilityConverter(),
-                                     Source = this.expectedButton,
-                                 })
-                             .IgnoreReturnValue();
-            buttonGrid.Children.Add(this.expectedButton);
+            var expectedButton = CreateToggleButton("Expected", expectedImage);
+            buttonGrid.Children.Add(expectedButton);

-            this.actualButton = new System.Windows.Controls.Primitives.ToggleButton
-            {
-                Content = "actual",
-                IsChecked = true,
-            };
-            BindingOperations.SetBinding(
-                                 this.actualImage,
-                                 VisibilityProperty,
-                                 new Binding
-                                 {
-                                     Path = new PropertyPath("IsChecked"),
-                                     Mode = BindingMode.TwoWay,
-                                     Converter = new BooleanToVisibilityConverter(),
-                                     Source = this.actualButton,
-                                 })
-                             .IgnoreReturnValue();
-            buttonGrid.Children.Add(this.actualButton);
+            var actualButton = CreateToggleButton("Actual", actualImage);
+            buttonGrid.Children.Add(actualButton);
             root.Children.Add(buttonGrid);

-            this.BindOpacity(this.expectedImage);
-            this.BindOpacity(this.actualImage);
+            BindOpacity(expectedImage, expectedButton, actualButton);
+            BindOpacity(actualImage, expectedButton, actualButton);
             this.Content = root;
         }

@@ -141,19 +106,43 @@
             }
         }

-        private System.Windows.Controls.Image CreateImage(Bitmap bitmap)
+        private static System.Windows.Controls.Image CreateImage(Bitmap bitmap)
         {
             var image = new System.Windows.Controls.Image
-                        {
-                            Source = CreateBitmapSource(bitmap),
-                            Opacity = 0.5,
-                        };
+            {
+                Source = CreateBitmapSource(bitmap),
+                Opacity = 0.5,
+            };

             Grid.SetRow(image, 0);
             return image;
         }

-        private void BindOpacity(System.Windows.Controls.Image image)
+        private static System.Windows.Controls.Primitives.ToggleButton CreateToggleButton(string content, System.Windows.Controls.Image image)
+        {
+            var actualButton = new System.Windows.Controls.Primitives.ToggleButton
+            {
+                Content = content,
+                IsChecked = true,
+            };
+            BindingOperations.SetBinding(
+                                 image,
+                                 VisibilityProperty,
+                                 new Binding
+                                 {
+                                     Path = new PropertyPath("IsChecked"),
+                                     Mode = BindingMode.TwoWay,
+                                     Converter = new BooleanToVisibilityConverter(),
+                                     Source = actualButton,
+                                 })
+                             .IgnoreReturnValue();
+            return actualButton;
+        }
+
+        private static void BindOpacity(
+            System.Windows.Controls.Image image,
+            System.Windows.Controls.Primitives.ToggleButton expectedButton,
+            System.Windows.Controls.Primitives.ToggleButton actualButton)
         {
             BindingOperations.SetBinding(
                                  image,
@@ -167,13 +156,13 @@
                                          {
                                              Path = new PropertyPath("IsChecked"),
                                              Mode = BindingMode.OneWay,
-                                             Source = this.expectedButton,
+                                             Source = expectedButton,
                                          },
                                          new Binding
                                          {
                                              Path = new PropertyPath("IsChecked"),
                                              Mode = BindingMode.OneWay,
-                                             Source = this.actualButton,
+                                             Source = actualButton,
                                          },
                                      }
                                  })


Change order which I'm going to tackle tasks left  to do.

--- TestObjectBuilderTests/Tests/TestObjectBuilderTests.cs
+++ TestObjectBuilderTests/Tests/TestObjectBuilderTests.cs
@@ -19,16 +19,19 @@
      * done - add GetProperty(dependency name) string.  With returns ITestObjBuilder<T>, which
      *   has no visibility of the dependencies for a concrete class.  Thus you'd have to do,
      *   builder.GetType().GetProperty("FirstDependency").GetValue(builder, null)
-     * - product is simple class
-     * - product uses inheritance
      *
+     * ***
+     * - Add functionality to automatically generate a TestObjectBuilder from a class using reflection.
+     *   calls a default ctor, then sets all properties (public, private and protected) after construction.
+     *
+     *
+     * - tests for product is simple class
+     * - tests for product uses inheritance
      *
      * - Add a TestBuilderFactory class.  Don't want to do this in the tests because
      *   want to show class under test explicitly in the tests, thus, it may be an
      *   idea to add an examples project to show how that TestObject Builder could be used.
      *
-     * - Add functionality to automatically generate a TestObjectBuilder from a class using reflection.
-     *   calls a default ctor, then sets all properties (public, private and protected) after construction.
      *
      */
     public class TestObjectBuilderTests


Removed all the new Sessions from unit-tests. Making things slower.

--- VirtualObjects.Tests/Sessions/SessionTests.cs
+++ VirtualObjects.Tests/Sessions/SessionTests.cs
@@ -16,7 +16,7 @@
     /// Author: Sérgio
     /// </summary>
     [TestFixture, Category("Session")]
-    public class SessionTests : TimedTests
+    public class SessionTests : UtilityBelt
     {

         private ISession CreateSession()
@@ -40,7 +40,7 @@
         public void Session_Transaction_Should_Be_Created_And_Disposed()
         {

-            using (var session = CreateSession())
+            var session = Session;
             {
                 using (session.BeginTransaction())
                 {
@@ -54,7 +54,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Crud_Operations()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 session.WithinTransaction(() => Diagnostic.Timed(() =>
                 {
@@ -79,7 +79,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Queries()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = Diagnostic.Timed(() => session.Query<Employee>().Where(e => e.EmployeeId > 0).ToList());
                 employees.Count.Should().Be(9);
@@ -89,7 +89,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Entity_Lazy_Load()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });
                 var reportsTo = Diagnostic.Timed(() => employee.ReportsTo);
@@ -103,7 +103,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Collection_Fields_Lazy_Load()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });
                 var territories = Diagnostic.Timed(() => employee.Territories).ToList();
@@ -123,7 +123,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>();

@@ -134,7 +134,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAllEmployees()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>();
                 var i = 0;
@@ -152,7 +152,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAllEmployees1()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>();
                 var i = 0;
@@ -170,7 +170,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAllEmployees_Projected()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Select(e => new { e.EmployeeId, e.City, e.Country });
@@ -192,7 +192,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAllEmployees_Projected1()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Select(e => new { e.EmployeeId, e.City, e.Country });
@@ -219,7 +219,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAllEmployees_ReportsTo()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>();
                 var reportsTo = employees.ToList().Select(employee => employee.ReportsTo).ToList();
@@ -234,7 +234,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Employees_From_Orders()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Where(e => session.GetAll<Orders>()
@@ -264,7 +264,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Employees_From_Orders_Simpler()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Where(e => session.GetAll<Orders>()
@@ -278,7 +278,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Employees_From_Orders_Count_Twice()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Where(e => session.GetAll<Orders>()
@@ -295,7 +295,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Shippers_From_Orders()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var shippers = session.GetAll<Shippers>()
                     .Where(e => session.GetAll<Orders>()
@@ -309,7 +309,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Orders_Skip_Take()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = session.GetAll<Orders>()
                     .Where(e => e.OrderId > 10)
@@ -322,7 +322,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Orders_With_Specific_Shippers()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = session.GetAll<Orders>()
                     .Where(e => session.GetAll<Shippers>()
@@ -337,7 +337,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Orders_With_Specific_Shippers_Simpler()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = session.GetAll<Orders>()
                    .Where(e => session.GetAll<Shippers>()
@@ -351,7 +351,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAllOrders()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Orders>();

@@ -362,7 +362,7 @@
         [Test, Repeat(Repeat)]
         public void Session_WhereCondition_ShouldBeKept_ByResult()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var query1 = session.GetAll<Employee>()
                     .Where(m => m.EmployeeId > 4);
@@ -387,7 +387,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_LikeCondition()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Where(e => e.LastName.Contains("an"));
@@ -399,7 +399,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_LikeCondition_Left()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Where(e => e.LastName.StartsWith("d"));
@@ -411,7 +411,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_OrderedByFirstName()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session
                     .GetAll<Employee>().OrderBy(e => e.FirstName)
@@ -424,7 +424,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Count_Predicated()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 Assert.That(session.GetAll<Products>().Count(e => e.Discontinued), Is.EqualTo(8));
                 Assert.That(session.GetAll<Products>().Count(e => !e.Discontinued), Is.EqualTo(69));
@@ -445,7 +445,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_ToString_Method()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var foo = new
                 {
@@ -469,7 +469,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Enum_ToString_Method()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>().Where(e => e.FirstName == Testing.Andrew.ToString());

@@ -480,7 +480,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_New_Object()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Where(e => e.BirthDate == new DateTime(1948, 12, 8));
@@ -492,7 +492,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetEmployeeList_ReportsToFilter()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees1 = session
                     .GetAll<Employee>().Where(e => e.ReportsTo.FirstName == "Andrew");
@@ -511,7 +511,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetEmployee_ReportsTo_First()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 EntitiesAsserts.Assert_Employee_1(session
                     .GetAll<Employee>()
@@ -522,7 +522,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_OrderedByFirstName_TSql()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session
                     .GetAll<Employee>().OrderBy(e => e.FirstName)
@@ -535,7 +535,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_OrderedByCity_Descending()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee2 = session
                     .GetAll<Employee>()
@@ -557,7 +557,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_QueryWith_OrCondition()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session
                     .GetAll<Employee>()
@@ -574,7 +574,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_MoreComplexQuery2()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees =
                     session.GetAll<Employee>().Where(e => e.LastName.Contains("r") || e.LastName.Contains("a"));
@@ -586,7 +586,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_MoreComplexQuery()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session
                     .GetAll<Employee>()
@@ -600,7 +600,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_withConditionExpression()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var id = 1;
                 var employees = session
@@ -640,7 +640,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_Between()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session.GetAll<Employee>()
                     .Where(m => m.EmployeeId >= 1 && m.EmployeeId <= 5);
@@ -652,7 +652,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_In_using_collection()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var collection = session.GetAll<Employee>()
                     .Where(m => m.EmployeeId <= 5);
@@ -667,7 +667,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_In_using_collection_SameNames()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 5 });

@@ -684,7 +684,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_In_using_collection_diffNames()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = session.GetAll<Orders>()
                     .Where(o => session.GetAll<Shippers>().Where(s => s.ShipperId == 2).Contains(o.Shipper))
@@ -697,7 +697,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetAll_withConditionExpression_IdConst()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employees = session
                     .GetAll<Employee>().Where(m => m.EmployeeId == 1);
@@ -709,7 +709,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Count()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 Assert.AreEqual(9, session.Count<Employee>());
             }
@@ -718,7 +718,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 using (var s = CreateSession())
                 {
@@ -736,7 +736,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Exists()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 Assert.IsTrue(session.Exists(new Employee { EmployeeId = 1 }));
                 Assert.IsTrue(session.Exists(new Employee { EmployeeId = 2 }));
@@ -749,7 +749,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_ReportsTo()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(
                     new Employee { EmployeeId = 1 });
@@ -765,7 +765,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_Territories()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });

@@ -776,7 +776,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_AnyTerritories()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });

@@ -792,7 +792,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_Any_Filtered_Territories()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });

@@ -803,7 +803,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_Territories_Filtered()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });

@@ -814,7 +814,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_Territories_Filtered_On_Count()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(
                     new Employee { EmployeeId = 1 });
@@ -826,7 +826,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_Territories_Filtered_On_Count_EntityParameter()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });

@@ -841,7 +841,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_Territories_Filtered_On_Count_EntityParameter_Inline_Init()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(
                     new Employee { EmployeeId = 1 });
@@ -855,7 +855,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetById_With_Setted_Territories()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });

@@ -870,7 +870,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Reuse_Returned_Entity()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var employee = session.GetById(new Employee { EmployeeId = 1 });

@@ -884,7 +884,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Insert_Employee()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 session.WithRollback(() =>
                 {
@@ -904,7 +904,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Delete_Employee()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 session.WithRollback(() =>
                 {
@@ -925,7 +925,7 @@
         [Test, Repeat(Repeat), ExpectedException(typeof(ExecutionException))]
         public void Session_Update_Old_Employee()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 session.WithRollback(() =>
                 {
@@ -972,7 +972,7 @@
         [Test, Repeat(Repeat), ExpectedException(typeof(ExecutionException))]
         public void Session_Update_Employee_Unversioned()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 session.WithRollback(() =>
                 {
@@ -996,7 +996,7 @@
         [Test, Repeat(Repeat)]
         public void Session_Update_Employee()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 session.WithRollback(() =>
                 {
@@ -1023,7 +1023,7 @@
         [Test]
         public void Session_GetOrders_Join_OrderDetails()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = from o in session.GetAll<Orders>()
                              join od in session.GetAll<OrderDetails>() on o equals od.Order
@@ -1053,7 +1053,7 @@
         [Test]
         public void Session_GetOrders_2Joins_OrderDetails()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = from o in session.GetAll<Orders>()
                              join od in session.GetAll<OrderDetails>() on o equals od.Order
@@ -1076,7 +1076,7 @@
         [Test]
         public void Session_GetOrders_GroupedJoin_OrderDetails()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = from o in session.GetAll<Orders>()
                              join od in session.GetAll<OrderDetails>() on o equals od.Order into god
@@ -1103,7 +1103,7 @@
         [Test, Repeat(Repeat)]
         public void Session_GetOrders_Join_OrderDetails_Projected()
         {
-            using (var session = CreateSession())
+            var session = Session;
             {
                 var orders = from o in session.GetAll<Orders>()
                              join od in session.GetAll<OrderDetails>() on o equals od.Order


Theoretical text rendering improvements

Theoretical text rendering improvements

Not tested fully because I borked my computer and get about 1 FPS at the
moment

--- Voxalia/ClientGame/GraphicsSystems/TextVBO.cs
+++ Voxalia/ClientGame/GraphicsSystems/TextVBO.cs
@@ -109,28 +109,20 @@
             GL.BindVertexArray(0);
             // Vertex buffer
             GL.BindBuffer(BufferTarget.ArrayBuffer, VBO);
-            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(Positions.Length * Vector3.SizeInBytes),
-                    Positions, BufferUsageHint.StaticDraw);
-            GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
+            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(Positions.Length * Vector3.SizeInBytes), Positions, BufferUsageHint.StaticDraw);
             // Normal buffer
             GL.BindBuffer(BufferTarget.ArrayBuffer, VBONormals);
-            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(Normals.Length * Vector3.SizeInBytes),
-                    Normals, BufferUsageHint.StaticDraw);
-            GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
+            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(Normals.Length * Vector3.SizeInBytes), Normals, BufferUsageHint.StaticDraw);
             // TexCoord buffer
             GL.BindBuffer(BufferTarget.ArrayBuffer, VBOTexCoords);
-            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(TexCoords.Length * Vector3.SizeInBytes),
-                    TexCoords, BufferUsageHint.StaticDraw);
-            GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
+            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(TexCoords.Length * Vector3.SizeInBytes), TexCoords, BufferUsageHint.StaticDraw);
             // Color buffer
             GL.BindBuffer(BufferTarget.ArrayBuffer, VBOColors);
-            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(Colors.Length * Vector4.SizeInBytes),
-                    Colors, BufferUsageHint.StaticDraw);
+            GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(Colors.Length * Vector4.SizeInBytes), Colors, BufferUsageHint.StaticDraw);
             GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
             // Index buffer
             GL.BindBuffer(BufferTarget.ElementArrayBuffer, VBOIndices);
-            GL.BufferData(BufferTarget.ElementArrayBuffer, (IntPtr)(Indices.Length * sizeof(uint)),
-                    Indices, BufferUsageHint.StaticDraw);
+            GL.BufferData(BufferTarget.ElementArrayBuffer, (IntPtr)(Indices.Length * sizeof(uint)), Indices, BufferUsageHint.StaticDraw);
             GL.BindBuffer(BufferTarget.ElementArrayBuffer, 0);
             // VAO
             GL.BindVertexArray(VAO);
@@ -149,12 +141,6 @@
             GL.BindBuffer(BufferTarget.ElementArrayBuffer, VBOIndices);
             // Clean up
             GL.BindVertexArray(0);
-            GL.DisableVertexAttribArray(0);
-            GL.DisableVertexAttribArray(1);
-            GL.DisableVertexAttribArray(2);
-            GL.DisableVertexAttribArray(3);
-            GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
-            GL.BindBuffer(BufferTarget.ElementArrayBuffer, 0);
         }

         /// <summary>


GetMethodTypes when starting liveView

GetMethodTypes when starting liveView

--- WPPMM/PhoneApp/CameraManager/CameraManager.cs
+++ WPPMM/PhoneApp/CameraManager/CameraManager.cs
@@ -180,7 +180,8 @@

             if (!cameraStatus.isAvailableShooting)
             {
-                cameraStatus.isAvailableShooting = true;
+                cameraStatus.isAvailableShooting = true;
+                GetMethodTypes(null);
                 Deployment.Current.Dispatcher.BeginInvoke(() =>
                 {
                     NoticeUpdate();
@@ -239,19 +240,8 @@
             if (deviceInfo.Endpoints.ContainsKey("camera"))
             {
                 client = new CameraServiceClient10(di.Endpoints["camera"]);
-                Debug.WriteLine(di.Endpoints["camera"]);
-                client.GetMethodTypes(apiVersion, OnError, (methodTypes) =>
-                {
-                    List<String> list = new List<string>();
-                    foreach (MethodType t in methodTypes)
-                    {
-                        Debug.WriteLine("method: " + t.name);
-                        list.Add(t.name);
-                    }
-                    cameraStatus.MethodTypes = list;
-                    NoticeUpdate();
-                    Found.Invoke();
-                });
+                Debug.WriteLine(di.Endpoints["camera"]);
+                GetMethodTypes(Found);
                 cameraStatus.isAvailableConnecting = true;

                 InitEventObserver();
@@ -260,6 +250,24 @@

             NoticeUpdate();

+        }
+
+        private void GetMethodTypes(Action found)
+        {
+            client.GetMethodTypes(apiVersion, OnError, (methodTypes) =>
+            {
+                List<String> list = new List<string>();
+                foreach (MethodType t in methodTypes)
+                {
+                    list.Add(t.name);
+                }
+                cameraStatus.MethodTypes = list;
+                if (found != null)
+                {
+                    found.Invoke();
+                }
+                NoticeUpdate();
+            });
         }

         // -------- take picture


Update MeleeStun.cs

Update MeleeStun.cs

--- UnityProject/Assets/Scripts/Weapons/Melee/MeleeStun.cs
+++ UnityProject/Assets/Scripts/Weapons/Melee/MeleeStun.cs
@@ -74,8 +74,8 @@
 			registerPlayerVictim.ServerStun(stunTime);
 			SoundManager.PlayNetworkedAtPos(stunSound, target.transform.position, sourceObj: target.gameObject);
 			// deactivates the stun and makes you wait;
-			canStun = false;
-			CreateTimer();
+
+			DisableStun();
 			// Special case: If we're on help intent (only stun), we should still show the lerp (unless we're hitting ourselves)
 			if (interaction.Intent == Intent.Help && performer != target)
 			{
@@ -84,8 +84,9 @@
 		}
 	}
 	// creates the timer needed to let you stun again'
-	private void CreateTimer()
+	private void DisableStun()
 	{
+		canStun = false;
 		Timer stunTimer = new Timer();
 		stunTimer.Interval = delay * 1000;
 		stunTimer.Elapsed += StunTimer_Elapsed;


Use Blockstream.info as block explorer Part 1 https://github.com/zkSNACKs/WalletWasabi/issues/1178

--- WalletWasabi.Backend/UnversionedWebBuilder.cs
+++ WalletWasabi.Backend/UnversionedWebBuilder.cs
@@ -47,14 +47,14 @@

 			var content = HtmlStartLine + "
";
 			var endContent = "
";
-			string smartBitPath;
+			string blockstreamPath;
 			if (Global.Config.Network == Network.TestNet)
 			{
-				smartBitPath = "https://testnet.smartbit.com.au/tx/";
+				blockstreamPath = "https://blockstream.info/testnet/tx/";
 			}
 			else
 			{
-				smartBitPath = "https://smartbit.com.au/tx/";
+				blockstreamPath = "https://blockstream.info/tx/";
 			}

 			var coinJoinsList = coinJoins.ToList();
@@ -64,11 +64,11 @@

 				if (i % 2 == 0)
 				{
-					content += $"
{cjHash}
";
+					content += $"
{cjHash}
";
 				}
 				else
 				{
-					content += $"
{cjHash}
";
+					content += $"
{cjHash}
";
 				}
 			}


Change

Change

--- UnityProject/ModernAIProject/Assets/Source/Executor.cs
+++ UnityProject/ModernAIProject/Assets/Source/Executor.cs
@@ -45,7 +45,7 @@
         //set which way the ai members should perform their qlearning
         ThreadSafe.AIGroup.executeMethod = ThreadSafe.AIGroup.ExecuteMethod.oneAIAtATime;

-        Neat.Initialize(2, 300, 100, inputValues, new ThreadSafe.World(currentWorld.ResourcePositions));
+        Neat.Initialize(500, 300, 100, inputValues, new ThreadSafe.World(currentWorld.ResourcePositions));
     }
     public void GenerateWorld()
     {


moving image again

moving image again

--- WebApp-B2C-DotNet/Views/Shared/_Layout.cshtml
+++ WebApp-B2C-DotNet/Views/Shared/_Layout.cshtml
@@ -12,12 +12,12 @@

                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-
+

                 </button>
-
+
                 @Html.ActionLink("Azure AD B2C", "Index", "Home", null, new { @class = "navbar-brand" })