Skip to content

Commit d3ce652

Browse files
NeoCoderMatrix86NeoCoderMatrix86
authored
Merge pull request #608 from NeoCoderMatrix86/597-imported-cuesheet-marks-audiofile-as-error
Imported cuesheet marks audiofile as error
2 parents 52e5f39 + 5fe0f1b commit d3ce652

24 files changed

Lines changed: 323 additions & 173 deletions

File tree

‎AudioCuesheetEditor.End2EndTests/Models/DetailView.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal async Task AddAudiofileAsync()
4444

4545
internal async Task SetAudiofileInputFileAsync(int audiofileIndex, string file)
4646
{
47-
await _page.GetByRole(AriaRole.Group).Filter(new() { HasText = "AudiofileAudiofile" }).Nth(audiofileIndex).Locator("input[type=\"file\"]").SetInputFilesAsync(file);
47+
await _page.GetByRole(AriaRole.Group).Filter(new() { HasText = "No file uploaded!" }).Nth(audiofileIndex).Locator("input[type=\"file\"]").SetInputFilesAsync(file);
4848
}
4949

5050
internal async Task AddTrackAsync(int audiofileIndex)
@@ -116,8 +116,7 @@ internal async Task RenameAudiofileAsync(int audiofileIndex, string filename)
116116

117117
internal async Task OpenRenameAudiofileDialogAsync(int audiofileIndex)
118118
{
119-
await _page.GetByRole(AriaRole.Group).Filter(new() { HasText = "AudiofileAudiofile" }).Nth(audiofileIndex).GetByLabel("More").ClickAsync();
120-
await _page.GetByText("Rename file").ClickAsync();
119+
await _page.GetByRole(AriaRole.Button, new() { Name = "Rename file" }).Nth(audiofileIndex).ClickAsync();
121120
}
122121

123122
async Task EditTrackFieldAsync(int trackPosition, string dataLabel, string value)

‎AudioCuesheetEditor.End2EndTests/Tests/Desktop/BasicTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public async Task Audiofile_ShouldBeRenamed_WhenEditingFilename()
4848
await detailView.AddAudiofileAsync();
4949
await detailView.SetAudiofileInputFileAsync(0, "Kalimba.mp3");
5050
await detailView.RenameAudiofileAsync(0, "Kalimba test 123.mp3");
51-
await Expect(TestPage.GetByRole(AriaRole.Textbox, new() { Name = "Audiofile" })).ToMatchAriaSnapshotAsync("- textbox \"Audiofile\": Kalimba test 123.mp3");
51+
await Expect(TestPage.GetByRole(AriaRole.Group).Filter(new() { HasText = "Kalimba test 123.mp3" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"Kalimba test 123.mp3\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
5252
}
5353

5454
[TestMethod]
@@ -193,7 +193,7 @@ public async Task KeyboardCommands_ShouldControlDialogs_WhenUsingEnterOrEscapeAs
193193
await detailView.NewFileNameInput.FillAsync("Test 123");
194194
await TestPage.Keyboard.PressAsync("Enter");
195195
await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
196-
await Expect(TestPage.GetByRole(AriaRole.Textbox, new() { Name = "Audiofile" })).ToMatchAriaSnapshotAsync("- textbox \"Audiofile\": Test 123.mp3");
196+
await Expect(TestPage.GetByRole(AriaRole.Group).Filter(new() { HasText = "Test 123.mp3" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"Test 123.mp3\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
197197
}
198198
}
199199
}

‎AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//<http: //www.gnu.org/licenses />.
1616
using AudioCuesheetEditor.End2EndTests.Models;
1717
using Microsoft.Playwright;
18+
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
1819

1920
namespace AudioCuesheetEditor.End2EndTests.Tests.Desktop
2021
{
@@ -211,7 +212,7 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
211212
- button
212213
- rowgroup:
213214
- row");
214-
await Expect(TestPage.GetByRole(AriaRole.Textbox, new() { Name = "Audiofile" })).ToHaveValueAsync(@"c:\AudioFile.mp3");
215+
await Expect(TestPage.GetByRole(AriaRole.Group).Filter(new() { HasText = "c:\\AudioFile.mp3" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"c:\\\\AudioFile.mp3\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
215216
await importView.GotoAsync();
216217
await Expect(TestPage.GetByRole(AriaRole.Button, new() { Name = "Analyze" })).ToBeVisibleAsync();
217218
}
@@ -2431,7 +2432,7 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
24312432
- rowgroup:
24322433
- row");
24332434
await appBar.UndoAsync();
2434-
await Expect(TestPage.GetByRole(AriaRole.Paragraph).Filter(new() { HasText = "Audiofiles has invalid Count (0)!" })).ToBeVisibleAsync();
2435+
await Expect(TestPage.GetByRole(AriaRole.Tabpanel, new() { Name = "Detail view" })).ToMatchAriaSnapshotAsync("- text: Audiofiles has invalid count (0)!");
24352436
}
24362437

24372438
[TestMethod]
@@ -2626,7 +2627,7 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
26262627
- rowgroup:
26272628
- row");
26282629
await appBar.UndoAsync();
2629-
await Expect(TestPage.GetByRole(AriaRole.Paragraph).Filter(new() { HasText = "Audiofiles has invalid Count (0)!" })).ToBeVisibleAsync();
2630+
await Expect(TestPage.GetByRole(AriaRole.Tabpanel, new() { Name = "Detail view" })).ToMatchAriaSnapshotAsync("- text: Audiofiles has invalid count (0)!");
26302631
}
26312632

26322633
[TestMethod]

‎AudioCuesheetEditor.End2EndTests/Tests/Smartphone/BasicTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task Audiofile_ShouldBeRenamed_WhenEditingFilename()
5050
await detailView.AddAudiofileAsync();
5151
await detailView.SetAudiofileInputFileAsync(0, "Kalimba.mp3");
5252
await detailView.RenameAudiofileAsync(0, "Kalimba test 123.mp3");
53-
await Expect(TestPage.GetByRole(AriaRole.Textbox, new() { Name = "Audiofile" })).ToMatchAriaSnapshotAsync("- textbox \"Audiofile\": Kalimba test 123.mp3");
53+
await Expect(TestPage.GetByRole(AriaRole.Group).Filter(new() { HasText = "Kalimba test 123.mp3" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"Kalimba test 123.mp3\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
5454
}
5555

5656
[TestMethod]
@@ -192,7 +192,7 @@ public async Task KeyboardCommands_ShouldControlDialogs_WhenUsingEnterOrEscapeAs
192192
await detailView.NewFileNameInput.FillAsync("Test 123");
193193
await TestPage.Keyboard.PressAsync("Enter");
194194
await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
195-
await Expect(TestPage.GetByRole(AriaRole.Textbox, new() { Name = "Audiofile" })).ToMatchAriaSnapshotAsync("- textbox \"Audiofile\": Test 123.mp3");
195+
await Expect(TestPage.GetByRole(AriaRole.Group).Filter(new() { HasText = "Test 123.mp3" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"Test 123.mp3\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
196196
}
197197
}
198198
}

‎AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
248248
- cell ""Status"":
249249
- text: Status
250250
- button");
251-
await Expect(TestPage.GetByRole(AriaRole.Textbox, new() { Name = "Audiofile" })).ToHaveValueAsync(@"c:\AudioFile.mp3");
251+
await Expect(TestPage.GetByRole(AriaRole.Group).Filter(new() { HasText = "c:\\AudioFile.mp3" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"c:\\\\AudioFile.mp3\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
252252
await importView.GotoAsync();
253253
await Expect(TestPage.GetByRole(AriaRole.Button, new() { Name = "Analyze" })).ToBeVisibleAsync();
254254
}
@@ -2984,7 +2984,7 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
29842984
- text: Status
29852985
- button");
29862986
await appBar.UndoAsync();
2987-
await Expect(TestPage.GetByRole(AriaRole.Paragraph).Filter(new() { HasText = "Audiofiles has invalid Count (0)!" })).ToBeVisibleAsync();
2987+
await Expect(TestPage.GetByRole(AriaRole.Tabpanel, new() { Name = "Detail view" })).ToMatchAriaSnapshotAsync("- text: Audiofiles has invalid count (0)!");
29882988
}
29892989

29902990
[TestMethod]
@@ -3214,7 +3214,7 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
32143214
- text: Status
32153215
- button");
32163216
await appBar.UndoAsync();
3217-
await Expect(TestPage.GetByRole(AriaRole.Paragraph).Filter(new() { HasText = "Audiofiles has invalid Count (0)!" })).ToBeVisibleAsync();
3217+
await Expect(TestPage.GetByRole(AriaRole.Tabpanel, new() { Name = "Detail view" })).ToMatchAriaSnapshotAsync("- text: Audiofiles has invalid count (0)!");
32183218
}
32193219

32203220
[TestMethod]

0 commit comments

Comments
 (0)