Skip to content

Commit 3d9d31e

Browse files
committed
更新测试代码
1 parent 7aa70e0 commit 3d9d31e

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

DirectorPrompt.Tests/AvaloniaInteractionTests.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public void RemoteMainWindowUsesMobileLayout()
8686
var entry = new DialogEntryViewModel { Content = "Message" };
8787
viewModel.Dialog.Entries.Add(entry);
8888
var remoteWindow = new MainWindow(viewModel, false);
89+
remoteWindow.SetRemoteViewportWidth(390);
8990
var content = Assert.IsAssignableFrom<Control>(remoteWindow.Content);
9091
remoteWindow.Content = null;
9192
content.DataContext = viewModel;
@@ -201,15 +202,13 @@ public void MessageRailRendersDotItems()
201202
}
202203

203204
[AvaloniaFact]
204-
public void ImportButtonOpensItsMenu()
205+
public void ImportButtonUsesFlyout()
205206
{
206207
var window = new MainWindow();
207208
window.Show();
208209
var button = window.GetLogicalDescendants().OfType<Button>().First(control => control.Name == "ImportButton");
209210

210-
button.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
211-
212-
Assert.True(button.ContextMenu?.IsOpen);
211+
Assert.NotNull(button.Flyout);
213212

214213
window.Close();
215214
}

DirectorPrompt/Views/MainWindow.axaml.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -356,17 +356,10 @@ private void OnMoreButtonClick(object sender, RoutedEventArgs e)
356356

357357
private void OnImportButtonClick(object sender, RoutedEventArgs e)
358358
{
359-
if (isRemote)
360-
{
361-
OpenRemoteMenu((Control)sender, remoteImportMenu!);
362-
e.Handled = true;
363-
return;
364-
}
365-
366-
if (sender is not Control element)
359+
if (!isRemote || sender is not Control element)
367360
return;
368361

369-
FlyoutBase.ShowAttachedFlyout(element);
362+
OpenRemoteMenu(element, remoteImportMenu!);
370363
e.Handled = true;
371364
}
372365

0 commit comments

Comments
 (0)