Skip to content

Commit 5fe0f1b

Browse files
fix tests
1 parent 0b1166d commit 5fe0f1b

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.Group).Filter(new() { HasText = "Test" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"Test 123\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
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/Smartphone/BasicTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.Group).Filter(new() { HasText = "Test" })).ToMatchAriaSnapshotAsync("- group:\r\n - checkbox\r\n - heading \"Test 123\" [level=6]\r\n - button \"Upload file\"\r\n - button \"Rename file\"\r\n - button \"Clear file\"");
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.Tests/Services/AudioCuesheet/AudiofileManagerTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public async Task SetPropertiesAsync_WithBrowserFile_ShouldSetPropertiesAsync()
122122
browserFile.SetupGet(b => b.Name).Returns(filename);
123123

124124
var codec = Audiofile.AudioCodecs.First(x => x.FileExtension == ".mp3");
125-
_fileInputManager.Setup(f => f.GetAudioCodec("audio/mpeg", filename)).Returns(codec);
125+
_fileInputManager.Setup(f => f.GetAudioCodec(filename, "audio/mpeg")).Returns(codec);
126126
_fileInputManager.Setup(f => f.GetObjectUrlAsync(inputId)).ReturnsAsync(objectUrl);
127127
_jsRuntime.Setup(js => js.InvokeAsync<double>("getAudioDurationFromFile", It.IsAny<object?[]>())).Returns(new ValueTask<double>(90.0));
128128

@@ -145,7 +145,7 @@ public async Task SetPropertiesAsync_WithBrowserFile_ShouldSetPropertiesAsync()
145145
Assert.AreEqual(objectUrl, audiofile.ObjectURL);
146146
Assert.AreEqual(TimeSpan.FromSeconds(90), audiofile.Duration);
147147
Assert.AreEqual(1, audiofileChangedFired);
148-
_fileInputManager.Verify(f => f.GetAudioCodec("audio/mpeg", filename), Times.Once);
148+
_fileInputManager.Verify(f => f.GetAudioCodec(filename, "audio/mpeg"), Times.Once);
149149
_fileInputManager.Verify(f => f.GetObjectUrlAsync(inputId), Times.Once);
150150
_jsRuntime.Verify(js => js.InvokeAsync<double>("getAudioDurationFromFile", It.Is<object?[]>(o => o[0] as string == audiofile.ObjectURL)), Times.Once);
151151
}
@@ -162,7 +162,7 @@ public async Task SetProperty_AudiofileWithDuration_SetsLastTrackEndAlsoAsync()
162162
browserFile.SetupGet(b => b.Name).Returns(filename);
163163

164164
var codec = Audiofile.AudioCodecs.First(x => x.FileExtension == ".mp3");
165-
_fileInputManager.Setup(f => f.GetAudioCodec("audio/mpeg", filename)).Returns(codec);
165+
_fileInputManager.Setup(f => f.GetAudioCodec(filename, "audio/mpeg")).Returns(codec);
166166
_fileInputManager.Setup(f => f.GetObjectUrlAsync(inputId)).ReturnsAsync(objectUrl);
167167
_jsRuntime.Setup(js => js.InvokeAsync<double>("getAudioDurationFromFile", It.IsAny<object?[]>())).Returns(new ValueTask<double>(90.0));
168168
var track1 = new Track()
@@ -198,7 +198,7 @@ public async Task SetProperty_AudiofileWithDuration_SetsLastTrackEndAlsoAsync()
198198
Assert.AreEqual(TimeSpan.FromSeconds(90), audiofile.Duration);
199199
Assert.AreEqual(TimeSpan.FromSeconds(90), track2.End);
200200
Assert.AreEqual(1, audiofileChangedFired);
201-
_fileInputManager.Verify(f => f.GetAudioCodec("audio/mpeg", filename), Times.Once);
201+
_fileInputManager.Verify(f => f.GetAudioCodec(filename, "audio/mpeg"), Times.Once);
202202
_fileInputManager.Verify(f => f.GetObjectUrlAsync(inputId), Times.Once);
203203
_jsRuntime.Verify(js => js.InvokeAsync<double>("getAudioDurationFromFile", It.Is<object?[]>(o => o[0] as string == audiofile.ObjectURL)), Times.Once);
204204
}
@@ -215,7 +215,7 @@ public async Task SetPropertiesAsync_PreviouslySetAudiofile_ShouldClearFirstAndS
215215
browserFile.SetupGet(b => b.Name).Returns(filename);
216216

217217
var codec = Audiofile.AudioCodecs.First(x => x.FileExtension == ".mp3");
218-
_fileInputManager.Setup(f => f.GetAudioCodec("audio/mpeg", filename)).Returns(codec);
218+
_fileInputManager.Setup(f => f.GetAudioCodec(filename, "audio/mpeg")).Returns(codec);
219219
_fileInputManager.Setup(f => f.GetObjectUrlAsync(inputId)).ReturnsAsync(objectUrl);
220220
_jsRuntime.Setup(js => js.InvokeAsync<double>("getAudioDurationFromFile", It.IsAny<object?[]>())).Returns(new ValueTask<double>(90.0));
221221

@@ -240,7 +240,7 @@ public async Task SetPropertiesAsync_PreviouslySetAudiofile_ShouldClearFirstAndS
240240
Assert.AreEqual(objectUrl, audiofile.ObjectURL);
241241
Assert.AreEqual(TimeSpan.FromSeconds(90), audiofile.Duration);
242242
Assert.AreEqual(1, audiofileChangedFired);
243-
_fileInputManager.Verify(f => f.GetAudioCodec("audio/mpeg", filename), Times.Once);
243+
_fileInputManager.Verify(f => f.GetAudioCodec(filename, "audio/mpeg"), Times.Once);
244244
_fileInputManager.Verify(f => f.GetObjectUrlAsync(inputId), Times.Once);
245245
_jsRuntime.Verify(js => js.InvokeAsync<double>("getAudioDurationFromFile", It.Is<object?[]>(o => o[0] as string == audiofile.ObjectURL)), Times.Once);
246246
_traceChangeManager.VerifySet(t => t.BulkEdit = true, Times.Once);

‎AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ public async Task UploadFilesAsync_WithAudiofile_ImportsCorrectly()
368368
_fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
369369
_fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
370370
_fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
371-
_fileInputManagerMock.Setup(f => f.IsValidAudiofile(file.ContentType, file.Name)).Returns(true);
371+
_fileInputManagerMock.Setup(f => f.IsValidAudiofile(file.Name, file.ContentType)).Returns(true);
372372
_fileInputManagerMock.Setup(f => f.CreateAudiofileAsync(It.IsAny<FileUpload>())).ReturnsAsync(new Audiofile() { Name = file.Name });
373373

374374
IImportfile? sessionStateContainerImportfile = null;

‎AudioCuesheetEditor/Services/AudioCuesheet/AudiofileManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public async Task SetPropertiesAsync(Audiofile audiofile, IBrowserFile browserFi
4343
{
4444
await ClearPropertiesAsync(audiofile, false);
4545
}
46-
var codec = _fileInputManager.GetAudioCodec(browserFile.ContentType, browserFile.Name);
46+
var codec = _fileInputManager.GetAudioCodec(browserFile.Name, browserFile.ContentType);
4747
var objectUrl = await _fileInputManager.GetObjectUrlAsync(fileInputId);
4848
TimeSpan? duration = null;
4949
if (String.IsNullOrEmpty(objectUrl) == false)

‎AudioCuesheetEditor/Services/IO/FileInputManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public bool CheckFileMimeType(string? fileContentType, string fileName, string m
9393
if (fileUpload.ObjectUrl != null)
9494
{
9595
// Check file mime type
96-
var codec = GetAudioCodec(fileUpload.ContentType, fileUpload.Name);
96+
var codec = GetAudioCodec(fileUpload.Name, fileUpload.ContentType);
9797
if (codec != null)
9898
{
9999
TimeSpan? duration = null;

‎AudioCuesheetEditor/Services/IO/ImportManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public async Task UploadFilesAsync(IEnumerable<FileUpload> files)
132132
if (_fileInputManager.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, [FileExtensions.Projectfile])
133133
|| _fileInputManager.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, [FileExtensions.Cuesheet])
134134
|| _fileInputManager.IsValidForImportView(file.ContentType, file.Name)
135-
|| _fileInputManager.IsValidAudiofile(file.ContentType, file.Name))
135+
|| _fileInputManager.IsValidAudiofile(file.Name, file.ContentType))
136136
{
137137
if (_fileInputManager.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, [FileExtensions.Projectfile]))
138138
{
@@ -161,7 +161,7 @@ public async Task UploadFilesAsync(IEnumerable<FileUpload> files)
161161
FileType = ImportFileType.Textfile
162162
};
163163
}
164-
if (_fileInputManager.IsValidAudiofile(file.ContentType, file.Name))
164+
if (_fileInputManager.IsValidAudiofile(file.Name, file.ContentType))
165165
{
166166
var audioFile = await _fileInputManager.CreateAudiofileAsync(file);
167167
if (audioFile != null)

0 commit comments

Comments
 (0)