From d2b6d0c4ae7dffe53cabfe288d875c697fc7a345 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Tue, 25 Jan 2022 17:54:22 -0800
Subject: [PATCH] fixing tests

---
 .../Library/Providers/FileSystem/FileSystemItem.cs            | 2 +-
 MatterControlLib/Library/Widgets/ListView/LibraryListView.cs  | 4 ++--
 MatterControlLib/PartPreviewWindow/Tabs.cs                    | 4 ++--
 .../MatterControl/MatterControlUtilities.cs                   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs b/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs
index 6dfce284b..a905ddb7a 100644
--- a/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs
+++ b/MatterControlLib/Library/Providers/FileSystem/FileSystemItem.cs
@@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.Library
 		{
 			get
 			{
-				return System.IO.Path.GetFileNameWithoutExtension(this.FilePath);
+				return Path.GetFileName(this.FilePath);
 			}
 
 			set
diff --git a/MatterControlLib/Library/Widgets/ListView/LibraryListView.cs b/MatterControlLib/Library/Widgets/ListView/LibraryListView.cs
index 6f51d1364..88d1eb3cf 100644
--- a/MatterControlLib/Library/Widgets/ListView/LibraryListView.cs
+++ b/MatterControlLib/Library/Widgets/ListView/LibraryListView.cs
@@ -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
 							{
diff --git a/MatterControlLib/PartPreviewWindow/Tabs.cs b/MatterControlLib/PartPreviewWindow/Tabs.cs
index b3e55d4c4..22e3ff82c 100644
--- a/MatterControlLib/PartPreviewWindow/Tabs.cs
+++ b/MatterControlLib/PartPreviewWindow/Tabs.cs
@@ -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;
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 1f22a1c07..6884b58b4 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -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);