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

Getting more test to pass

Browse source
This commit is contained in:
Lars Brubaker 2017-08-30 16:43:58 -07:00
parent 3515233b9c
commit 1c40b3daba
10 changed files with 31 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PartPreviewWindow/PlusTabPage.cs
View file

@ -46,7 +46,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public PlusTabPage(TabControl tabControl, PrinterConfig printer, ThemeConfig theme, PrintItemWrapper printItem)
: base(FlowDirection.TopToBottom)
{
this.Name = "+ Tab Page";
this.HAnchor = HAnchor.Stretch;
this.VAnchor = VAnchor.Stretch;
this.Padding = 15;
@ -112,6 +111,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var otherItemsSection = CreateSection("Other".Localize() + ":");
var redeemDesignCode = theme.ButtonFactory.Generate("Redeem Design Code".Localize());
redeemDesignCode.Name = "Redeem Design Code Button";
redeemDesignCode.Margin = buttonSpacing;
redeemDesignCode.HAnchor = HAnchor.Left;
redeemDesignCode.Click += (s, e) =>
@ -122,6 +122,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
otherItemsSection.AddChild(redeemDesignCode);
var redeemShareCode = theme.ButtonFactory.Generate("Enter Share Code".Localize());
redeemShareCode.Name = "Enter Share Code Button";
redeemShareCode.Margin = buttonSpacing;
redeemShareCode.HAnchor = HAnchor.Left;
redeemShareCode.Click += (s, e) =>

3
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -441,7 +441,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
PopDirection = Direction.Up,
PopupContent = ApplicationController.Instance.Theme.CreatePopupMenu(bedMenuActions),
AlignToRightEdge = true,
Margin = buttonSpacing
Margin = buttonSpacing,
Name = "Bed Options Menu",
});
}

2
SetupWizard/SyncingPrintersPage.cs
View file

@ -30,7 +30,7 @@ namespace MatterHackers.MatterControl.SetupWizard
if (!ProfileManager.Instance.ActiveProfiles.Any())
{
// Switch to setup wizard if no profiles exist
WizardWindow.ChangeToSetupPrinterForm();
UiThread.RunOnIdle(() => WizardWindow.ChangeToSetupPrinterForm());
}
else if (ProfileManager.Instance.ActiveProfiles.Count() == 1)
{

3
StaticData/Translations/Master.txt
View file

@ -4492,3 +4492,6 @@ Translated:Print Notification Settings:
English:NOTE: Standard messaging rates may apply.
Translated:NOTE: Standard messaging rates may apply.
English:Enter Share Code:
Translated:Enter Share Code:

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit e96e080061c20035b7876ce9c11eb1f7253e7556
Subproject commit e1d70586973f580b31c474b799c97e55d3ec12a3

33
Tests/MatterControl.AutomationTests/FileMenuTest.cs
View file

@ -1,33 +0,0 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg.UI.Tests;
using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl.PrintQueue;
using NUnit.Framework;
namespace MatterHackers.MatterControl.Tests.Automation
{
[TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Apartment(ApartmentState.STA)]
public class FileMenuTest
{
[Test]
public async Task FileMenuAddPrinter()
{
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
testRunner.ClickByName("File Menu");
testRunner.Delay(1);
testRunner.ClickByName("Add Printer Menu Item");
testRunner.Delay(1);
Assert.IsTrue(testRunner.WaitForName("Select Make"));
testRunner.ClickByName("Cancel Wizard Button");
return Task.CompletedTask;
}, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
}
}

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

@ -61,7 +61,6 @@
<Compile Include="MatterControlTests.cs" />
<Compile Include="CreateLibraryFolder.cs" />
<Compile Include="ExportItemWindowTests.cs" />
<Compile Include="FileMenuTest.cs" />
<Compile Include="HardwareLevelingUITests.cs" />
<Compile Include="LibraryActionTests.cs" />
<Compile Include="LibraryDownloadsTest.cs" />

2
Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
View file

@ -17,6 +17,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
testRunner.AddAndSelectPrinter("Airwolf 3D", "HD");
testRunner.SwitchToAdvancedSliceSettings();

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

@ -214,6 +214,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
// assert no profiles
Assert.AreEqual(0, ProfileManager.Instance.ActiveProfiles.Count());
@ -296,11 +298,13 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
// Add Guest printers
testRunner.AddAndSelectPrinter("Airwolf 3D", "HD");
testRunner.SwitchToAdvancedSliceSettings();
testRunner.ClickByName("Layer Height Textbox");
testRunner.ClickByName("Layer Thickness Textbox");
testRunner.Type(".5\n");
testRunner.Delay(.5);
Assert.AreEqual(ActiveSliceSettings.Instance.GetValue<double>(SettingsKey.layer_height), .5, "Layer height is what we set it to");

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

@ -255,11 +255,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static void DeleteSelectedPrinter(AutomationRunner testRunner)
{
// delete printer
testRunner.ClickByName("Edit Printer Button");
testRunner.Delay(.5);
testRunner.ClickByName("Delete Printer Button");
testRunner.Delay(.5);
testRunner.ClickByName("Printer Overflow Menu");
testRunner.ClickByName("Delete Printer Menu Item");
testRunner.WaitForReloadAll(() => testRunner.ClickByName("Yes Button"));
}
@ -295,19 +292,13 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static void OpenPrintersDropdown(this AutomationRunner testRunner)
{
testRunner.ClickByName("Printer Overflow Menu");
testRunner.ClickByName("Create New");
testRunner.ClickByName("Printers... Menu");
}
public static void ClosePrintersDropdown(this AutomationRunner testRunner)
{
testRunner.ClickByName("Printer Overflow Menu");
// If a sub menu is open the first click will close it but not the main menu. Second click as needed
if (testRunner.WaitForName("Printers... Menu", 0.5))
{
testRunner.ClickByName("Printer Overflow Menu");
}
testRunner.ClickByName("Printers... Menu");
}
private static void OutputImage(ImageBuffer imageToOutput, string fileName)
@ -384,17 +375,22 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static void NavigateToFolder(this AutomationRunner testRunner, string libraryRowItemName)
{
var checkBox = (CheckBox)testRunner.GetWidgetByName("Show Folders Toggle", out SystemWindow containingWindow);
if(!checkBox.Checked)
{
testRunner.ClickByName("Show Folders Toggle");
}
OpenFolderView(testRunner);
testRunner.ClickByName(libraryRowItemName);
testRunner.Delay(.5);
testRunner.DoubleClickByName(libraryRowItemName);
testRunner.Delay(.5);
}
public static void OpenFolderView(this AutomationRunner testRunner)
{
var checkBox = (CheckBox)testRunner.GetWidgetByName("Show Folders Toggle", out SystemWindow containingWindow, 3);
if (!checkBox.Checked)
{
testRunner.ClickByName("Show Folders Toggle");
}
}
public static void NavigateToLibraryHome(this AutomationRunner testRunner)
{
while(!testRunner.NameExists("Local Library Row Item Collection", .5))
@ -417,7 +413,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static void SaveBedplateToFolder(this AutomationRunner testRunner, string newFileName, string folderName)
{
testRunner.ClickByName("Save As Menu");
testRunner.ClickByName("Bed Options Menu");
testRunner.ClickByName("Save As Menu Item");
testRunner.Delay(1);