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

Revise AddToQueueFromLibraryButtonAddsItemToQueue test

Browse source 
- Restore Add To Queue functionality
- Expose reusable AddAllItems() to PrintQueueCollection
- Revise base implementation of FileSystemItem to support default
  name based on filename unless set
This commit is contained in:
John Lewin 2017-06-03 16:18:09 -07:00
parent ba754dba19
commit add70a2f90
4 changed files with 39 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Library/Providers/FileSystem/FileSystemItem.cs
View file

@ -62,7 +62,10 @@ namespace MatterHackers.MatterControl.Library
return fileName;
}
set { }
set
{
fileName = value;
}
}
}
}

11
Library/Providers/MatterControl/PrintQueueContainer.cs
View file

@ -64,6 +64,13 @@ namespace MatterHackers.MatterControl.Library
}
public override async void Add(IEnumerable<ILibraryItem> items)
{
await AddAllItems(items);
this.ReloadContainer();
}
public static async Task AddAllItems(IEnumerable<ILibraryItem> items)
{
await Task.Run(async () =>
{
@ -98,8 +105,6 @@ namespace MatterHackers.MatterControl.Library
0);
}
}
this.ReloadContainer();
});
}
@ -110,7 +115,7 @@ namespace MatterHackers.MatterControl.Library
var fileSystemItem = item as FileSystemFileItem;
if (fileSystemItem != null)
{
var matches = QueueData.Instance.PrintItems.Where(p => p.FileLocation == fileSystemItem.Path);
var matches = QueueData.Instance.PrintItems.Where(p => p.FileLocation == fileSystemItem.Path).ToList();
foreach(var printItem in matches)
{

13
Library/Widgets/PrintLibraryWidget.cs
View file

@ -740,18 +740,13 @@ namespace MatterHackers.MatterControl.PrintLibrary
});
}
private void addToQueueButton_Click(object sender, EventArgs e)
private async void addToQueueButton_Click(object sender, EventArgs e)
{
foreach (var item in libraryView.SelectedItems)
var selectedItems = libraryView.SelectedItems.Select(o => o.Model);
if (selectedItems.Any())
{
throw new NotImplementedException("addToQueueButton_Click");
// Get content
// Create printitemwrapper (or not) - an implementation for this exists in cloud library
// Add printitemwrapper to queue
await PrintQueueContainer.AddAllItems(selectedItems);
}
libraryView.SelectedItems.Clear();
}
private void EnableMenus()

54
Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
View file

@ -140,7 +140,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
testRunner.CloseSignInAndPrinterSelect();
//Navigate To Local Library
// Navigate To Local Library
testRunner.ClickByName("Library Tab");
testRunner.NavigateToFolder("Local Library Row Item Collection");
@ -221,7 +221,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
testRunner.CloseSignInAndPrinterSelect();
//Navigate to Local Library
// Navigate to Local Library
testRunner.ClickByName("Library Tab");
testRunner.NavigateToFolder("Local Library Row Item Collection");
@ -237,7 +237,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
MatterControlUtilities.LibraryRemoveSelectedItem(testRunner);
testRunner.Delay(1);
//Make sure that Export Item Window exists after Export button is clicked
// Make sure that Export Item Window exists after Export button is clicked
Assert.IsFalse(testRunner.WaitForName("Row Item Rook", 1));
return Task.FromResult(0);
@ -291,50 +291,42 @@ namespace MatterHackers.MatterControl.Tests.Automation
[Test]
public async Task AddToQueueFromLibraryButtonAddsItemToQueue()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
int expectedCount = QueueData.Instance.ItemCount + 1;
testRunner.CloseSignInAndPrinterSelect();
//Navigate to Local Library
// Navigate to Local Library
testRunner.ClickByName("Library Tab");
testRunner.NavigateToFolder("Local Library Row Item Collection");
// Add Library item
testRunner.ClickByName("Library Add Button", 5);
testRunner.Delay(2);
testRunner.Type(MatterControlUtilities.GetTestItemPath("Rook.amf"));
testRunner.Delay(1);
testRunner.ClickByName("Library Edit Button");
testRunner.Delay(1);
testRunner.Type("{Enter}");
//Select Library Item
string rowItemOne = "Row Item Calibration - Box";
testRunner.ClickByName(rowItemOne);
// Select Library Item
testRunner.ClickByName("Row Item Rook");
testRunner.Delay(1);
int queueCountBeforeAdd = QueueData.Instance.ItemCount;
//Add Library Item to the Print Queue
// Add Library Item to the Print Queue
MatterControlUtilities.LibraryAddSelectionToQueue(testRunner);
testRunner.Delay(2);
//Make sure that the Queue Count increases by one
int queueCountAfterAdd = QueueData.Instance.ItemCount;
// Make sure that the Queue Count increases by one
Assert.AreEqual(expectedCount, QueueData.Instance.ItemCount, "Queue item count should increase by one after add");
Assert.IsTrue(queueCountAfterAdd == queueCountBeforeAdd + 1);
// Navigate to Queue
testRunner.ClickByName("Bread Crumb Button Home");
testRunner.NavigateToFolder("Print Queue Row Item Collection");
//Navigate to Queue
testRunner.ClickByName("Queue Tab");
testRunner.Delay(1);
//Make sure that the Print Item was added
string queueItem = "Queue Item Calibration - Box";
bool queueItemWasAdded = testRunner.WaitForName(queueItem, 2);
Assert.IsTrue(queueItemWasAdded == true);
// Make sure that the Print Item was added
Assert.IsTrue(testRunner.WaitForName("Row Item Rook", 5), "Rook item should exist in the Queue after Add");
return Task.FromResult(0);
};
await MatterControlUtilities.RunTest(testToRun);
});
}
[Test]