nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert prior workaround, explicitly create DB in dependent tests

Browse source
This commit is contained in:
John Lewin 2016-07-20 20:05:56 -07:00
parent 7872f70299
commit 3ec400ee23
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -79,8 +79,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{ {
get get
{ {
// Possible workaround for test environment - prevents initializing UserSettings.Instance if no DB exists string username = UserSettings.Instance.get("ActiveUserName");
string username = File.Exists(ApplicationDataStorage.ApplicationUserDataPath) ? UserSettings.Instance.get("ActiveUserName") : null;
return string.IsNullOrEmpty(username) ? GuestDBPath : Path.Combine(ProfilesPath, $"{username}{userDBExtension}"); return string.IsNullOrEmpty(username) ? GuestDBPath : Path.Combine(ProfilesPath, $"{username}{userDBExtension}");
} }
} }

3
Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs
View file

@ -11,6 +11,7 @@ using System.Globalization;
using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.MatterControl.SlicerConfiguration;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using MatterHackers.Agg.PlatformAbstract; using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.MatterControl.Tests.Automation;
namespace MatterControl.Tests.MatterControl namespace MatterControl.Tests.MatterControl
{ {
@ -23,6 +24,8 @@ namespace MatterControl.Tests.MatterControl
static ConfigIniTests() static ConfigIniTests()
{ {
MatterControlUtilities.OverrideAppDataLocation();
StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine(matterControlDirectory, "StaticData")); StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine(matterControlDirectory, "StaticData"));
allPrinters = (from printerFile in new DirectoryInfo(printerSettingsDirectory).GetFiles("*.printer", SearchOption.AllDirectories) allPrinters = (from printerFile in new DirectoryInfo(printerSettingsDirectory).GetFiles("*.printer", SearchOption.AllDirectories)

5
Tests/MatterControl.Tests/MatterControl/LevelingTests.cs
View file

@ -43,6 +43,11 @@ namespace MatterControl.Tests.MatterControl
[TestFixture] [TestFixture]
public class LevelingTests public class LevelingTests
{ {
static LevelingTests()
{
MatterControlUtilities.OverrideAppDataLocation();
}
[Test, Category("Leveling")] [Test, Category("Leveling")]
public void Leveling7PointsNeverGetsTooHigh() public void Leveling7PointsNeverGetsTooHigh()
{ {