chore(generator): Response and Request (microsoft#1270)

* chore(generator): Response and Request introducing ResourceTypes constant
hardkoded · Mar 11, 2021 · 6bd24d1 · 6bd24d1
1 parent 69ebad3
commit 6bd24d1
Show file tree

Hide file tree

Showing 36 changed files with 729 additions and 511 deletions.
diff --git a/src/PlaywrightSharp.Tests/BrowserContextBasicTests.cs b/src/PlaywrightSharp.Tests/BrowserContextBasicTests.cs
@@ -294,7 +294,7 @@ public async Task ShouldWorkWithOfflineOption()
             await Assert.ThrowsAsync<PlaywrightSharpException>(() => page.GoToAsync(TestConstants.EmptyPage));
             await context.SetOfflineAsync(false);
             var response = await page.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("browsercontext-basic.spec.ts", "should emulate navigator.onLine")]

diff --git a/src/PlaywrightSharp.Tests/BrowserContextHttpCredentialsTests.cs b/src/PlaywrightSharp.Tests/BrowserContextHttpCredentialsTests.cs
@@ -23,7 +23,7 @@ public async Task ShouldFailWithoutCredentials()
             await using var context = await Browser.NewContextAsync();
             var page = await context.NewPageAsync();
             var response = await page.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(HttpStatusCode.Unauthorized, response.Status);
+            Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
         }
 
         [PlaywrightTest("browsercontext-credentials.spec.ts", "should work with setHTTPCredentials")]
@@ -34,14 +34,14 @@ public async Task ShouldWorkWithSetHTTPCredentials()
             await using var context = await Browser.NewContextAsync();
             var page = await context.NewPageAsync();
             var response = await page.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(HttpStatusCode.Unauthorized, response.Status);
+            Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
             await context.SetHttpCredentialsAsync(new Credentials
             {
                 Username = "user",
                 Password = "pass"
             });
             response = await page.ReloadAsync();
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("browsercontext-credentials.spec.ts", "should work with correct credentials")]
@@ -61,7 +61,7 @@ public async Task ShouldWorkWithCorrectCredentials()
 
             var page = await context.NewPageAsync();
             var response = await page.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("browsercontext-credentials.spec.ts", "should fail if wrong credentials")]
@@ -81,7 +81,7 @@ public async Task ShouldFailIfWrongCredentials()
 
             var page = await context.NewPageAsync();
             var response = await page.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(HttpStatusCode.Unauthorized, response.Status);
+            Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
         }
 
         [PlaywrightTest("browsercontext-credentials.spec.ts", "should return resource body")]
@@ -100,7 +100,7 @@ public async Task ShouldReturnResourceBody()
 
             var page = await context.NewPageAsync();
             var response = await page.GoToAsync(TestConstants.ServerUrl + "/playground.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Equal("Playground", await page.GetTitleAsync());
             Assert.Contains("Playground", await response.GetTextAsync());
         }

diff --git a/src/PlaywrightSharp.Tests/BrowserContextRouteTests.cs b/src/PlaywrightSharp.Tests/BrowserContextRouteTests.cs
@@ -3,6 +3,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using PlaywrightSharp.Contracts.Constants;
 using PlaywrightSharp.Tests.BaseTests;
 using PlaywrightSharp.Xunit;
 using Xunit;
@@ -32,11 +33,11 @@ await context.RouteAsync("**/empty.html", (route, _) =>
                 intercepted = true;
 
                 Assert.Contains("empty.html", route.Request.Url);
-                Assert.False(string.IsNullOrEmpty(route.Request.Headers["user-agent"]));
-                Assert.Equal(HttpMethod.Get, route.Request.Method);
+                Assert.False(string.IsNullOrEmpty(route.Request.GetHeaderValue("user-agent")));
+                Assert.Equal(HttpMethod.Get.Method, route.Request.Method);
                 Assert.Null(route.Request.PostData);
                 Assert.True(route.Request.IsNavigationRequest);
-                Assert.Equal(ResourceType.Document, route.Request.ResourceType);
+                Assert.Equal(ResourceTypes.Document, route.Request.ResourceType, false);
                 Assert.Same(page.MainFrame, route.Request.Frame);
                 Assert.Equal("about:blank", page.MainFrame.Url);
 

diff --git a/src/PlaywrightSharp.Tests/DefaultBrowserContext1Tests.cs b/src/PlaywrightSharp.Tests/DefaultBrowserContext1Tests.cs
@@ -265,7 +265,7 @@ public async Task ShouldRupportHttpCredentialsOption()
 
             Server.SetAuth("/playground.html", "user", "pass");
             var response = await page.GoToAsync(TestConstants.ServerUrl + "/playground.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
             tmp.Dispose();
             await context.DisposeAsync();

diff --git a/src/PlaywrightSharp.Tests/FrameGoToTests.cs b/src/PlaywrightSharp.Tests/FrameGoToTests.cs
@@ -27,7 +27,7 @@ public async Task ShouldNavigateSubFrames()
             Assert.Single(Page.Frames.Where(f => f.Url.Contains("/frames/frame.html")));
             var childFrame = Page.FirstChildFrame();
             var response = await childFrame.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Same(response.Frame, childFrame);
         }
 

diff --git a/src/PlaywrightSharp.Tests/IgnoreHttpsErrorsTests.cs b/src/PlaywrightSharp.Tests/IgnoreHttpsErrorsTests.cs
@@ -36,7 +36,7 @@ await TaskUtils.WhenAll(
                 responseTask);
 
             var response = responseTask.Result;
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("ignorehttpserrors.spec.ts", "should isolate contexts")]
@@ -49,7 +49,7 @@ public async Task ShouldIsolateContexts()
                 var page = await context.NewPageAsync();
                 var response = await page.GoToAsync(TestConstants.HttpsPrefix + "/empty.html");
 
-                Assert.Equal(HttpStatusCode.OK, response.Status);
+                Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             }
 
             await using (var context = await Browser.NewContextAsync())

diff --git a/src/PlaywrightSharp.Tests/InterceptionTests.cs b/src/PlaywrightSharp.Tests/InterceptionTests.cs
@@ -54,7 +54,7 @@ public async Task ShouldWorkWitIgnoreHTTPSErrors()
 
             await page.RouteAsync("**/*", (route, _) => route.ContinueAsync());
             var response = await page.GoToAsync(TestConstants.HttpsPrefix + "/empty.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
 

diff --git a/src/PlaywrightSharp.Tests/NetworkPostDataTests.cs b/src/PlaywrightSharp.Tests/NetworkPostDataTests.cs
@@ -47,7 +47,7 @@ public async Task ShouldReturnCorrectPostdataBufferForUtf8Body()
 
             var request = task.Result.Request;
             Assert.Equal(expectedJsonValue, request.PostData);
-            Assert.Equal(value, request.GetPostDataJson().RootElement.GetString());
+            Assert.Equal(value, request.GetPayloadAsJson().RootElement.GetString());
         }
 
         /// <playwright-file>network-post-data.spec.ts</playwright-file>
@@ -70,7 +70,7 @@ public async Task ShouldReturnPostDataWOContentType()
             Task.WaitAll(task, actualTask);
 
             var request = task.Result.Request;
-            Assert.Equal(42, request.GetPostDataJson().RootElement.GetProperty("value").GetInt32());
+            Assert.Equal(42, request.GetPayloadAsJson().RootElement.GetProperty("value").GetInt32());
         }
 
         /// <playwright-file>network-post-data.spec.ts</playwright-file>
@@ -92,7 +92,7 @@ public async Task ShouldThrowOnInvalidJSONInPostData()
             Task.WaitAll(task, actualTask);
 
             var request = task.Result.Request;
-            Assert.ThrowsAny<JsonException>(() => request.GetPostDataJson());
+            Assert.ThrowsAny<JsonException>(() => request.GetPayloadAsJson());
         }
 
         /// <playwright-file>network-post-data.spec.ts</playwright-file>
@@ -114,7 +114,7 @@ public async Task ShouldReturnPostDataForPUTRequests()
             Task.WaitAll(task, actualTask);
 
             var request = task.Result.Request;
-            Assert.Equal(42, request.GetPostDataJson().RootElement.GetProperty("value").GetInt32());
+            Assert.Equal(42, request.GetPayloadAsJson().RootElement.GetProperty("value").GetInt32());
         }
     }
 }
diff --git a/src/PlaywrightSharp.Tests/PageEventNetworkTests.cs b/src/PlaywrightSharp.Tests/PageEventNetworkTests.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using PlaywrightSharp.Contracts.Constants;
 using PlaywrightSharp.Tests.BaseTests;
 using PlaywrightSharp.TestServer;
 using PlaywrightSharp.Xunit;
@@ -27,8 +28,8 @@ public async Task PageEventsRequest()
             await Page.GoToAsync(TestConstants.EmptyPage);
             Assert.Single(requests);
             Assert.Equal(TestConstants.EmptyPage, requests[0].Url);
-            Assert.Equal(ResourceType.Document, requests[0].ResourceType);
-            Assert.Equal(HttpMethod.Get, requests[0].Method);
+            Assert.Equal(ResourceTypes.Document, requests[0].ResourceType, true);
+            Assert.Equal(HttpMethod.Get.Method, requests[0].Method);
             Assert.NotNull(await requests[0].GetResponseAsync());
             Assert.Equal(Page.MainFrame, requests[0].Frame);
             Assert.Equal(TestConstants.EmptyPage, requests[0].Frame.Url);
@@ -43,7 +44,7 @@ public async Task PageEventsResponse()
             await Page.GoToAsync(TestConstants.EmptyPage);
             Assert.Single(responses);
             Assert.Equal(TestConstants.EmptyPage, responses[0].Url);
-            Assert.Equal(HttpStatusCode.OK, responses[0].Status);
+            Assert.Equal(HttpStatusCode.OK, responses[0].StatusCode);
             Assert.True(responses[0].Ok);
             Assert.NotNull(responses[0].Request);
         }
@@ -69,7 +70,7 @@ public async Task PageEventsRequestFailed()
             Assert.Single(failedRequests);
             Assert.Contains("one-style.css", failedRequests[0].Url);
             Assert.Null(await failedRequests[0].GetResponseAsync());
-            Assert.Equal(ResourceType.StyleSheet, failedRequests[0].ResourceType);
+            Assert.Equal(ResourceTypes.Stylesheet, failedRequests[0].ResourceType, true);
 
             string error = string.Empty;
 
@@ -89,7 +90,7 @@ public async Task PageEventsRequestFinished()
             var request = response.Request;
             Assert.Equal(TestConstants.EmptyPage, request.Url);
             Assert.NotNull(await request.GetResponseAsync());
-            Assert.Equal(HttpMethod.Get, request.Method);
+            Assert.Equal(HttpMethod.Get.Method, request.Method);
             Assert.Equal(Page.MainFrame, request.Frame);
             Assert.Equal(TestConstants.EmptyPage, request.Frame.Url);
         }
@@ -102,7 +103,7 @@ public async Task ShouldFireEventsInProperOrder()
             Page.Request += (_, _) => events.Add("request");
             Page.Response += (_, _) => events.Add("response");
             var response = await Page.GoToAsync(TestConstants.EmptyPage);
-            await response.FinishedAsync();
+            await response.GetFinishedAsync();
             events.Add("requestfinished");
             Assert.Equal(new[] { "request", "response", "requestfinished" }, events);
         }
@@ -119,7 +120,7 @@ public async Task ShouldSupportRedirects()
             Server.SetRedirect("/foo.html", "/empty.html");
             const string FOO_URL = TestConstants.ServerUrl + "/foo.html";
             var response = await Page.GoToAsync(FOO_URL);
-            await response.FinishedAsync();
+            await response.GetFinishedAsync();
             Assert.Equal(new[] {
                 $"GET {FOO_URL}",
                 $"302 {FOO_URL}",

diff --git a/src/PlaywrightSharp.Tests/PageGoToTests.cs b/src/PlaywrightSharp.Tests/PageGoToTests.cs
@@ -138,7 +138,7 @@ public async Task ShouldWorkWithRedirects()
             Server.SetRedirect("/redirect/2.html", "/empty.html");
 
             var response = await Page.GoToAsync(TestConstants.ServerUrl + "/redirect/1.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             await Page.GoToAsync(TestConstants.EmptyPage);
         }
 
@@ -155,7 +155,7 @@ public async Task ShouldNavigateToAboutBlank()
         public async Task ShouldReturnResponseWhenPageChangesItsURLAfterLoad()
         {
             var response = await Page.GoToAsync(TestConstants.ServerUrl + "/historyapi.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("page-goto.spec.ts", "should work with subframes return 204")]
@@ -201,7 +201,7 @@ public async Task ShouldFailWhenServerReturns204()
         public async Task ShouldNavigateToEmptyPageWithDOMContentLoaded()
         {
             var response = await Page.GoToAsync(TestConstants.EmptyPage, LifecycleEvent.DOMContentLoaded);
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("page-goto.spec.ts", "should work when page calls history API in beforeunload")]
@@ -214,7 +214,7 @@ await Page.EvaluateAsync(@"() =>
                 window.addEventListener('beforeunload', () => history.replaceState(null, 'initial', window.location.href), false);
             }");
             var response = await Page.GoToAsync(TestConstants.ServerUrl + "/grid.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("page-goto.spec.ts", "should fail when navigating to bad url")]
@@ -420,7 +420,7 @@ public async Task ShouldFailWhenReplacedByAnotherNavigation()
         public async Task ShouldWorkWhenNavigatingToValidUrl()
         {
             var response = await Page.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("page-goto.spec.ts", "should work when navigating to data url")]
@@ -436,7 +436,7 @@ public async Task ShouldWorkWhenNavigatingToDataUrl()
         public async Task ShouldWorkWhenNavigatingTo404()
         {
             var response = await Page.GoToAsync(TestConstants.ServerUrl + "/not-found");
-            Assert.Equal(HttpStatusCode.NotFound, response.Status);
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
         }
 
         [PlaywrightTest("page-goto.spec.ts", "should return last response in redirect chain")]
@@ -448,7 +448,7 @@ public async Task ShouldReturnLastResponseInRedirectChain()
             Server.SetRedirect("/redirect/3.html", TestConstants.EmptyPage);
 
             var response = await Page.GoToAsync(TestConstants.ServerUrl + "/redirect/1.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Equal(TestConstants.EmptyPage, response.Url);
         }
 
@@ -488,7 +488,7 @@ public async Task ShouldNavigateToURLWithHashAndFireRequestsWithoutHash()
             Page.Request += (_, e) => requests.Add(e.Request);
 
             var response = await Page.GoToAsync(TestConstants.EmptyPage + "#hash");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Equal(TestConstants.EmptyPage, response.Url);
             Assert.Single(requests);
             Assert.Equal(TestConstants.EmptyPage, requests[0].Url);
@@ -499,7 +499,7 @@ public async Task ShouldNavigateToURLWithHashAndFireRequestsWithoutHash()
         public async Task ShouldWorkWithSelfRequestingPage()
         {
             var response = await Page.GoToAsync(TestConstants.ServerUrl + "/self-request.html");
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Contains("self-request.html", response.Url);
         }
 

diff --git a/src/PlaywrightSharp.Tests/PageNetworkIdleTests.cs b/src/PlaywrightSharp.Tests/PageNetworkIdleTests.cs
@@ -27,7 +27,7 @@ public PageNetworkIdleTests(ITestOutputHelper output) : base(output)
         public async Task ShouldNavigateToEmptyPageWithNetworkIdle()
         {
             var response = await Page.GoToAsync(TestConstants.EmptyPage, LifecycleEvent.Networkidle);
-            Assert.Equal(HttpStatusCode.OK, response.Status);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [PlaywrightTest("page-network-idle.spec.ts", "should wait for networkidle to succeed navigation")]
@@ -195,7 +195,7 @@ async Task RequestDelegate(HttpContext context)
             lastResponseFinished.Stop();
             if (!isSetContent)
             {
-                Assert.Equal(HttpStatusCode.OK, navigationResponse.Status);
+                Assert.Equal(HttpStatusCode.OK, navigationResponse.StatusCode);
             }
         }
     }