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

Merge pull request #1498 from jlewin/1.6.0

Browse source 
Explicitly set working directory for automation tests
This commit is contained in:
Lars Brubaker 2016-10-17 11:41:30 -07:00 • committed by GitHub
commit 2eb2bc7c8c
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -242,7 +242,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(.2); testRunner.Wait(.2);
testRunner.Type(make); testRunner.Type(make);
testRunner.ClickByName(manufacturer, 2); testRunner.Type("{Enter}");
testRunner.ClickByName("Select Model", 2); testRunner.ClickByName("Select Model", 2);
@ -354,12 +354,24 @@ namespace MatterHackers.MatterControl.Tests.Automation
QueueTemplate queueItemFolderToAdd = QueueTemplate.None, QueueTemplate queueItemFolderToAdd = QueueTemplate.None,
int overrideWidth = -1, int overrideHeight = -1) int overrideWidth = -1, int overrideHeight = -1)
{ {
// Walk back a step in the stack and output the callers name
StackTrace st = new StackTrace(false);
Debug.WriteLine("\r\n ***** Running automation test: {0} {1} ", st.GetFrames().Skip(1).First().GetMethod().Name, DateTime.Now);
if (staticDataPathOverride == null) if (staticDataPathOverride == null)
{ {
// Popping one directory above MatterControl, then back down into MatterControl ensures this works in MCCentral as well and MatterControl // Popping one directory above MatterControl, then back down into MatterControl ensures this works in MCCentral as well and MatterControl
staticDataPathOverride = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "StaticData"); staticDataPathOverride = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "StaticData");
} }
#if DEBUG
string outputDirectory = "Debug";
#else
string outputDirectory = "Release";
#endif
Environment.CurrentDirectory = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "bin", outputDirectory);
#if !__ANDROID__ #if !__ANDROID__
// Set the static data to point to the directory of MatterControl // Set the static data to point to the directory of MatterControl
StaticData.Instance = new FileSystemStaticData(staticDataPathOverride); StaticData.Instance = new FileSystemStaticData(staticDataPathOverride);