Browse Source

PM: Duplicate functionality removed & rename

1) GetPackagesInstaledInSolution() removed. Duplicate, does nothing,
redirects to public available Solution.GetPackages()

2) IsPackageInstaledInSolution() removed. Duplicate, does nothing,
redirects to public available Solution.IsPackageInstalled()

3) Name GetInstalledPackages() renamed to GetPackages().
Misleading name, all packages are installed in
selected-projects/project/solution.
Or packages exist in repository, where repository can be
available/solution/project/installed.
pull/374/head
Dragan 12 years ago
parent
commit
7c203b479a
  1. 14
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSelectedProjects.cs
  2. 2
      src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackagesViewModel.cs
  3. 12
      src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementSelectedProjectsTests.cs

14
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSelectedProjects.cs

@ -138,26 +138,16 @@ namespace ICSharpCode.PackageManagement @@ -138,26 +138,16 @@ namespace ICSharpCode.PackageManagement
IPackageManagementProject project = GetSingleProjectSelected(package.Repository);
return project.IsPackageInstalled(package);
}
return IsPackageInstalledInSolution(package);
}
public bool IsPackageInstalledInSolution(IPackage package)
{
return Solution.IsPackageInstalled(package);
}
public IQueryable<IPackage> GetPackagesInstalledInSolution()
{
return Solution.GetPackages();
}
public IQueryable<IPackage> GetInstalledPackages(IPackageRepository sourceRepository)
public IQueryable<IPackage> GetPackages(IPackageRepository sourceRepository)
{
if (HasSingleProjectSelected()) {
IPackageManagementProject project = GetSingleProjectSelected(sourceRepository);
return project.GetPackages();
}
return GetPackagesInstalledInSolution();
return Solution.GetPackages();
}
public IPackageManagementProject GetSingleProjectSelected(IPackageRepository repository)

2
src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackagesViewModel.cs

@ -86,7 +86,7 @@ namespace ICSharpCode.PackageManagement @@ -86,7 +86,7 @@ namespace ICSharpCode.PackageManagement
IQueryable<IPackage> GetInstalledPackages(IPackageRepository aggregateRepository)
{
return selectedProjects.GetInstalledPackages(aggregateRepository);
return selectedProjects.GetPackages(aggregateRepository);
}
protected override IQueryable<IPackage> GetAllPackages()

12
src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementSelectedProjectsTests.cs

@ -301,7 +301,7 @@ namespace PackageManagement.Tests @@ -301,7 +301,7 @@ namespace PackageManagement.Tests
fakeSolution.FakeInstalledPackages.Add(package);
CreateSelectedProjects();
bool installed = selectedProjects.IsPackageInstalledInSolution(package);
bool installed = selectedProjects.Solution.IsPackageInstalled(package);
Assert.IsTrue(installed);
}
@ -316,7 +316,7 @@ namespace PackageManagement.Tests @@ -316,7 +316,7 @@ namespace PackageManagement.Tests
var package = new FakePackage("Test");
bool installed = selectedProjects.IsPackageInstalledInSolution(package);
bool installed = selectedProjects.Solution.IsPackageInstalled(package);
Assert.IsFalse(installed);
}
@ -332,7 +332,7 @@ namespace PackageManagement.Tests @@ -332,7 +332,7 @@ namespace PackageManagement.Tests
fakeSolution.FakeInstalledPackages.Add(package);
CreateSelectedProjects();
IQueryable<IPackage> packages = selectedProjects.GetPackagesInstalledInSolution();
IQueryable<IPackage> packages = selectedProjects.Solution.GetPackages();
var expectedPackages = new FakePackage[] {
package
@ -439,7 +439,7 @@ namespace PackageManagement.Tests @@ -439,7 +439,7 @@ namespace PackageManagement.Tests
CreateSelectedProjects();
var repository = new FakePackageRepository();
IQueryable<IPackage> packages = selectedProjects.GetInstalledPackages(repository);
IQueryable<IPackage> packages = selectedProjects.GetPackages(repository);
var expectedPackages = new FakePackage[] {
package
@ -463,7 +463,7 @@ namespace PackageManagement.Tests @@ -463,7 +463,7 @@ namespace PackageManagement.Tests
CreateSelectedProjects();
var repository = new FakePackageRepository();
IQueryable<IPackage> packages = selectedProjects.GetInstalledPackages(repository);
IQueryable<IPackage> packages = selectedProjects.GetPackages(repository);
var expectedPackages = new FakePackage[] {
package
@ -481,7 +481,7 @@ namespace PackageManagement.Tests @@ -481,7 +481,7 @@ namespace PackageManagement.Tests
CreateSelectedProjects();
var expectedRepository = new FakePackageRepository();
IQueryable<IPackage> packages = selectedProjects.GetInstalledPackages(expectedRepository);
IQueryable<IPackage> packages = selectedProjects.GetPackages(expectedRepository);
IPackageRepository repository = fakeSolution.RepositoryPassedToGetProject;

Loading…
Cancel
Save