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

Merge pull request #2081 from jlewin/design_tools

Browse source 
Fix tests, convert Debug.Break to throw
This commit is contained in:
johnlewin 2017-05-21 22:44:32 -07:00 • committed by GitHub
commit e088f40bb6
8 changed files with 24 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Library/Widgets/PrintLibraryWidget.cs
View file

@ -372,7 +372,11 @@ namespace MatterHackers.MatterControl.PrintLibrary
AllowMultiple = false,
AllowProtected = false,
AllowContainers = false,
Action = (selectedLibraryItems, listView) => System.Diagnostics.Debugger.Break() /* editButton_Click(s, null) */
Action = (selectedLibraryItems, listView) =>
{
throw new NotImplementedException();
/* editButton_Click(s, null) */
}
});
// rename menu item
@ -795,7 +799,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
private void shareFromLibraryButton_Click(object sender, EventArgs e)
{
// TODO: Should be rewritten to Register from cloudlibrary, include logic to add to library as needed
System.Diagnostics.Debugger.Break();
throw new NotImplementedException();
if (libraryView.SelectedItems.Count == 1)
{

3
PartPreviewWindow/SaveAsWindow.cs
View file

@ -95,7 +95,8 @@ namespace MatterHackers.MatterControl
};
// TODO: Needs a separate implementation that doesn't change the standard list view contents as we browse around
System.Diagnostics.Debugger.Break();
throw new NotImplementedException();
librarySelectorWidget = new ListView(ApplicationController.Instance.Library);
// put in the bread crumb widget

11
PartPreviewWindow/View3D/SideBar/MirrorControls.cs
View file

@ -88,7 +88,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
view3DWidget.UndoBuffer.AddAndDo(new UndoRedoActions(() => MirrorOnAxis(0), () => MirrorOnAxis(0)));
Debugger.Break();
throw new NotImplementedException();
/* TODO: Revise above for scenebundle with the following...
var selectedItem = view3DWidget.Scene.SelectedItem;
selectedItem.Mesh.ReverseFaceEdges();
@ -106,7 +107,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (view3DWidget.Scene.HasSelection)
{
view3DWidget.UndoBuffer.AddAndDo(new UndoRedoActions(() => MirrorOnAxis(1), () => MirrorOnAxis(1)));
Debugger.Break();
throw new NotImplementedException();
/* TODO: Revise above for scenebundle with the following...
var selectedItem = view3DWidget.Scene.SelectedItem;
selectedItem.Mesh.ReverseFaceEdges();
@ -124,7 +127,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (view3DWidget.Scene.HasSelection)
{
view3DWidget.UndoBuffer.AddAndDo(new UndoRedoActions(() => MirrorOnAxis(2), () => MirrorOnAxis(2)));
Debugger.Break();
throw new NotImplementedException();
/* TODO: Revise above for scenebundle with the following...
var selectedItem = view3DWidget.Scene.SelectedItem;
selectedItem.Mesh.ReverseFaceEdges();

3
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -2220,7 +2220,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
libraryToSaveTo.AddItem(printItemWrapper);
Debugger.Break(); // Disabled dispose
throw new NotImplementedException();
//libraryToSaveTo.Dispose();
}
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit fafca6a25575be4b386e7ea5892e6c9c0c405c5e
Subproject commit d2af76859987a42a50843d75b87cb2f6b74707e4

19
Tests/MatterControl.AutomationTests/OptionsTabTests.cs
View file

@ -1,9 +1,6 @@
using System;
using System.Threading;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.UI.Tests;
using MatterHackers.GuiAutomation;
using NUnit.Framework;
namespace MatterHackers.MatterControl.Tests.Automation
@ -14,30 +11,24 @@ namespace MatterHackers.MatterControl.Tests.Automation
[Test, Apartment(ApartmentState.STA)]
public async Task ClickingShowTerminalButtonOpensTerminal()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
testRunner.ClickByName("SettingsAndControls", 5);
testRunner.Delay(2);
testRunner.ClickByName("Options Tab", 6);
bool terminalWindowExists1 = testRunner.WaitForName("Gcode Terminal", 0);
Assert.IsTrue(terminalWindowExists1 == false, "Terminal Window does not exist");
Assert.IsFalse(testRunner.WaitForName("Gcode Terminal", 0.5), "Terminal Window should not exist");
testRunner.ClickByName("Show Terminal Button", 6);
testRunner.Delay(1);
SystemWindow containingWindow;
GuiWidget terminalWindow = testRunner.GetWidgetByName("Gcode Terminal", out containingWindow, 3);
Assert.IsTrue(terminalWindow != null, "Terminal Window exists after Show Terminal button is clicked");
Assert.IsNotNull(terminalWindow, "Terminal Window should exists after Show Terminal button is clicked");
containingWindow.CloseOnIdle();
testRunner.Delay(.5);
return Task.FromResult(0);
};
await MatterControlUtilities.RunTest(testToRun);
});
}
}
}

5
Tests/MatterControl.AutomationTests/PrintingTests.cs
View file

@ -276,8 +276,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
Assert.IsTrue(ProfileManager.Instance.ActiveProfile != null);
testRunner.SwitchToSettingsAndControls();
testRunner.ClickByName("Controls Tab", 1);
testRunner.ClickByName("Start Print Button", 1);
@ -352,7 +350,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
[Test, Apartment(ApartmentState.STA)]
public async Task TuningAdjustmentControlsBoundToStreamValues()
{
double targetExtrusionRate = 1.5;
double targetFeedRate = 2;
@ -374,8 +371,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
Assert.IsTrue(ProfileManager.Instance.ActiveProfile != null);
testRunner.SwitchToSettingsAndControls();
testRunner.ClickByName("Controls Tab", 1);
testRunner.ClickByName("Start Print Button", 1);

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

@ -473,23 +473,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
Environment.CurrentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
}
public static void SwitchToSettingsAndControls(this AutomationRunner testRunner)
{
if (testRunner.WaitForName("SettingsAndControls"))
{
testRunner.ClickByName("SettingsAndControls");
testRunner.Delay(.5);
}
}
public static void SwitchToAdvancedSettings(AutomationRunner testRunner)
{
if (testRunner.WaitForName("SettingsAndControls"))
{
testRunner.ClickByName("SettingsAndControls");
testRunner.Delay(.5);
}
testRunner.ClickByName("User Level Dropdown");
testRunner.ClickByName("Advanced Menu Item");
testRunner.Delay(.5);