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

Use current rather than abandoned naming, remove dead code

Browse source
This commit is contained in:
John Lewin 2018-08-13 13:31:37 -07:00
parent 3336073e1e
commit 0d4f3e5a68
4 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

0
PrinterControls/PrinterConnections/PrinterChooser.cs → CustomWidgets/BoundDropList.cs
View file

2
MatterControl.csproj
View file

@ -274,6 +274,7 @@
<Compile Include="PrinterControls\MacroDetailPage.cs" /> <Compile Include="PrinterControls\MacroDetailPage.cs" />
<Compile Include="PrinterControls\MacroListPage.cs" /> <Compile Include="PrinterControls\MacroListPage.cs" />
<Compile Include="PrinterControls\MovementSpeedsPage.cs" /> <Compile Include="PrinterControls\MovementSpeedsPage.cs" />
<Compile Include="CustomWidgets\BoundDropList.cs" />
<Compile Include="PrinterControls\PrinterConnections\PrinterSetup.cs" /> <Compile Include="PrinterControls\PrinterConnections\PrinterSetup.cs" />
<Compile Include="RootSystemWindow.cs" /> <Compile Include="RootSystemWindow.cs" />
<Compile Include="SetupWizard\DialogWindow.cs" /> <Compile Include="SetupWizard\DialogWindow.cs" />
@ -512,7 +513,6 @@
<Compile Include="PrinterControls\PrinterConnections\SetupStepMakeModelName.cs" /> <Compile Include="PrinterControls\PrinterConnections\SetupStepMakeModelName.cs" />
<Compile Include="PrinterControls\PrinterConnections\SetupStepBaudRate.cs" /> <Compile Include="PrinterControls\PrinterConnections\SetupStepBaudRate.cs" />
<Compile Include="PrinterControls\ManualPrinterControls.cs" /> <Compile Include="PrinterControls\ManualPrinterControls.cs" />
<Compile Include="PrinterControls\PrinterConnections\PrinterChooser.cs" />
<Compile Include="Library\Widgets\PrintLibraryWidget.cs" /> <Compile Include="Library\Widgets\PrintLibraryWidget.cs" />
<Compile Include="Queue\PrintItemWrapper.cs" /> <Compile Include="Queue\PrintItemWrapper.cs" />
<Compile Include="MatterControlApplication.cs" /> <Compile Include="MatterControlApplication.cs" />

2
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -57,6 +57,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MatterControl\ApplicationControllerTests.cs" /> <Compile Include="MatterControl\ApplicationControllerTests.cs" />
<Compile Include="MatterControl\BoundDropListTests.cs" />
<Compile Include="MatterControl\BrailleGrade2Tests.cs" /> <Compile Include="MatterControl\BrailleGrade2Tests.cs" />
<Compile Include="MatterControl\PopupAnchorTests.cs" /> <Compile Include="MatterControl\PopupAnchorTests.cs" />
<Compile Include="MatterControl\InteractiveSceneTests.cs" /> <Compile Include="MatterControl\InteractiveSceneTests.cs" />
@ -70,7 +71,6 @@
<Compile Include="MatterControl\MatterControlUiFeatures.cs" /> <Compile Include="MatterControl\MatterControlUiFeatures.cs" />
<Compile Include="MatterControl\MatterControlUtilities.cs" /> <Compile Include="MatterControl\MatterControlUtilities.cs" />
<Compile Include="MatterControl\OemProfileTests.cs" /> <Compile Include="MatterControl\OemProfileTests.cs" />
<Compile Include="MatterControl\PrinterChooserUnitTests.cs" />
<Compile Include="MatterControl\PrinterConfigurationTests.cs" /> <Compile Include="MatterControl\PrinterConfigurationTests.cs" />
<Compile Include="MatterControl\PrinterWhiteListTests.cs" /> <Compile Include="MatterControl\PrinterWhiteListTests.cs" />
<Compile Include="MatterControl\ReleaseBuildTests.cs" /> <Compile Include="MatterControl\ReleaseBuildTests.cs" />

27
Tests/MatterControl.Tests/MatterControl/PrinterChooserUnitTests.cs → Tests/MatterControl.Tests/MatterControl/BoundDropListTests.cs
View file

@ -10,10 +10,10 @@ using NUnit.Framework;
namespace MatterControl.Tests.MatterControl namespace MatterControl.Tests.MatterControl
{ {
class PrinterChooserUnitTests class BoundDropListTests
{ {
[Test] [Test]
public void PrinterChooserHonorsWhitelist() public void BoundDropListHonorsWhitelist()
{ {
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData")); AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData"));
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4)); MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
@ -26,8 +26,9 @@ namespace MatterControl.Tests.MatterControl
var theme = new ThemeConfig() var theme = new ThemeConfig()
{ {
Colors = ActiveTheme.Instance Colors = ActiveTheme.Instance
}; };
// Whitelist on non-OEM builds should contain all printers // Whitelist on non-OEM builds should contain all printers
dropList = new BoundDropList("Test", theme); dropList = new BoundDropList("Test", theme);
dropList.ListSource = allManufacturers; dropList.ListSource = allManufacturers;
@ -47,26 +48,6 @@ namespace MatterControl.Tests.MatterControl
dropList = new BoundDropList("Test", theme); dropList = new BoundDropList("Test", theme);
dropList.ListSource = OemSettings.Instance.AllOems; dropList.ListSource = OemSettings.Instance.AllOems;
Assert.AreEqual(2, dropList.MenuItems.Count); Assert.AreEqual(2, dropList.MenuItems.Count);
/*
* Disable Esagono tests
*
SetPrivatePrinterWhiteListMember(new List<string>() { "Esagono" });
var manufacturerNameMapping = new ManufacturerNameMapping();
manufacturerNameMapping.NameOnDisk = "Esagono";
manufacturerNameMapping.NameToDisplay = "Esagonò";
printChooser = new PrinterChooser();
string expectedItem = null;
foreach (var menuItem in printChooser.ManufacturerDropList.MenuItems)
{
if(menuItem.Text.StartsWith("Esa"))
{
expectedItem = menuItem.Text;
}
}
Assert.IsTrue(!string.IsNullOrEmpty(expectedItem) && expectedItem == "Esagonò");
*/
} }
} }
} }