Browse Source

Remove unused code.

pull/15/head
Matt Ward 14 years ago
parent
commit
f1e142228b
  1. 21
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementSolution.cs
  2. 2
      src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementSolution.cs
  3. 16
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs
  4. 95
      src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementSolutionTests.cs
  5. 4
      src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs
  6. 2
      src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs

21
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementSolution.cs

@ -34,28 +34,11 @@ namespace ICSharpCode.PackageManagement.Design @@ -34,28 +34,11 @@ namespace ICSharpCode.PackageManagement.Design
return FakeProject;
}
public IPackageRepository RepositoryPassedToCreateProject;
public MSBuildBasedProject ProjectPassedToCreateProject;
public IPackageManagementProject CreateProject(IPackageRepository sourceRepository, MSBuildBasedProject project)
{
RepositoryPassedToCreateProject = sourceRepository;
ProjectPassedToCreateProject = project;
return FakeProject;
}
public IPackageRepository RepositoryPassedToGetActiveProject;
public virtual IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository)
{
RepositoryPassedToCreateProject = sourceRepository;
return FakeProject;
}
public PackageSource PackageSourcePassedToCreateProject;
public IPackageManagementProject CreateProject(PackageSource source, MSBuildBasedProject project)
{
PackageSourcePassedToCreateProject = source;
ProjectPassedToCreateProject = project;
RepositoryPassedToGetActiveProject = sourceRepository;
return FakeProject;
}

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

@ -11,8 +11,6 @@ namespace ICSharpCode.PackageManagement @@ -11,8 +11,6 @@ namespace ICSharpCode.PackageManagement
public interface IPackageManagementSolution
{
IPackageManagementProject GetActiveProject();
IPackageManagementProject CreateProject(PackageSource source, MSBuildBasedProject project);
IPackageManagementProject CreateProject(IPackageRepository sourceRepository, MSBuildBasedProject project);
IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository);
IPackageManagementProject GetProject(PackageSource source, string projectName);
IPackageManagementProject GetProject(IPackageRepository sourceRepository, string projectName);

16
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs

@ -55,20 +55,14 @@ namespace ICSharpCode.PackageManagement @@ -55,20 +55,14 @@ namespace ICSharpCode.PackageManagement
return CreateProject(sourceRepository, activeProject);
}
public IPackageManagementProject CreateProject(IPackageRepository sourceRepository, MSBuildBasedProject project)
{
return projectFactory.CreateProject(sourceRepository, project);
}
MSBuildBasedProject GetActiveMSBuildProject()
{
return projectService.CurrentProject as MSBuildBasedProject;
}
public IPackageManagementProject CreateProject(PackageSource source, MSBuildBasedProject project)
IPackageManagementProject CreateProject(IPackageRepository sourceRepository, MSBuildBasedProject project)
{
IPackageRepository sourceRepository = CreatePackageRepository(source);
return CreateProject(sourceRepository, project);
return projectFactory.CreateProject(sourceRepository, project);
}
IPackageRepository CreatePackageRepository(PackageSource source)
@ -97,6 +91,12 @@ namespace ICSharpCode.PackageManagement @@ -97,6 +91,12 @@ namespace ICSharpCode.PackageManagement
return String.Equals(a, b, StringComparison.InvariantCultureIgnoreCase);
}
IPackageManagementProject CreateProject(PackageSource source, MSBuildBasedProject project)
{
IPackageRepository sourceRepository = CreatePackageRepository(source);
return CreateProject(sourceRepository, project);
}
public IPackageManagementProject GetProject(IPackageRepository sourceRepository, string projectName)
{
MSBuildBasedProject msbuildProject = GetMSBuildProject(projectName);

95
src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementSolutionTests.cs

@ -94,46 +94,6 @@ namespace PackageManagement.Tests @@ -94,46 +94,6 @@ namespace PackageManagement.Tests
Assert.AreEqual(expectedProject, activeProject);
}
[Test]
public void CreateProject_ProjectAndRepositoryPassed_ProjectUsedToCreateProject()
{
CreateSolution();
var expectedProject = ProjectHelper.CreateTestProject();
var repository = new FakePackageRepository();
solution.CreateProject(repository, expectedProject);
var actualProject = fakeProjectFactory.ProjectPassedToCreateProject;
Assert.AreEqual(expectedProject, actualProject);
}
[Test]
public void CreateProject_ProjectAndRepositoryPassed_CreatesProjectUsingRepository()
{
CreateSolution();
var expectedRepository = new FakePackageRepository();
solution.CreateProject(expectedRepository, null);
IPackageRepository actualRepository = fakeProjectFactory.RepositoryPassedToCreateProject;
Assert.AreEqual(expectedRepository, actualRepository);
}
[Test]
public void CreateProject_ProjectAndRepositoryPassed_ReturnsProjectCreatedByFactory()
{
CreateSolution();
var testProject = ProjectHelper.CreateTestProject();
var repository = new FakePackageRepository();
var project = solution.CreateProject(repository, testProject);
IPackageManagementProject expectedProject = fakeProjectFactory.FakeProject;
Assert.AreEqual(expectedProject, project);
}
[Test]
public void GetActiveProject_RepositoryPassed_CreatesProjectUsingRepository()
{
@ -173,61 +133,6 @@ namespace PackageManagement.Tests @@ -173,61 +133,6 @@ namespace PackageManagement.Tests
Assert.AreEqual(expectedProject, project);
}
[Test]
public void CreateProject_PackagesSourceAndProjectPassed_CreatesProjectUsingCreatedRepository()
{
CreateSolution();
var source = new PackageSource("http://sharpdevelop.net");
var testProject = ProjectHelper.CreateTestProject();
solution.CreateProject(source, testProject);
var repository = fakeProjectFactory.RepositoryPassedToCreateProject;
var expectedRepository = fakeRegisteredPackageRepositories.FakePackageRepository;
Assert.AreEqual(expectedRepository, repository);
}
[Test]
public void CreateProject_PackagesSourceAndProjectPassed_PackageSourceUsedToCreateRepository()
{
CreateSolution();
var expectedSource = new PackageSource("http://sharpdevelop.net");
var testProject = ProjectHelper.CreateTestProject();
solution.CreateProject(expectedSource, testProject);
var source = fakeRegisteredPackageRepositories.PackageSourcePassedToCreateRepository;
Assert.AreEqual(expectedSource, source);
}
[Test]
public void CreateProject_PackagesSourceAndProjectPassed_CreatesProjectUsingProjectPassed()
{
CreateSolution();
var source = new PackageSource("http://sharpdevelop.net");
var expectedProject = ProjectHelper.CreateTestProject();
solution.CreateProject(source, expectedProject);
var project = fakeProjectFactory.ProjectPassedToCreateProject;
Assert.AreEqual(expectedProject, project);
}
[Test]
public void CreateProject_PackagesSourceAndProjectPassed_ReturnsProjectFromProjectFactory()
{
CreateSolution();
var source = new PackageSource("http://sharpdevelop.net");
var testProject = ProjectHelper.CreateTestProject();
var project = solution.CreateProject(source, testProject);
var expectedProject = fakeProjectFactory.FakeProject;
Assert.AreEqual(expectedProject, project);
}
[Test]
public void GetProject_PackagesSourceAndProjectNamePassed_CreatesProjectUsingFoundProjectMatchingName()
{

4
src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs

@ -72,7 +72,7 @@ namespace PackageManagement.Tests @@ -72,7 +72,7 @@ namespace PackageManagement.Tests
viewModel.AddPackage();
Assert.AreEqual(package.Repository, fakeSolution.RepositoryPassedToCreateProject);
Assert.AreEqual(package.Repository, fakeSolution.RepositoryPassedToGetActiveProject);
}
[Test]
@ -225,7 +225,7 @@ namespace PackageManagement.Tests @@ -225,7 +225,7 @@ namespace PackageManagement.Tests
CreateViewModel();
viewModel.RemovePackage();
Assert.AreEqual(package.Repository, fakeSolution.RepositoryPassedToCreateProject);
Assert.AreEqual(package.Repository, fakeSolution.RepositoryPassedToGetActiveProject);
}
[Test]

2
src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs

@ -30,7 +30,7 @@ namespace PackageManagement.Tests @@ -30,7 +30,7 @@ namespace PackageManagement.Tests
CreateViewModel();
viewModel.AddPackage();
Assert.AreEqual(viewModel.FakePackage.Repository, fakeSolution.RepositoryPassedToCreateProject);
Assert.AreEqual(viewModel.FakePackage.Repository, fakeSolution.RepositoryPassedToGetActiveProject);
}
[Test]

Loading…
Cancel
Save