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

Making static data compile time and universal

Browse source
This commit is contained in:
LarsBrubaker 2020-11-25 07:39:36 -08:00
parent 0fd5b7a0f9
commit 506f2b273f
141 changed files with 13671 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tests/MatterControl.AutomationTests/LibraryContainerTests.cs
View file

@ -50,7 +50,7 @@ namespace MatterControl.Tests.MatterControl
[Test]
public Task TestExistsForEachContainerType()
{
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData"));
StaticData.RootPath = TestContext.CurrentContext.ResolveProjectPath(4, "StaticData");
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
// Find all test methods on this test class
@ -72,7 +72,7 @@ namespace MatterControl.Tests.MatterControl
[Test]
public async Task NoContentChangedOnLoad()
{
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData"));
StaticData.RootPath = TestContext.CurrentContext.ResolveProjectPath(4, "StaticData");
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
bool onIdlePumpActive = true;
@ -136,7 +136,7 @@ namespace MatterControl.Tests.MatterControl
[Test]
public async Task AddFiresContentChangedEvent()
{
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData"));
StaticData.RootPath = TestContext.CurrentContext.ResolveProjectPath(4, "StaticData");
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
string filePath = TestContext.CurrentContext.ResolveProjectPath(4, "Tests", "TestData", "TestParts", "Batman.stl");

4
Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
View file

@ -378,7 +378,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
[Test]
public void SliceSettingsOrganizerSupportsKeyLookup()
{
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "StaticData"));
StaticData.RootPath = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "StaticData");
var organizer = PrinterSettings.Layout;
@ -629,7 +629,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
[Test]
public void CopyFromTest()
{
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData"));
StaticData.RootPath = TestContext.CurrentContext.ResolveProjectPath(4, "StaticData");
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
var settings = new PrinterSettings();