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

New Queue Test Implementation

Browse source
This commit is contained in:
Gregory Diaz 2015-10-22 18:23:22 -07:00
parent 4576c78398
commit 47fc5e17fc
12 changed files with 120680 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -31,6 +31,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\Debug\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NUnit.ApplicationDomain">
<HintPath>..\..\packages\NUnit.ApplicationDomain.5.0.1\lib\net40\NUnit.ApplicationDomain.dll</HintPath>
</Reference>
@ -57,6 +61,9 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Utilities\ManifestFileHandler.cs">
<Link>ManifestFileHandler.cs</Link>
</Compile>
<Compile Include="MatterControl\AutomationTests\CheckBoxInLibraryIsClickable.cs" />
<Compile Include="MatterControl\AutomationTests\SqLiteLibraryProvider.cs" />
<Compile Include="MatterControl\LibraryProviderSqliteTests.cs" />
@ -125,6 +132,10 @@
<Project>{d3e41b4e-bfbb-44ca-94c8-95c00f754fdd}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\agg-sharp\WindowsFileDialogs\WindowsFileDialogs.csproj">
<Project>{a526dc5d-65f3-461b-805f-d3ac9665f5c9}</Project>
<Name>WindowsFileDialogs</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

160
Tests/MatterControl.Tests/MatterControl/AutomationTests/PrintQueueTests.cs
View file

@ -116,7 +116,7 @@ namespace MatterHackers.MatterControl.UI
}
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain, Ignore("Not Finished")]
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]//, Ignore("Not Finished")]
public class ExportButtonTest
{
[Test, RequiresSTA, RunInApplicationDomain]
@ -147,17 +147,17 @@ namespace MatterHackers.MatterControl.UI
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun);
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
}
}
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain, Ignore("Not Finished")]
public class ExportButtonDisabledNoQueueItems
{
[Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")]
[Test, RequiresSTA, RunInApplicationDomain]
public void ExportButtonIsDisabledWithNoItemsInQueue()
{
// Run a copy of MatterControl
@ -175,7 +175,7 @@ namespace MatterHackers.MatterControl.UI
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Fresh_Installation");
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun);
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 1); // make sure we ran all our tests
}
@ -184,7 +184,7 @@ namespace MatterHackers.MatterControl.UI
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]
public class QueueItemThumnailWidget
{
[Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")]
[Test, RequiresSTA, RunInApplicationDomain]
public void QueueThumbnailWidgetOpensPartPreview()
{
// Run a copy of MatterControl
@ -207,7 +207,7 @@ namespace MatterHackers.MatterControl.UI
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Three_Queue_Items");
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
}
@ -216,7 +216,7 @@ namespace MatterHackers.MatterControl.UI
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]
public class ClickCopyButtonMakesACopyOfPrintItemInQueue
{
[Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")]
[Test, RequiresSTA, RunInApplicationDomain]
public void CopyButtonMakesACopyOfPartInTheQueue()
{
// Run a copy of MatterControl
@ -253,7 +253,7 @@ namespace MatterHackers.MatterControl.UI
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Three_Queue_Items");
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
}
@ -262,7 +262,7 @@ namespace MatterHackers.MatterControl.UI
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]
public class AddSingleItemToQueueAddsItem
{
[Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")]
[Test, RequiresSTA, RunInApplicationDomain]
public void AddSingleItemToQueue()
{
// Run a copy of MatterControl
@ -275,17 +275,12 @@ namespace MatterHackers.MatterControl.UI
* Tests that when the QueueData.Instance.AddItem function is called:
* 1. The Queue count is increased by 1
* 2. A QueueRowItem is created and added to the queue
* 3. That a copy of the part is saved to AppData\MatterControl\data\QueueItems folder
*/
//TODO: Eventually modify test so that we test adding queue items via file
bool queueDataCountEqualsZero = false;
bool addedPartIncreasesQueueDataCount = false;
bool queueItemAppDataDirectoryExists = false;
bool queueItemAppDataDirectoryDoesNotExists = true;
int currentQueueCount = QueueData.Instance.Count;
string pathToAddedQueueItem = Path.Combine(MatterHackers.MatterControl.DataStorage.ApplicationDataStorage.ApplicationUserDataPath, "data", "QueueItems", "Batman.stl");
string partToBeAdded = Path.Combine("..", "..", "..", "TestData", "TestParts", "Batman.stl");
//Make Sure Queue Count = 0
@ -300,15 +295,6 @@ namespace MatterHackers.MatterControl.UI
//Make sure queue item does not exist
bool batmanSTLExists = testRunner.WaitForName("Queue Item " + "Batman", 2);
resultsHarness.AddTestResult(batmanSTLExists == false);
//Make sure that QueueItems directory does not exist
if (!File.Exists(pathToAddedQueueItem))
{
queueItemAppDataDirectoryDoesNotExists = true;
}
resultsHarness.AddTestResult(queueItemAppDataDirectoryDoesNotExists == true, "Path to QueueItems directory does not exist before tests");
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(partToBeAdded), partToBeAdded)));
@ -324,28 +310,78 @@ namespace MatterHackers.MatterControl.UI
resultsHarness.AddTestResult(addedPartIncreasesQueueDataCount == true);
testRunner.Wait(3);
if(File.Exists(pathToAddedQueueItem))
{
queueItemAppDataDirectoryExists = true;
}
resultsHarness.AddTestResult(queueItemAppDataDirectoryExists == true);
MatterControlUtilities.CloseMatterControl(testRunner);
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Fresh_Installation");
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun);
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 6); // make sure we ran all our tests
Assert.IsTrue(testHarness.TestCount == 4); // make sure we ran all our tests
}
}
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]
public class QueueAddAMFToQueue
{
[Test, RequiresSTA, RunInApplicationDomain]
public void AddAMFFile()
{
// Run a copy of MatterControl
Action<AutomationTesterHarness> testToRun = (AutomationTesterHarness resultsHarness) =>
{
AutomationRunner testRunner = new AutomationRunner(MatterControlUtilities.DefaultTestImages);
{
/*
*Tests:
*1. When a zip file is added to the queue all items in the zip file are aadded to queue
*/
bool queueDataCountEqualsZero = false;
string zipFileToAMF = Path.Combine("..", "..", "..", "TestData", "TestParts", "Rook.amf");
int currentQueueCount = QueueData.Instance.Count;
//Make Sure Queue Count = 0
if (currentQueueCount == 0)
{
queueDataCountEqualsZero = true;
}
resultsHarness.AddTestResult(queueDataCountEqualsZero = true);
testRunner.Wait(2);
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(zipFileToAMF), zipFileToAMF)));
resultsHarness.AddTestResult(testRunner.WaitForName("Queue Item " + "Rook", 2));
testRunner.Wait(3);
bool queueDataIncreasesByOneAfterAdd = false;
int queueCountAfterAdd = QueueData.Instance.Count;
if(queueCountAfterAdd != 1)
{
queueDataIncreasesByOneAfterAdd = true;
}
resultsHarness.AddTestResult(queueDataIncreasesByOneAfterAdd = true);
MatterControlUtilities.CloseMatterControl(testRunner);
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun);
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 3); // make sure we ran all our tests
}
}
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]
public class RemoveAllMenuItemClicked
{
[Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")]
[Test, RequiresSTA, RunInApplicationDomain]//, Ignore("Not Finished")]
public void RemoveAllMenuItemClickedRemovesAll()
{
// Run a copy of MatterControl
@ -407,7 +443,7 @@ namespace MatterHackers.MatterControl.UI
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Three_Queue_Items");
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 8); // make sure we ran all our tests
}
@ -416,7 +452,7 @@ namespace MatterHackers.MatterControl.UI
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain]
public class QueueRowItemRemoveViewButtons
{
[Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")]
[Test, RequiresSTA, RunInApplicationDomain]//, Ignore("Not Finished")]
public void ClickQueueRoWItemViewAndRemove()
{
// Run a copy of MatterControl
@ -480,12 +516,60 @@ namespace MatterHackers.MatterControl.UI
MatterControlUtilities.CloseMatterControl(testRunner);
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Three_Queue_Items");
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 7); // make sure we ran all our tests
}
}
[TestFixture, Category("MatterControl.UI"), RunInApplicationDomain, Ignore("Not Finished")]
public class QueueAddButtonAddsZipToQueue
{
[Test, RequiresSTA, RunInApplicationDomain]
public void QueueAddButtonAddsZipFile()
{
Action<AutomationTesterHarness> testToRun = (AutomationTesterHarness resultsHarness) =>
{
AutomationRunner testRunner = new AutomationRunner(MatterControlUtilities.DefaultTestImages);
{
/* Tests that when the Queue Copy button is clicked:
* 1. QueueCount = Zero
* 2. All files in compressed zip are added to queue
*/
testRunner.Wait(5);
testRunner.ClickByName("Queue Add Button");
testRunner.Wait(2);
string test = "%USERPROFILE%";
string test2 = @"\Development\MatterControl\Tests\TestData\TestParts\Batman.zip";
string fullPath = test + test2;
Debug.WriteLine(fullPath);
testRunner.Type(fullPath);
MatterControlUtilities.CloseMatterControl(testRunner);
}
};
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun);
Assert.IsTrue(testHarness.AllTestsPassed);
Assert.IsTrue(testHarness.TestCount == 0); // make sure we ran all our tests
}
}
}

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

@ -34,6 +34,8 @@ using MatterHackers.Agg.UI.Tests;
using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintLibrary.Provider;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NUnit.Framework;
using System;
using System.Diagnostics;
@ -148,6 +150,61 @@ namespace MatterHackers.MatterControl.UI
return state;
}
public static void AddItemsToQueue(string queueItemFolderToLoad)
{
//DEFAULT LOCATION OF MCP FILE (LOCATION IS CORRECT)
string mcpPath = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "default.mcp");
//RENAME ORIGINAL MCP FILE
//string backupMcp = Path.ChangeExtension(mcpPath, "_original");
Directory.CreateDirectory(Path.GetDirectoryName(mcpPath));
if (!File.Exists(mcpPath))
{
File.WriteAllText(mcpPath, JsonConvert.SerializeObject(new ManifestFile()
{
ProjectFiles = new System.Collections.Generic.List<PrintItem>()
}, Formatting.Indented));
}
var queueItemData = JsonConvert.DeserializeObject<ManifestFile>(File.ReadAllText(mcpPath));
string queueData = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "testitems");
//CREATE EMPTY TESTPARTS FOLDER
Directory.CreateDirectory(queueData);
foreach (string file in Directory.GetFiles(Path.Combine("..", "..", "..", "TestData", "QueueItems", queueItemFolderToLoad)))
{
string newFilePath = Path.Combine(queueData, Path.GetFileName(file));
File.Copy(file, newFilePath, true);
queueItemData.ProjectFiles.Add(new PrintItem()
{
FileLocation = newFilePath,
Name = Path.GetFileNameWithoutExtension(file),
DateAdded = DateTime.Now
});
}
File.WriteAllText(mcpPath, JsonConvert.SerializeObject(queueItemData, Formatting.Indented));
Assert.IsTrue(queueItemData != null && queueItemData.ProjectFiles.Count > 0);
}
/*public static void ResetMCPFile()
{
//DEFAULT LOCATION OF MCP FILE
string mcpPath = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "default.mcp");
//RENAME ORIGINAL MCP FILE
string backupMcp = Path.ChangeExtension(mcpPath, "_original");
File.Copy(backupMcp, mcpPath, true);
}*/
public static LibraryProvider CurrentProvider()
{
return ApplicationController.Instance.CurrentLibraryDataView.CurrentLibraryProvider;
@ -220,7 +277,7 @@ namespace MatterHackers.MatterControl.UI
}
}
public static AutomationTesterHarness RunTest(Action<AutomationTesterHarness> testToRun, string testDbFolder = null, string staticDataPathOverride = null, double maxTimeToRun = 60)
public static AutomationTesterHarness RunTest(Action<AutomationTesterHarness> testToRun, string testDbFolder = null, string staticDataPathOverride = null, string queueItemFolderToAdd = null, double maxTimeToRun = 60)
{
if (staticDataPathOverride == null)
{
@ -232,6 +289,12 @@ namespace MatterHackers.MatterControl.UI
#endif
bool showWindow;
MatterControlUtilities.DataFolderState staticDataState = MatterControlUtilities.MakeNewStaticDataForTesting2(testDbFolder);
if (queueItemFolderToAdd != null)
{
MatterControlUtilities.AddItemsToQueue(queueItemFolderToAdd);
}
MatterControlApplication matterControlWindow = MatterControlApplication.CreateInstance(out showWindow);
AutomationTesterHarness testHarness = AutomationTesterHarness.ShowWindowAndExectueTests(matterControlWindow, testToRun, maxTimeToRun);
MatterControlUtilities.RestoreStaticDataAfterTesting(staticDataState, true);

33392
Tests/TestData/QueueItems/2013-01-25_Mouthpiece_v2.stl Normal file
View file

File diff suppressed because it is too large Load diff

2410
Tests/TestData/QueueItems/Batman.stl Normal file
View file

File diff suppressed because it is too large Load diff

BIN
Tests/TestData/QueueItems/BridgeTestPart.stl Normal file
View file

Binary file not shown.

4356
Tests/TestData/QueueItems/Fennec_Fox.stl Normal file
View file

File diff suppressed because it is too large Load diff

33392
Tests/TestData/QueueItems/Three_Queue_Items/2013-01-25_Mouthpiece_v2.stl Normal file
View file

File diff suppressed because it is too large Load diff

2410
Tests/TestData/QueueItems/Three_Queue_Items/Batman.stl Normal file
View file

File diff suppressed because it is too large Load diff

4356
Tests/TestData/QueueItems/Three_Queue_Items/Fennec_Fox.stl Normal file
View file

File diff suppressed because it is too large Load diff

8843
Tests/TestData/QueueItems/chichen-itza_pyramid.stl Normal file
View file

File diff suppressed because it is too large Load diff

31324
Tests/TestData/TestParts/Rook.amf Normal file
View file

File diff suppressed because it is too large Load diff