Browse Source

Sort packages by id.

pull/15/head
mrward 15 years ago
parent
commit
50c9455dec
  1. 7
      src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs
  2. 2
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs
  3. 22
      src/AddIns/Misc/PackageManagement/Test/Src/PackagesViewModelTests.cs

7
src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs

@ -202,6 +202,7 @@ namespace ICSharpCode.PackageManagement @@ -202,6 +202,7 @@ namespace ICSharpCode.PackageManagement
{
if (allPackages == null) {
IQueryable<IPackage> packages = GetAllPackages();
packages = OrderPackages(packages);
packages = packages.Find(searchTerms);
totalItems = packages.Count();
allPackages = GetFilteredPackagesBeforePagingResults(packages);
@ -209,6 +210,12 @@ namespace ICSharpCode.PackageManagement @@ -209,6 +210,12 @@ namespace ICSharpCode.PackageManagement
return allPackages;
}
IQueryable<IPackage> OrderPackages(IQueryable<IPackage> packages)
{
return packages
.OrderBy(package => package.Id);
}
IEnumerable<IPackage> GetPackagesForSelectedPage(IEnumerable<IPackage> allPackages)
{
int packagesToSkip = pages.ItemsBeforeFirstPage;

2
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs

@ -41,7 +41,7 @@ namespace PackageManagement.Tests.Helpers @@ -41,7 +41,7 @@ namespace PackageManagement.Tests.Helpers
AddFakePackage("Test");
}
void AddFakePackage(string packageId)
public void AddFakePackage(string packageId)
{
FakePackage package = CreateFakePackage(packageId);
FakePackages.Add(package);

22
src/AddIns/Misc/PackageManagement/Test/Src/PackagesViewModelTests.cs

@ -1119,5 +1119,27 @@ namespace PackageManagement.Tests @@ -1119,5 +1119,27 @@ namespace PackageManagement.Tests
Assert.IsFalse(viewModel.HasError);
}
[Test]
public void ReadPackages_PackagesReturnedNotSortedFromRepository_PackagesDisplayedSortedById()
{
CreateViewModel();
viewModel.AddFakePackage("Z");
viewModel.AddFakePackage("C");
viewModel.AddFakePackage("A");
viewModel.AddFakePackage("B");
viewModel.ReadPackages();
CompleteReadPackagesTask();
var expectedPackages = new FakePackage[] {
viewModel.FakePackages[2],
viewModel.FakePackages[3],
viewModel.FakePackages[1],
viewModel.FakePackages[0]
};
PackageCollectionAssert.AreEqual(expectedPackages, viewModel.PackageViewModels);
}
}
}

Loading…
Cancel
Save