explicit expect message

Author: dgozman

src/Playwright.Tests/Assertions/LocatorAssertionsTests.cs

@@ -438,7 +438,7 @@ public async Task ShouldSupportToContainText()
             var exeption = await PlaywrightAssert.ThrowsAsync<PlaywrightException>(() => Expect(Page.Locator("#node")).ToContainTextAsync(new Regex("ex2"), new() { Timeout = 100 }));
             StringAssert.Contains("Locator expected text matching regex 'ex2'", exeption.Message);
             StringAssert.Contains("But was: 'Text content'", exeption.Message);
-            StringAssert.Contains("Expect \"ToHaveTextAsync\" with timeout 100ms", exeption.Message);
+            StringAssert.Contains("Expect \"ToContainTextAsync\" with timeout 100ms", exeption.Message);
         }
         {
             await Page.SetContentAsync("<div id=node><span></span>Text \ncontent&nbsp;    </div>");

src/Playwright/Core/AssertionsBase.cs

@@ -52,20 +52,20 @@ public AssertionsBase(ILocator actual, bool isNot)
 
     protected Locator ActualLocator { get; }
 
-    protected async Task ExpectImplAsync(string expression, ExpectedTextValue textValue, object expected, string message, FrameExpectOptions options)
+    protected async Task ExpectImplAsync(string expression, ExpectedTextValue textValue, object expected, string message, string title, FrameExpectOptions options)
     {
-        await ExpectImplAsync(expression, new ExpectedTextValue[] { textValue }, expected, message, options).ConfigureAwait(false);
+        await ExpectImplAsync(expression, new ExpectedTextValue[] { textValue }, expected, message, title, options).ConfigureAwait(false);
     }
 
-    protected async Task ExpectImplAsync(string expression, ExpectedTextValue[]? expectedText, object? expected, string message, FrameExpectOptions options)
+    protected async Task ExpectImplAsync(string expression, ExpectedTextValue[]? expectedText, object? expected, string message, string title, FrameExpectOptions options)
     {
         options ??= new();
         options.ExpectedText = expectedText;
         options.IsNot = IsNot;
-        await ExpectImplAsync(expression, options, expected, message).ConfigureAwait(false);
+        await ExpectImplAsync(expression, options, expected, message, title).ConfigureAwait(false);
     }
 
-    protected async Task ExpectImplAsync(string expression, FrameExpectOptions expectOptions, object? expected, string message)
+    protected async Task ExpectImplAsync(string expression, FrameExpectOptions expectOptions, object? expected, string message, string title)
     {
         if (expectOptions.Timeout == null)
         {
@@ -75,7 +75,7 @@ protected async Task ExpectImplAsync(string expression, FrameExpectOptions expec
         {
             message = message.Replace("expected to", "expected not to");
         }
-        var result = await ActualLocator.ExpectAsync(expression, expectOptions, ExpectExpressionToTitle(expression)).ConfigureAwait(false);
+        var result = await ActualLocator.ExpectAsync(expression, expectOptions, title).ConfigureAwait(false);
         if (result.Matches == IsNot)
         {
             var actual = result.Received;
@@ -123,48 +123,6 @@ private string FormatValue(object value)
         return value.ToString();
     }
 
-    private string? ExpectExpressionToTitle(string expression)
-    {
-        switch (expression)
-        {
-            case "to.be.attached": return "Expect \"ToBeAttachedAsync\"";
-            case "to.be.checked": return "Expect \"ToBeCheckedAsync\"";
-            case "to.be.detached": return "Expect \"ToBeDetachedAsync\"";
-            case "to.be.disabled": return "Expect \"ToBeDisabledAsync\"";
-            case "to.be.editable": return "Expect \"ToBeEditableAsync\"";
-            case "to.be.empty": return "Expect \"ToBeEmptyAsync\"";
-            case "to.be.enabled": return "Expect \"ToBeEnabledAsync\"";
-            case "to.be.focused": return "Expect \"ToBeFocusedAsync\"";
-            case "to.be.hidden": return "Expect \"ToBeHiddenAsync\"";
-            case "to.be.in.viewport": return "Expect \"ToBeInViewportAsync\"";
-            case "to.be.readonly": return "Expect \"ToBeReadonlyAsync\"";
-            case "to.be.visible": return "Expect \"ToBeVisibleAsync\"";
-            case "to.contain.class": return "Expect \"ToContainClassAsync\"";
-            case "to.contain.class.array": return "Expect \"ToHaveClassAsync\"";
-            case "to.contain.text": return "Expect \"ToContainTextAsync\"";
-            case "to.contain.text.array": return "Expect \"ToContainTextAsync\"";
-            case "to.have.accessible.description": return "Expect \"ToHaveAccessibleDescriptionAsync\"";
-            case "to.have.accessible.error.message": return "Expect \"ToHaveAccessibleErrorMessageAsync\"";
-            case "to.have.accessible.name": return "Expect \"ToHaveAccessibleNameAsync\"";
-            case "to.have.attribute.value": return "Expect \"ToHaveAttributeValueAsync\"";
-            case "to.have.css": return "Expect \"ToHaveCSSAsync\"";
-            case "to.have.class": return "Expect \"ToHaveClassAsync\"";
-            case "to.have.class.array": return "Expect \"ToHaveClassAsync\"";
-            case "to.have.count": return "Expect \"ToHaveCountAsync\"";
-            case "to.have.id": return "Expect \"ToHaveIdAsync\"";
-            case "to.have.property": return "Expect \"ToHaveJSPropertyAsync\"";
-            case "to.have.role": return "Expect \"ToHaveRoleAsync\"";
-            case "to.have.text": return "Expect \"ToHaveTextAsync\"";
-            case "to.have.text.array": return "Expect \"ToHaveTextAsync\"";
-            case "to.have.title": return "Expect \"ToHaveTitleAsync\"";
-            case "to.have.url": return "Expect \"ToHaveURLAsync\"";
-            case "to.have.value": return "Expect \"ToHaveValueAsync\"";
-            case "to.have.values": return "Expect \"ToHaveValuesAsync\"";
-            case "to.match.aria": return "Expect \"ToMatchAriaSnapshotAsync\"";
-        }
-        throw new PlaywrightException($"Unknown expect expression: {expression}");
-    }
-
     public static void SetDefaultTimeout(float timeout)
         => _defaultTimeout = timeout;
 }