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

Merge branch 'master' into master

Browse source
This commit is contained in:
Lars Brubaker 2016-12-03 12:09:50 -08:00 • committed by GitHub
commit 98594899df
6 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
View file

@ -105,6 +105,10 @@
<Project>{86f6aaf2-9b50-40b8-a427-1897d76471c5}</Project>
<Name>PolygonMesh</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj">
<Project>{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}</Project>
<Name>RenderOpenGl</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\agg-sharp\Tests\Agg.Tests\Agg.Tests.csproj">
<Project>{195cbe56-e654-437b-ab05-3be1b9452497}</Project>
<Name>Agg.Tests</Name>

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

@ -71,7 +71,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
testRunner.ClickByName("Row Item Calibration - Box");
MatterControlUtilities.LibraryEditSelectedItem(testRunner);
testRunner.Wait(1);
//Get View3DWidget and count MeshGroups before Copy button is clicked
GuiWidget partPreview = testRunner.GetWidgetByName("View3DWidget", out systemWindow, 3);
@ -128,7 +127,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
testRunner.ClickByName("Row Item Calibration - Box");
MatterControlUtilities.LibraryEditSelectedItem(testRunner);
testRunner.Wait(1);
//Get View3DWidget and count MeshGroups before Copy button is clicked
GuiWidget partPreview = testRunner.GetWidgetByName("View3DWidget", out systemWindow, 3);
@ -180,7 +178,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
testRunner.ClickByName("Row Item Calibration - Box");
MatterControlUtilities.LibraryEditSelectedItem(testRunner);
testRunner.Wait(1);
//Get View3DWidget and count MeshGroups before Copy button is clicked
GuiWidget partPreview = testRunner.GetWidgetByName("View3DWidget", out systemWindow, 3);
@ -250,8 +247,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
View3DWidget view3D = testRunner.GetWidgetByName("View3DWidget", out systemWindow, 3) as View3DWidget;
// Click Edit button to make edit controls visible
testRunner.ClickByName("3D View Edit", 1);
testRunner.WaitForName("3D View Copy", 3);
testRunner.Wait(1); // wait for window to finish opening
Assert.AreEqual(1, view3D.MeshGroups.Count, "Should have 1 part before copy");
for (int i = 0; i <= 4; i++)
@ -296,7 +293,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
testRunner.ClickByName("Row Item Calibration - Box");
MatterControlUtilities.LibraryEditSelectedItem(testRunner);
testRunner.Wait(1);
//Click Edit button to make edit controls visible
testRunner.ClickByName("3D View Edit");