Update E2E tests

Author: SteveSandersonMS

src/Components/Web/src/Forms/InputFile/BrowserFile.cs

@@ -41,7 +41,7 @@ public Stream OpenReadStream(long maxAllowedSize = 512000, CancellationToken can
         {
             if (Size > maxAllowedSize)
             {
-                throw new IOException($"File size '{Size} is large than the maximum allowed size '{maxAllowedSize}'.");
+                throw new IOException($"Supplied file with size {Size} bytes exceeds the maximum of {maxAllowedSize} bytes.");
             }
 
             return Owner.OpenReadStream(this, cancellationToken);

src/Components/test/E2ETest/ServerExecutionTests/TestSubclasses.cs

@@ -75,4 +75,12 @@ public ServerKeyTest(BrowserFixture browserFixture, ToggleExecutionModeServerFix
         {
         }
     }
+
+    public class ServerInputFileTest : InputFileTest
+    {
+        public ServerInputFileTest(BrowserFixture browserFixture, ToggleExecutionModeServerFixture<Program> serverFixture, ITestOutputHelper output)
+            : base(browserFixture, serverFixture.WithServerExecution(), output)
+        {
+        }
+    }
 }

src/Components/test/E2ETest/Tests/InputFileTest.cs

@@ -16,7 +16,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.AspNetCore.Components.E2ETests.Tests
+namespace Microsoft.AspNetCore.Components.E2ETest.Tests
 {
     public class InputFileTest : ServerTestBase<ToggleExecutionModeServerFixture<Program>>, IDisposable
     {
@@ -157,7 +157,7 @@ public void ThrowsWhenTooManyFilesAreSelected()
 
             // Validate that the proper exception is thrown
             var exceptionMessage = Browser.FindElement(By.Id("exception-message"));
-            Browser.Equal("Expected a maximum of 1 files, but got 2.", () => exceptionMessage.Text);
+            Browser.Equal("The maximum number of files accepted is 1, but 2 were supplied.", () => exceptionMessage.Text);
         }
 
         [Fact]
@@ -176,7 +176,7 @@ public void ThrowsWhenOversizedFileIsSelected()
 
             // Validate that the proper exception is thrown
             var exceptionMessage = Browser.FindElement(By.Id("exception-message"));
-            Browser.Equal("File with size 32 bytes exceeded the maximum of 10 bytes.", () => exceptionMessage.Text);
+            Browser.Equal("Supplied file with size 32 bytes exceeds the maximum of 10 bytes.", () => exceptionMessage.Text);
         }
 
         public void Dispose()

src/Components/test/testassets/BasicTestApp/FormsTest/InputFileComponent.razor

@@ -1,21 +1,27 @@
 @using System.IO;
-@using Microsoft.AspNetCore.Components.Forms 
+@using Microsoft.AspNetCore.Components.Forms
 
 <h1>File preview</h1>
 
-Max file size:<br />
-<input type="number" id="max-file-size" @bind-value="@maxFileSize" /><br />
+Max file size:
+<br />
+<input type="number" id="max-file-size" @bind-value="@maxFileSize" />
+<br />
 
-Max allowed files:<br />
-<input type="number" id="max-allowed-files" @bind-value="@maxAllowedFiles" /><br />
+Max allowed files:
+<br />
+<input type="number" id="max-allowed-files" @bind-value="@maxAllowedFiles" />
+<br />
 
-<InputFile OnChange="LoadFiles" MaxFileSize="maxFileSize" MaxAllowedFiles="maxAllowedFiles" id="input-file" multiple /><br />
+<InputFile OnChange="LoadFiles" id="input-file" multiple />
+<br />
 
 <span id="exception-message">@exceptionMessage</span>
 
 @if (isLoading)
 {
-    <p>Loading...</p><br />
+    <p>Loading...</p>
+    <br />
 }
 
 @foreach (var (file, content) in loadedFiles)
@@ -29,7 +35,8 @@ Max allowed files:<br />
 
 <h1>Image upload</h1>
 
-<InputFile OnChange="LoadImage" id="input-image" /><br />
+<InputFile OnChange="LoadImage" id="input-image" />
+<br />
 
 @if (imageDataUri != null)
 {
@@ -64,16 +71,16 @@ Max allowed files:<br />
 
         try
         {
-            foreach (var file in e.Files)
+            foreach (var file in e.GetMultipleFiles(maxAllowedFiles))
             {
                 StateHasChanged();
 
-                using var reader = new StreamReader(file.OpenReadStream());
+                using var reader = new StreamReader(file.OpenReadStream(maxFileSize));
 
                 loadedFiles.Add(file, await reader.ReadToEndAsync());
             }
         }
-        catch (InvalidOperationException ex)
+        catch (Exception ex)
         {
             exceptionMessage = ex.Message;
         }
@@ -83,19 +90,13 @@ Max allowed files:<br />
 
     async Task LoadImage(InputFileChangeEventArgs e)
     {
-        var file = e.Files.SingleOrDefault();
+        var format = "image/jpeg";
+        var imageFile = await e.File.RequestImageFileAsync(format, 640, 480);
 
-        if (file != null)
-        {
-            var format = "image/jpeg";
-            var imageFile = await file.RequestImageFileAsync(format, 640, 480);
-
-            using var fileStream = imageFile.OpenReadStream();
-            using var memoryStream = new MemoryStream();
-            await fileStream.CopyToAsync(memoryStream);
+        using var fileStream = imageFile.OpenReadStream(maxFileSize);
+        using var memoryStream = new MemoryStream();
+        await fileStream.CopyToAsync(memoryStream);
 
-            imageDataUri = $"data:{format};base64,{Convert.ToBase64String(memoryStream.ToArray())}";
-            StateHasChanged();
-        }
+        imageDataUri = $"data:{format};base64,{Convert.ToBase64String(memoryStream.ToArray())}";
     }
 }