From 733c8f77e2c8dca0c0366f1467f1c6460066e774 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Mon, 3 Oct 2016 16:56:29 -0700 Subject: [PATCH] Refactoring a lot of tests in the Rewrite project * Removed extra newline --- .../ConditionPatternParserTest.cs | 10 +- .../ApacheModRewrite/FlagParserTest.cs | 6 +- .../ApacheModRewrite/FormatExceptionTests.cs | 2 +- .../ModRewriteMiddlewareTest.cs | 36 ++--- .../ApacheModRewrite/RewriteTokenizerTest.cs | 6 +- .../ApacheModRewrite/RuleRegexParserTest.cs | 2 +- .../ApacheModRewrite/TestStringParserTests.cs | 2 +- .../IISUrlRewrite/FileParserTests.cs | 28 ++-- .../FormatExceptionHandlingTests.cs | 36 ++--- .../IISUrlRewrite/InputParserTests.cs | 12 +- .../IISUrlRewrite/MiddleWareTests.cs | 138 +++++++++--------- .../UrlRewriteApplicationTests.cs | 4 +- .../MiddlewareTests.cs | 7 +- .../PatternSegments/DateTimeSegmentTests.cs | 3 +- .../PatternSegments/IsHttpsModSegmentTests.cs | 2 +- .../RequestMethodSegmentTests.cs | 4 +- .../UrlActions/ForbiddenActionTests.cs | 4 +- .../UrlActions/GoneActionTests.cs | 4 +- .../UrlMatches/ExactMatchTests.cs | 2 +- .../UrlMatches/IntegerMatchTests.cs | 2 +- .../UrlMatches/StringMatchTests.cs | 2 +- 21 files changed, 155 insertions(+), 157 deletions(-) diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ConditionPatternParserTest.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ConditionPatternParserTest.cs index 99a58c0b88..d9dc2a5cf8 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ConditionPatternParserTest.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ConditionPatternParserTest.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var results = new ConditionPatternParser().ParseActionCondition(condition); var expected = new ParsedModRewriteInput { OperationType = operation, ConditionType = conditionType, Operand = variable, Invert = false }; - Assert.True(CompareConditions(results, expected)); + Assert.True(CompareConditions(expected, results)); } [Fact] @@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var results = new ConditionPatternParser().ParseActionCondition(condition); var expected = new ParsedModRewriteInput { ConditionType = ConditionType.Regex, Operand = "(.*)", Invert = false }; - Assert.True(CompareConditions(results, expected)); + Assert.True(CompareConditions(expected, results)); } [Theory] @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var results = new ConditionPatternParser().ParseActionCondition(condition); var expected = new ParsedModRewriteInput { ConditionType = cond, OperationType = operation, Invert = false }; - Assert.True(CompareConditions(results, expected)); + Assert.True(CompareConditions(expected, results)); } [Theory] @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var results = new ConditionPatternParser().ParseActionCondition(condition); var expected = new ParsedModRewriteInput { ConditionType = cond, OperationType = operation, Invert = true }; - Assert.True(CompareConditions(results, expected)); + Assert.True(CompareConditions(expected, results)); } [Theory] @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var results = new ConditionPatternParser().ParseActionCondition(condition); var expected = new ParsedModRewriteInput { ConditionType = cond, OperationType = operation, Invert = false, Operand = variable }; - Assert.True(CompareConditions(results, expected)); + Assert.True(CompareConditions(expected, results)); } [Theory] diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FlagParserTest.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FlagParserTest.cs index 8270bc07cc..8f8d0cf7a8 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FlagParserTest.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FlagParserTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite dict.Add(FlagType.NoCase, string.Empty); var expected = new Flags(dict); - Assert.True(DictionaryContentsEqual(results.FlagDictionary, expected.FlagDictionary)); + Assert.True(DictionaryContentsEqual(expected.FlagDictionary, results.FlagDictionary)); } [Fact] @@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite dict.Add(FlagType.Last, string.Empty); var expected = new Flags(dict); - Assert.True(DictionaryContentsEqual(results.FlagDictionary, expected.FlagDictionary)); + Assert.True(DictionaryContentsEqual(expected.FlagDictionary, results.FlagDictionary)); } [Fact] @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite dict.Add(FlagType.Redirect, "301"); var expected = new Flags(dict); - Assert.True(DictionaryContentsEqual(results.FlagDictionary, expected.FlagDictionary)); + Assert.True(DictionaryContentsEqual(expected.FlagDictionary, results.FlagDictionary)); } [Theory] diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FormatExceptionTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FormatExceptionTests.cs index acf46b3765..20db752b1f 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FormatExceptionTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FormatExceptionTests.cs @@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite { // Arrange, Act, Assert var ex = Assert.Throws(() => new FileParser().Parse(new StringReader(input))); - Assert.Equal(ex.Message, expected); + Assert.Equal(expected, ex.Message); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ModRewriteMiddlewareTest.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ModRewriteMiddlewareTest.cs index 0c3b943636..bf0669ce26 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ModRewriteMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ModRewriteMiddlewareTest.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite { [Fact] public async Task Invoke_RewritePathWhenMatching() - { + { var options = new RewriteOptions().AddApacheModRewrite(new StringReader("RewriteRule /hey/(.*) /$1 ")); var builder = new WebHostBuilder() .Configure(app => @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("/hey/hello"); - Assert.Equal(response, "/hello"); + Assert.Equal("/hello", response); } [Fact] @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("/hey/hello"); - Assert.Equal(response, "/hello"); + Assert.Equal("/hello", response); } [Fact] @@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("/hey/hello"); - Assert.Equal(response, "/what"); + Assert.Equal("/what", response); } [Fact] @@ -82,9 +82,9 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("/hey/hello"); - Assert.Equal(response, "/hey/hello"); + Assert.Equal("/hey/hello", response); } - + [Fact] public async Task Invoke_ShouldRewriteHomepage() { @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("http://www.foo.org/"); - Assert.Equal(response, "/homepage.html"); + Assert.Equal("/homepage.html", response); } [Fact] @@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("http://www.foo.org:42/"); - Assert.Equal(response, "/homepage.html"); + Assert.Equal("/homepage.html", response); } [Fact] @@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("http://www.foo.org/"); - Assert.Equal(response, "/"); + Assert.Equal("/", response); } [Fact] @@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("http://www.foo.org/homepage.aspx"); - Assert.Equal(response, "/homepage.php"); + Assert.Equal("/homepage.php", response); } [Theory] @@ -173,7 +173,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync(url); - Assert.Equal(response, expected); + Assert.Equal(expected, response); } [Fact] @@ -191,7 +191,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("http://www.foo.org/blog/2016-jun"); - Assert.Equal(response, @"/blog/2016-jun/"); + Assert.Equal(@"/blog/2016-jun/", response); } [Fact] @@ -209,7 +209,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("http://www.foo.org/blog/2016-jun"); - Assert.Equal(response, @"http://www.example.com/blog/2016-jun/"); + Assert.Equal(@"http://www.example.com/blog/2016-jun/", response); } [Fact] @@ -227,7 +227,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetStringAsync("http://www.foo.org/blog/2016-jun"); - Assert.Equal(response, @"http://www.example.com/blog/2016-jun/"); + Assert.Equal(@"http://www.example.com/blog/2016-jun/", response); } [Theory] @@ -266,8 +266,8 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetAsync(input); - Assert.Equal(response.StatusCode, (HttpStatusCode)301); - Assert.Equal(response.Headers.Location.OriginalString, "/"); + Assert.Equal(HttpStatusCode.MovedPermanently, response.StatusCode); + Assert.Equal("/", response.Headers.Location.OriginalString); } [Theory] @@ -285,7 +285,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var server = new TestServer(builder); var response = await server.CreateClient().GetStringAsync(input); - Assert.Equal(response, "/"); + Assert.Equal("/", response); } [Fact] @@ -304,7 +304,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite var response = await server.CreateClient().GetAsync(""); - Assert.Equal(response.Headers.Location.OriginalString, "/foo"); + Assert.Equal("/foo", response.Headers.Location.OriginalString); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RewriteTokenizerTest.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RewriteTokenizerTest.cs index 98e556df50..04a7071d7b 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RewriteTokenizerTest.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RewriteTokenizerTest.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite expected.Add("RewriteCond"); expected.Add("%{HTTPS}"); expected.Add("!-f"); - Assert.Equal(tokens, expected); + Assert.Equal(expected, tokens); } [Fact] @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite expected.Add("RewriteCond"); expected.Add(@"%{HTTPS} what"); expected.Add("!-f"); - Assert.Equal(tokens, expected); + Assert.Equal(expected, tokens); } [Fact] @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite expected.Add(@"%{HTTPS}"); expected.Add(@" what"); expected.Add(@"!-f"); - Assert.Equal(tokens, expected); + Assert.Equal(expected, tokens); } [Fact] diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleRegexParserTest.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleRegexParserTest.cs index fefc5f2b2e..20f54abba5 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleRegexParserTest.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleRegexParserTest.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite { var results = new RuleRegexParser().ParseRuleRegex("(.*)"); Assert.False(results.Invert); - Assert.Equal(results.Operand, "(.*)"); + Assert.Equal("(.*)", results.Operand); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/TestStringParserTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/TestStringParserTests.cs index 917e628040..eafb814ab1 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/TestStringParserTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/TestStringParserTests.cs @@ -122,7 +122,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite public void ConditionParser_InvalidInput(string testString, string expected) { var ex = Assert.Throws(() => new TestStringParser().Parse(testString)); - Assert.Equal(ex.Message, expected); + Assert.Equal(expected, ex.Message); } private void AssertPatternsEqual(Pattern p1, Pattern p2) diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FileParserTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FileParserTests.cs index b891b3a2c5..dd55225c2b 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FileParserTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FileParserTests.cs @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var res = new UrlRewriteFileParser().Parse(new StringReader(xml)); // assert - AssertUrlRewriteRuleEquality(res, expected); + AssertUrlRewriteRuleEquality(expected, res); } [Fact] @@ -50,9 +50,9 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite - - - + + + @@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var res = new UrlRewriteFileParser().Parse(new StringReader(xml)); // assert - AssertUrlRewriteRuleEquality(res, expected); + AssertUrlRewriteRuleEquality(expected, res); } [Fact] @@ -87,16 +87,16 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite - - - + + + - - - + + + @@ -125,7 +125,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var res = new UrlRewriteFileParser().Parse(new StringReader(xml)); // assert - AssertUrlRewriteRuleEquality(res, expected); + AssertUrlRewriteRuleEquality(expected, res); } // Creates a rule with appropriate default values of the url rewrite rule. @@ -163,11 +163,11 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite if (r1.Conditions == null) { - Assert.Equal(r2.Conditions.Count, 0); + Assert.Equal(0, r2.Conditions.Count); } else if (r2.Conditions == null) { - Assert.Equal(r1.Conditions.Count, 0); + Assert.Equal(0, r1.Conditions.Count); } else { diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs index 3b77f78290..6398da1e95 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite -", +", "Could not parse the UrlRewrite file. Message: 'Missing close brace for parameter at string index: '1''. Line number '5': '14'.")] [InlineData( @" @@ -37,16 +37,16 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite -", +", "Could not parse the UrlRewrite file. Message: 'Match must have Url Attribute'. Line number '4': '14'.")] [InlineData( @" - - - + + + @@ -57,39 +57,39 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite - - - + + + -", +", "Could not parse the UrlRewrite file. Message: 'Conditions must have an input attribute'. Line number '6': '18'.")] [InlineData( @" - - - + + + -", +", "Could not parse the UrlRewrite file. Message: 'Match does not have an associated pattern attribute in condition'. Line number '6': '18'.")] [InlineData( @" - - - + + + -", +", "Could not parse the UrlRewrite file. Message: 'Match does not have an associated pattern attribute in condition'. Line number '6': '18'.")] [InlineData( @" @@ -105,7 +105,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { // Arrange, Act, Assert var ex = Assert.Throws(() => new UrlRewriteFileParser().Parse(new StringReader(input))); - Assert.Equal(ex.Message, expected); + Assert.Equal(expected, ex.Message); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InputParserTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InputParserTests.cs index 29299a9287..df59ae4596 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InputParserTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InputParserTests.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var testString = "hello/hey/what"; var result = new InputParser().ParseInputString(testString); - Assert.Equal(result.PatternSegments.Count, 1); + Assert.Equal(1, result.PatternSegments.Count); } [Theory] @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite public void InputParser_ParseStringWithBackReference(string testString, int expected) { var result = new InputParser().ParseInputString(testString); - Assert.Equal(result.PatternSegments.Count, expected); + Assert.Equal(expected, result.PatternSegments.Count); } // Test actual evaluation of the types, verifying the correct string comes from the evalation @@ -46,9 +46,9 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var middle = new InputParser().ParseInputString(testString); var result = middle.Evaluate(CreateTestRewriteContext(), CreateTestRuleMatch(), CreateTestCondMatch()); - Assert.Equal(result, expected); + Assert.Equal(expected, result); } - + [Theory] [InlineData("hey/{ToLower:HEY}", "hey/hey")] [InlineData("hey/{ToLower:{R:1}}", "hey/foo")] @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var middle = new InputParser().ParseInputString(testString); var result = middle.Evaluate(CreateTestRewriteContext(), CreateTestRuleMatch(), CreateTestCondMatch()); - Assert.Equal(result, expected); + Assert.Equal(expected, result); } [Theory] @@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var middle = new InputParser().ParseInputString(testString); var result = middle.Evaluate(CreateTestRewriteContext(), CreateTestRuleMatch(), CreateTestCondMatch()); - Assert.Equal(result, expected); + Assert.Equal(expected, result); } [Theory] diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs index dcc7cb98c4..e18f0325c1 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetAsync("article/10/hey"); - Assert.Equal(response.Headers.Location.OriginalString, "/article.aspx?id=10&title=hey"); + Assert.Equal("/article.aspx?id=10&title=hey", response.Headers.Location.OriginalString); } [Fact] @@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetStringAsync("/article/10/hey"); - Assert.Equal(response, "/article.aspx?id=10&title=hey"); + Assert.Equal("/article.aspx?id=10&title=hey", response); } [Fact] @@ -68,14 +68,14 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - - - - - + + + + + + + + ")); var builder = new WebHostBuilder() @@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetStringAsync("page.asp?p2=321&p1=123"); - Assert.Equal(response, "/newpage.aspx?param1=123¶m2=321"); + Assert.Equal("/newpage.aspx?param1=123¶m2=321", response); } [Fact] @@ -96,10 +96,10 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - + + + + ")); var builder = new WebHostBuilder() @@ -112,7 +112,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetAsync("HElLo"); - Assert.Equal(response.Headers.Location.OriginalString, "/hello"); + Assert.Equal("/hello", response.Headers.Location.OriginalString); } [Fact] @@ -120,14 +120,14 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - - - - - + + + + + + + + ")); var builder = new WebHostBuilder() @@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetAsync("hey/hello/"); - Assert.Equal(response.Headers.Location.OriginalString, "/hey/hello"); + Assert.Equal("/hey/hello", response.Headers.Location.OriginalString); } [Fact] @@ -147,14 +147,14 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - - - - - + + + + + + + + ")); var builder = new WebHostBuilder() @@ -166,7 +166,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetAsync("hey/hello"); - Assert.Equal(response.Headers.Location.OriginalString, "/hey/hello/"); + Assert.Equal("/hey/hello/", response.Headers.Location.OriginalString); } [Fact] @@ -174,13 +174,13 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - - - - + + + + + + + ")); var builder = new WebHostBuilder() @@ -192,7 +192,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetAsync(new Uri("http://example.com")); - Assert.Equal(response.Headers.Location.OriginalString, "https://example.com/"); + Assert.Equal("https://example.com/", response.Headers.Location.OriginalString); } [Fact] @@ -200,13 +200,13 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - - - - + + + + + + + ")); var builder = new WebHostBuilder() @@ -224,7 +224,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetStringAsync(new Uri("http://example.com")); - Assert.Equal(response, "https://example.com/"); + Assert.Equal("https://example.com/", response); } [Fact] @@ -232,10 +232,10 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - + + + + ")); var builder = new WebHostBuilder() @@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetStringAsync(new Uri("http://example.com/")); - Assert.Equal(response, "http://internalserver/"); + Assert.Equal("http://internalserver/", response); } [Fact] @@ -261,10 +261,10 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - + + + + ")); var builder = new WebHostBuilder() @@ -282,7 +282,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetAsync(new Uri("http://example.com/")); - Assert.Equal(response.Headers.Location.OriginalString, "/"); + Assert.Equal("/", response.Headers.Location.OriginalString); } [Fact] @@ -290,10 +290,10 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - + + + + ")); var builder = new WebHostBuilder() @@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite var response = await server.CreateClient().GetStringAsync(new Uri("http://example.com/")); - Assert.Equal(response, "/"); + Assert.Equal("/", response); } [Fact] @@ -316,10 +316,10 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite { var options = new RewriteOptions().AddIISUrlRewrite(new StringReader(@" - - - - + + + + ")); var builder = new WebHostBuilder() diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs index 83958e6c99..87fcfdbae0 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite Assert.Equal(rules.Count, 1); var context = new RewriteContext { HttpContext = new DefaultHttpContext() }; rules.FirstOrDefault().ApplyRule(context); - Assert.Equal(context.Result, RuleResult.SkipRemainingRules); + Assert.Equal(RuleResult.SkipRemainingRules, context.Result); } [Fact] @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite Assert.Equal(rules.Count, 1); var context = new RewriteContext { HttpContext = new DefaultHttpContext() }; rules.FirstOrDefault().ApplyRule(context); - Assert.Equal(context.Result, RuleResult.ContinueRules); + Assert.Equal(RuleResult.ContinueRules, context.Result); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs index 67802e031f..ce041ff52c 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs @@ -20,7 +20,6 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.CodeRules var builder = new WebHostBuilder() .Configure(app => { - app.UseRewriter(options); app.UseRewriter(options); app.Run(context => context.Response.WriteAsync( context.Request.Scheme + @@ -33,7 +32,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.CodeRules var response = await server.CreateClient().GetStringAsync("foo"); - Assert.Equal(response, "http://example.com/foo"); + Assert.Equal("http://example.com/foo", response); } [Fact] @@ -49,7 +48,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.CodeRules var response = await server.CreateClient().GetAsync("foo"); - Assert.Equal(response.Headers.Location.OriginalString, "http://example.com/foo"); + Assert.Equal("http://example.com/foo", response.Headers.Location.OriginalString); } [Fact] @@ -65,7 +64,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.CodeRules var response = await server.CreateClient().GetAsync(new Uri("http://example.com")); - Assert.Equal(response.Headers.Location.OriginalString, "https://example.com/"); + Assert.Equal("https://example.com/", response.Headers.Location.OriginalString); } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/DateTimeSegmentTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/DateTimeSegmentTests.cs index 9e478da8e4..8f5ef184a8 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/DateTimeSegmentTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/DateTimeSegmentTests.cs @@ -35,10 +35,9 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.PatternSegments [InlineData("wow", "Unsupported segment: 'wow'")] public void DateTime_AssertThrowsOnInvalidInput(string input, string expected) { - // Act And Assert var ex = Assert.Throws(() => new DateTimeSegment(input)); - Assert.Equal(ex.Message, expected); + Assert.Equal(expected, ex.Message); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsModSegmentTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsModSegmentTests.cs index 323f3198b4..b578b31bac 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsModSegmentTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsModSegmentTests.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.PatternSegments // Act var results = segement.Evaluate(context, null, null); - + // Assert Assert.Equal(expected, results); } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestMethodSegmentTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestMethodSegmentTests.cs index fc9ac14b01..0fa65a8182 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestMethodSegmentTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestMethodSegmentTests.cs @@ -15,12 +15,12 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.PatternSegments // Arrange var segement = new RequestMethodSegment(); var context = new RewriteContext { HttpContext = new DefaultHttpContext() }; - context.HttpContext.Request.Method = "GET"; + context.HttpContext.Request.Method = HttpMethods.Get; // Act var results = segement.Evaluate(context, null, null); // Assert - Assert.Equal("GET", results); + Assert.Equal(HttpMethods.Get, results); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs index 0ab9a6f439..b15354b672 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs @@ -18,8 +18,8 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlActions action.ApplyAction(context, null, null); - Assert.Equal(context.Result, RuleResult.EndResponse); - Assert.Equal(context.HttpContext.Response.StatusCode, StatusCodes.Status403Forbidden); + Assert.Equal(RuleResult.EndResponse, context.Result); + Assert.Equal(StatusCodes.Status403Forbidden, context.HttpContext.Response.StatusCode); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs index 1a18fe7d19..00720f85ef 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs @@ -17,8 +17,8 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlActions action.ApplyAction(context, null, null); - Assert.Equal(context.Result, RuleResult.EndResponse); - Assert.Equal(context.HttpContext.Response.StatusCode, StatusCodes.Status410Gone); + Assert.Equal(RuleResult.EndResponse, context.Result); + Assert.Equal(StatusCodes.Status410Gone, context.HttpContext.Response.StatusCode); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/ExactMatchTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/ExactMatchTests.cs index 9b85354adc..7f7e82b9b2 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/ExactMatchTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/ExactMatchTests.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlMatches var context = new RewriteContext { HttpContext = new DefaultHttpContext() }; var Match = new ExactMatch(ignoreCase, inputString, negate); var matchResults = Match.Evaluate(pattern, context); - Assert.Equal(matchResults.Success, expectedResult); + Assert.Equal(expectedResult, matchResults.Success); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/IntegerMatchTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/IntegerMatchTests.cs index bb7408d9f6..5dd87ca4ad 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/IntegerMatchTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/IntegerMatchTests.cs @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlMatches var context = new RewriteContext { HttpContext = new DefaultHttpContext() }; var integerMatch = new IntegerMatch(value, operation); var matchResult = integerMatch.Evaluate(input, context); - Assert.Equal(matchResult.Success, expectedResult); + Assert.Equal(expectedResult, matchResult.Success); } } } diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/StringMatchTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/StringMatchTests.cs index 0cd62e1f91..a562fec6e2 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/StringMatchTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/StringMatchTests.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlMatches var context = new RewriteContext { HttpContext = new DefaultHttpContext() }; var stringMatch = new StringMatch(value, operation, ignoreCase); var matchResult = stringMatch.Evaluate(input, context); - Assert.Equal(matchResult.Success, expectedResult); + Assert.Equal(expectedResult, matchResult.Success); } } }