From 3ec400ee23643e004e24db0cd1135d2f7b4da90d Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 20 Jul 2016 20:05:56 -0700 Subject: [PATCH] Revert prior workaround, explicitly create DB in dependent tests --- SlicerConfiguration/Settings/ProfileManager.cs | 3 +-- Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs | 3 +++ Tests/MatterControl.Tests/MatterControl/LevelingTests.cs | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/SlicerConfiguration/Settings/ProfileManager.cs b/SlicerConfiguration/Settings/ProfileManager.cs index a6449bc9a..f6bf5cf0c 100644 --- a/SlicerConfiguration/Settings/ProfileManager.cs +++ b/SlicerConfiguration/Settings/ProfileManager.cs @@ -79,8 +79,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { get { - // Possible workaround for test environment - prevents initializing UserSettings.Instance if no DB exists - string username = File.Exists(ApplicationDataStorage.ApplicationUserDataPath) ? UserSettings.Instance.get("ActiveUserName") : null; + string username = UserSettings.Instance.get("ActiveUserName"); return string.IsNullOrEmpty(username) ? GuestDBPath : Path.Combine(ProfilesPath, $"{username}{userDBExtension}"); } } diff --git a/Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs b/Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs index 2250c295e..bc769f122 100644 --- a/Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs @@ -11,6 +11,7 @@ using System.Globalization; using MatterHackers.MatterControl.SlicerConfiguration; using System.Collections.ObjectModel; using MatterHackers.Agg.PlatformAbstract; +using MatterHackers.MatterControl.Tests.Automation; namespace MatterControl.Tests.MatterControl { @@ -23,6 +24,8 @@ namespace MatterControl.Tests.MatterControl static ConfigIniTests() { + MatterControlUtilities.OverrideAppDataLocation(); + StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine(matterControlDirectory, "StaticData")); allPrinters = (from printerFile in new DirectoryInfo(printerSettingsDirectory).GetFiles("*.printer", SearchOption.AllDirectories) diff --git a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs index 2c1dab55e..be95903e7 100644 --- a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs @@ -43,6 +43,11 @@ namespace MatterControl.Tests.MatterControl [TestFixture] public class LevelingTests { + static LevelingTests() + { + MatterControlUtilities.OverrideAppDataLocation(); + } + [Test, Category("Leveling")] public void Leveling7PointsNeverGetsTooHigh() {