Skip to content
This repository was archived by the owner on Nov 22, 2018. It is now read-only.

Commit c6477ad

Browse files
TratcherTratcher
committed
Fix unit tests on x-plat.
1 parent 5576626 commit c6477ad

File tree

8 files changed

+81
-82
lines changed

8 files changed

+81
-82
lines changed

‎test/Microsoft.AspNet.StaticFiles.Tests/CacheHeaderTests.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public async Task ServerShouldReturnETag()
1818
{
1919
TestServer server = TestServer.Create(app => app.UseFileServer());
2020

21-
HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/SubFolder/Extra.xml");
21+
HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/SubFolder/extra.xml");
2222
Assert.NotNull(response.Headers.ETag);
2323
Assert.NotNull(response.Headers.ETag.Tag);
2424
}
@@ -28,8 +28,8 @@ public async Task SameETagShouldBeReturnedAgain()
2828
{
2929
TestServer server = TestServer.Create(app => app.UseFileServer());
3030

31-
HttpResponseMessage response1 = await server.CreateClient().GetAsync("http://localhost/SubFolder/Extra.xml");
32-
HttpResponseMessage response2 = await server.CreateClient().GetAsync("http://localhost/SubFolder/Extra.xml");
31+
HttpResponseMessage response1 = await server.CreateClient().GetAsync("http://localhost/SubFolder/extra.xml");
32+
HttpResponseMessage response2 = await server.CreateClient().GetAsync("http://localhost/SubFolder/extra.xml");
3333
Assert.Equal(response2.Headers.ETag, response1.Headers.ETag);
3434
}
3535

@@ -45,7 +45,7 @@ public async Task SameETagShouldBeReturnedAgain()
4545
public async Task IfMatchShouldReturn412WhenNotListed()
4646
{
4747
TestServer server = TestServer.Create(app => app.UseFileServer());
48-
var req = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/Extra.xml");
48+
var req = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/extra.xml");
4949
req.Headers.Add("If-Match", "\"fake\"");
5050
HttpResponseMessage resp = await server.CreateClient().SendAsync(req);
5151
Assert.Equal(HttpStatusCode.PreconditionFailed, resp.StatusCode);
@@ -55,9 +55,9 @@ public async Task IfMatchShouldReturn412WhenNotListed()
5555
public async Task IfMatchShouldBeServedWhenListed()
5656
{
5757
TestServer server = TestServer.Create(app => app.UseFileServer());
58-
HttpResponseMessage original = await server.CreateClient().GetAsync("http://localhost/SubFolder/Extra.xml");
58+
HttpResponseMessage original = await server.CreateClient().GetAsync("http://localhost/SubFolder/extra.xml");
5959

60-
var req = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/Extra.xml");
60+
var req = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/extra.xml");
6161
req.Headers.Add("If-Match", original.Headers.ETag.ToString());
6262
HttpResponseMessage resp = await server.CreateClient().SendAsync(req);
6363
Assert.Equal(HttpStatusCode.OK, resp.StatusCode);
@@ -67,7 +67,7 @@ public async Task IfMatchShouldBeServedWhenListed()
6767
public async Task IfMatchShouldBeServedForAstrisk()
6868
{
6969
TestServer server = TestServer.Create(app => app.UseFileServer());
70-
var req = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/Extra.xml");
70+
var req = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/extra.xml");
7171
req.Headers.Add("If-Match", "*");
7272
HttpResponseMessage resp = await server.CreateClient().SendAsync(req);
7373
Assert.Equal(HttpStatusCode.OK, resp.StatusCode);
@@ -91,14 +91,14 @@ public async Task IfMatchShouldBeServedForAstrisk()
9191
public async Task IfNoneMatchShouldReturn304ForMatchingOnGetAndHeadMethod()
9292
{
9393
TestServer server = TestServer.Create(app => app.UseFileServer());
94-
HttpResponseMessage resp1 = await server.CreateClient().GetAsync("http://localhost/SubFolder/Extra.xml");
94+
HttpResponseMessage resp1 = await server.CreateClient().GetAsync("http://localhost/SubFolder/extra.xml");
9595

96-
var req2 = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/Extra.xml");
96+
var req2 = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SubFolder/extra.xml");
9797
req2.Headers.Add("If-None-Match", resp1.Headers.ETag.ToString());
9898
HttpResponseMessage resp2 = await server.CreateClient().SendAsync(req2);
9999
Assert.Equal(HttpStatusCode.NotModified, resp2.StatusCode);
100100

101-
var req3 = new HttpRequestMessage(HttpMethod.Head, "http://localhost/SubFolder/Extra.xml");
101+
var req3 = new HttpRequestMessage(HttpMethod.Head, "http://localhost/SubFolder/extra.xml");
102102
req3.Headers.Add("If-None-Match", resp1.Headers.ETag.ToString());
103103
HttpResponseMessage resp3 = await server.CreateClient().SendAsync(req3);
104104
Assert.Equal(HttpStatusCode.NotModified, resp3.StatusCode);
@@ -108,14 +108,14 @@ public async Task IfNoneMatchShouldReturn304ForMatchingOnGetAndHeadMethod()
108108
public async Task IfNoneMatchShouldBeIgnoredForNonTwoHundredAnd304Responses()
109109
{
110110
TestServer server = TestServer.Create(app => app.UseFileServer());
111-
HttpResponseMessage resp1 = await server.CreateClient().GetAsync("http://localhost/SubFolder/Extra.xml");
111+
HttpResponseMessage resp1 = await server.CreateClient().GetAsync("http://localhost/SubFolder/extra.xml");
112112

113-
var req2 = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SubFolder/Extra.xml");
113+
var req2 = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SubFolder/extra.xml");
114114
req2.Headers.Add("If-None-Match", resp1.Headers.ETag.ToString());
115115
HttpResponseMessage resp2 = await server.CreateClient().SendAsync(req2);
116116
Assert.Equal(HttpStatusCode.NotFound, resp2.StatusCode);
117117

118-
var req3 = new HttpRequestMessage(HttpMethod.Put, "http://localhost/SubFolder/Extra.xml");
118+
var req3 = new HttpRequestMessage(HttpMethod.Put, "http://localhost/SubFolder/extra.xml");
119119
req3.Headers.Add("If-None-Match", resp1.Headers.ETag.ToString());
120120
HttpResponseMessage resp3 = await server.CreateClient().SendAsync(req3);
121121
Assert.Equal(HttpStatusCode.NotFound, resp3.StatusCode);
@@ -136,7 +136,7 @@ public async Task ServerShouldReturnLastModified()
136136
{
137137
TestServer server = TestServer.Create(app => app.UseFileServer());
138138

139-
HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/SubFolder/Extra.xml");
139+
HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/SubFolder/extra.xml");
140140
Assert.NotNull(response.Content.Headers.LastModified);
141141
}
142142

@@ -154,11 +154,11 @@ public async Task MatchingBothConditionsReturnsNotModified()
154154
{
155155
TestServer server = TestServer.Create(app => app.UseFileServer());
156156
HttpResponseMessage resp1 = await server
157-
.CreateRequest("/SubFolder/Extra.xml")
157+
.CreateRequest("/SubFolder/extra.xml")
158158
.GetAsync();
159159

160160
HttpResponseMessage resp2 = await server
161-
.CreateRequest("/SubFolder/Extra.xml")
161+
.CreateRequest("/SubFolder/extra.xml")
162162
.AddHeader("If-None-Match", resp1.Headers.ETag.ToString())
163163
.And(req => req.Headers.IfModifiedSince = resp1.Content.Headers.LastModified)
164164
.GetAsync();
@@ -171,27 +171,27 @@ public async Task MissingEitherOrBothConditionsReturnsNormally()
171171
{
172172
TestServer server = TestServer.Create(app => app.UseFileServer());
173173
HttpResponseMessage resp1 = await server
174-
.CreateRequest("/SubFolder/Extra.xml")
174+
.CreateRequest("/SubFolder/extra.xml")
175175
.GetAsync();
176176

177177
DateTimeOffset lastModified = resp1.Content.Headers.LastModified.Value;
178178
DateTimeOffset pastDate = lastModified.AddHours(-1);
179179
DateTimeOffset furtureDate = lastModified.AddHours(1);
180180

181181
HttpResponseMessage resp2 = await server
182-
.CreateRequest("/SubFolder/Extra.xml")
182+
.CreateRequest("/SubFolder/extra.xml")
183183
.AddHeader("If-None-Match", "\"fake\"")
184184
.And(req => req.Headers.IfModifiedSince = lastModified)
185185
.GetAsync();
186186

187187
HttpResponseMessage resp3 = await server
188-
.CreateRequest("/SubFolder/Extra.xml")
188+
.CreateRequest("/SubFolder/extra.xml")
189189
.AddHeader("If-None-Match", resp1.Headers.ETag.ToString())
190190
.And(req => req.Headers.IfModifiedSince = pastDate)
191191
.GetAsync();
192192

193193
HttpResponseMessage resp4 = await server
194-
.CreateRequest("/SubFolder/Extra.xml")
194+
.CreateRequest("/SubFolder/extra.xml")
195195
.AddHeader("If-None-Match", "\"fake\"")
196196
.And(req => req.Headers.IfModifiedSince = furtureDate)
197197
.GetAsync();
@@ -219,7 +219,7 @@ public async Task InvalidIfModifiedSinceDateFormatGivesNormalGet()
219219
TestServer server = TestServer.Create(app => app.UseFileServer());
220220

221221
HttpResponseMessage res = await server
222-
.CreateRequest("/SubFolder/Extra.xml")
222+
.CreateRequest("/SubFolder/extra.xml")
223223
.AddHeader("If-Modified-Since", "bad-date")
224224
.GetAsync();
225225

@@ -239,11 +239,11 @@ public async Task IfModifiedSinceDateEqualsLastModifiedShouldReturn304()
239239
TestServer server = TestServer.Create(app => app.UseFileServer());
240240

241241
HttpResponseMessage res1 = await server
242-
.CreateRequest("/SubFolder/Extra.xml")
242+
.CreateRequest("/SubFolder/extra.xml")
243243
.GetAsync();
244244

245245
HttpResponseMessage res2 = await server
246-
.CreateRequest("/SubFolder/Extra.xml")
246+
.CreateRequest("/SubFolder/extra.xml")
247247
.And(req => req.Headers.IfModifiedSince = res1.Content.Headers.LastModified)
248248
.GetAsync();
249249

‎test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.IO;
5+
using System.Linq;
56
using System.Net;
67
using System.Net.Http;
78
using System.Threading.Tasks;
@@ -32,7 +33,7 @@ public async Task NullArguments()
3233
[InlineData("", @".", "/missing.dir/")]
3334
[InlineData("/subdir", @".", "/subdir/missing.dir")]
3435
[InlineData("/subdir", @".", "/subdir/missing.dir/")]
35-
[InlineData("", @".\", "/missing.dir")]
36+
[InlineData("", @"./", "/missing.dir")]
3637
public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string requestUrl)
3738
{
3839
TestServer server = TestServer.Create(app =>
@@ -52,8 +53,8 @@ public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string r
5253

5354
[Theory]
5455
[InlineData("", @".", "/SubFolder/")]
55-
[InlineData("", @".\", "/SubFolder/")]
56-
[InlineData("", @".\SubFolder", "/")]
56+
[InlineData("", @"./", "/SubFolder/")]
57+
[InlineData("", @"./SubFolder", "/")]
5758
public async Task FoundDirectoryWithDefaultFile_PathModified(string baseUrl, string baseDir, string requestUrl)
5859
{
5960
TestServer server = TestServer.Create(app =>
@@ -73,8 +74,8 @@ public async Task FoundDirectoryWithDefaultFile_PathModified(string baseUrl, str
7374

7475
[Theory]
7576
[InlineData("", @".", "/SubFolder", "")]
76-
[InlineData("", @".\", "/SubFolder", "")]
77-
[InlineData("", @".\", "/SubFolder", "?a=b")]
77+
[InlineData("", @"./", "/SubFolder", "")]
78+
[InlineData("", @"./", "/SubFolder", "?a=b")]
7879
public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, string requestUrl, string queryString)
7980
{
8081
TestServer server = TestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions()
@@ -85,15 +86,15 @@ public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, str
8586
HttpResponseMessage response = await server.CreateRequest(requestUrl + queryString).GetAsync();
8687

8788
Assert.Equal(HttpStatusCode.Moved, response.StatusCode);
88-
Assert.Equal(requestUrl + "/" + queryString, response.Headers.Location.ToString());
89+
Assert.Equal(requestUrl + "/" + queryString, response.Headers.GetValues("Location").FirstOrDefault());
8990
Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
9091
}
9192

9293
[Theory]
93-
[InlineData("/SubFolder", @".\", "/SubFolder/")]
94+
[InlineData("/SubFolder", @"./", "/SubFolder/")]
9495
[InlineData("/SubFolder", @".", "/somedir/")]
95-
[InlineData("", @".\SubFolder", "/")]
96-
[InlineData("", @".\SubFolder\", "/")]
96+
[InlineData("", @"./SubFolder", "/")]
97+
[InlineData("", @"./SubFolder/", "/")]
9798
public async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, string requestUrl)
9899
{
99100
TestServer server = TestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions()

‎test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System;
55
using System.IO;
6+
using System.Linq;
67
using System.Net;
78
using System.Net.Http;
89
using System.Threading.Tasks;
@@ -43,7 +44,7 @@ public async Task NullArguments()
4344
[InlineData("", @".", "/missing.dir/")]
4445
[InlineData("/subdir", @".", "/subdir/missing.dir")]
4546
[InlineData("/subdir", @".", "/subdir/missing.dir/")]
46-
[InlineData("", @".\", "/missing.dir")]
47+
[InlineData("", @"./", "/missing.dir")]
4748
public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string requestUrl)
4849
{
4950
TestServer server = TestServer.Create(
@@ -61,8 +62,8 @@ public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string r
6162
[InlineData("", @".", "/")]
6263
[InlineData("", @".", "/SubFolder/")]
6364
[InlineData("/somedir", @".", "/somedir/")]
64-
[InlineData("/somedir", @".\", "/somedir/")]
65-
[InlineData("/somedir", @".", "/somedir/subfolder/")]
65+
[InlineData("/somedir", @"./", "/somedir/")]
66+
[InlineData("/somedir", @".", "/somedir/SubFolder/")]
6667
public async Task FoundDirectory_Served(string baseUrl, string baseDir, string requestUrl)
6768
{
6869
TestServer server = TestServer.Create(
@@ -83,10 +84,10 @@ public async Task FoundDirectory_Served(string baseUrl, string baseDir, string r
8384
[Theory]
8485
[InlineData("", @".", "/SubFolder", "")]
8586
[InlineData("/somedir", @".", "/somedir", "")]
86-
[InlineData("/somedir", @".", "/somedir/subfolder", "")]
87+
[InlineData("/somedir", @".", "/somedir/SubFolder", "")]
8788
[InlineData("", @".", "/SubFolder", "?a=b")]
8889
[InlineData("/somedir", @".", "/somedir", "?a=b")]
89-
[InlineData("/somedir", @".", "/somedir/subfolder", "?a=b")]
90+
[InlineData("/somedir", @".", "/somedir/SubFolder", "?a=b")]
9091
public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, string requestUrl, string queryString)
9192
{
9293
TestServer server = TestServer.Create(
@@ -100,15 +101,15 @@ public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, str
100101
HttpResponseMessage response = await server.CreateRequest(requestUrl + queryString).GetAsync();
101102

102103
Assert.Equal(HttpStatusCode.Moved, response.StatusCode);
103-
Assert.Equal(requestUrl + "/" + queryString, response.Headers.Location.ToString());
104+
Assert.Equal(requestUrl + "/" + queryString, response.Headers.GetValues("Location").FirstOrDefault());
104105
Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
105106
}
106107

107108
[Theory]
108109
[InlineData("", @".", "/")]
109110
[InlineData("", @".", "/SubFolder/")]
110111
[InlineData("/somedir", @".", "/somedir/")]
111-
[InlineData("/somedir", @".", "/somedir/subfolder/")]
112+
[InlineData("/somedir", @".", "/somedir/SubFolder/")]
112113
public async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, string requestUrl)
113114
{
114115
TestServer server = TestServer.Create(
@@ -127,7 +128,7 @@ public async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, st
127128
[InlineData("", @".", "/")]
128129
[InlineData("", @".", "/SubFolder/")]
129130
[InlineData("/somedir", @".", "/somedir/")]
130-
[InlineData("/somedir", @".", "/somedir/subfolder/")]
131+
[InlineData("/somedir", @".", "/somedir/SubFolder/")]
131132
public async Task HeadDirectory_HeadersButNotBodyServed(string baseUrl, string baseDir, string requestUrl)
132133
{
133134
TestServer server = TestServer.Create(

0 commit comments

Comments
 (0)