fixing tests
This commit is contained in:
parent
261376bef2
commit
d2b6d0c4ae
4 changed files with 7 additions and 7 deletions
|
|
@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.Library
|
|||
{
|
||||
get
|
||||
{
|
||||
return System.IO.Path.GetFileNameWithoutExtension(this.FilePath);
|
||||
return Path.GetFileName(this.FilePath);
|
||||
}
|
||||
|
||||
set
|
||||
|
|
|
|||
|
|
@ -538,6 +538,8 @@ namespace MatterHackers.MatterControl.CustomWidgets
|
|||
var partTab = mainViewWidget.CreatePartTab(workspace, true);
|
||||
mainViewWidget.TabControl.ActiveTab = partTab;
|
||||
|
||||
mainViewWidget.HookupNameChangeCallback(partTab, workspace);
|
||||
|
||||
// Load content after UI widgets to support progress notification during acquire/load
|
||||
await workspace.SceneContext.LoadContent(
|
||||
new EditContext()
|
||||
|
|
@ -545,8 +547,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
|
|||
ContentStore = writableContainer,
|
||||
SourceItem = firstItem
|
||||
});
|
||||
|
||||
mainViewWidget.HookupNameChangeCallback(partTab, workspace);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
}
|
||||
}
|
||||
|
||||
public async void MoveTabRight(ITab tab)
|
||||
public void MoveTabRight(ITab tab)
|
||||
{
|
||||
var index = AllTabs.IndexOf(tab);
|
||||
var tabWidget = tab as GuiWidget;
|
||||
|
|
@ -328,7 +328,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
}
|
||||
}
|
||||
|
||||
public async void MoveTabLeft(ITab tab)
|
||||
public void MoveTabLeft(ITab tab)
|
||||
{
|
||||
var index = AllTabs.IndexOf(tab);
|
||||
var tabWidget = tab as GuiWidget;
|
||||
|
|
|
|||
|
|
@ -444,8 +444,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
|
|||
|
||||
testRunner.WaitFor(() => scene.Children.Count == 1);
|
||||
Assert.AreEqual(1, scene.Children.Count, "Should have a Phil on the bed");
|
||||
testRunner.WaitFor(() => scene.Children.First().Name == "Phil A Ment");
|
||||
Assert.AreEqual("Phil A Ment", scene.Children.First().Name);
|
||||
testRunner.WaitFor(() => scene.Children.First().Name == "Phil A Ment.stl");
|
||||
Assert.AreEqual("Phil A Ment.stl", scene.Children.First().Name);
|
||||
|
||||
testRunner.Type("^a"); // clear the selection (type a space)
|
||||
testRunner.WaitFor(() => scene.SelectedItem != null);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue