diff --git a/src/AddIns/Analysis/UnitTesting/Src/AbstractRunTestCommand.cs b/src/AddIns/Analysis/UnitTesting/Src/AbstractRunTestCommand.cs index 0b81f3fdc6..9ba954127c 100644 --- a/src/AddIns/Analysis/UnitTesting/Src/AbstractRunTestCommand.cs +++ b/src/AddIns/Analysis/UnitTesting/Src/AbstractRunTestCommand.cs @@ -301,10 +301,10 @@ namespace ICSharpCode.UnitTesting if (testProgressMonitor == null) { OnBeforeRunTests(); testProgressMonitor = context.StatusBarService.CreateProgressMonitor(); - totalProjectCount = selectedTests.Projects.Count; + totalProjectCount = selectedTests.ProjectsCount; } testProgressMonitor.TaskName = GetProgressMonitorLabel(selectedTests.Project); - testProgressMonitor.Progress = GetProgress(selectedTests.Projects); + testProgressMonitor.Progress = GetProgress(selectedTests.ProjectsCount); testRunner = CreateTestRunner(selectedTests.Project); if (testRunner != null) { @@ -326,9 +326,9 @@ namespace ICSharpCode.UnitTesting return StringParser.Parse("${res:ICSharpCode.UnitTesting.StatusBarProgressLabel}", tagPair); } - double GetProgress(IList projectsLeftToRun) + double GetProgress(int projectsLeftToRunCount) { - return (double)(totalProjectCount - projectsLeftToRun.Count) / totalProjectCount; + return (double)(totalProjectCount - projectsLeftToRunCount) / totalProjectCount; } protected virtual ITestRunner CreateTestRunner(IProject project) diff --git a/src/AddIns/Analysis/UnitTesting/Src/SelectedTests.cs b/src/AddIns/Analysis/UnitTesting/Src/SelectedTests.cs index 69d86c3dc2..3401f2e53f 100644 --- a/src/AddIns/Analysis/UnitTesting/Src/SelectedTests.cs +++ b/src/AddIns/Analysis/UnitTesting/Src/SelectedTests.cs @@ -64,10 +64,14 @@ namespace ICSharpCode.UnitTesting } } - public IList Projects { + public IEnumerable Projects { get { return projects; } } + public int ProjectsCount { + get {return projects.Count;} + } + public IProject Project { get { if (projects.Count > 0) { diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassTestFixtureSelectedTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassTestFixtureSelectedTestFixture.cs index 81113d305f..f164251010 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassTestFixtureSelectedTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassTestFixtureSelectedTestFixture.cs @@ -3,6 +3,8 @@ using System; using System.Collections.Generic; +using System.Linq; + using ICSharpCode.SharpDevelop.Project; using ICSharpCode.UnitTesting; using NUnit.Framework; @@ -40,9 +42,9 @@ namespace UnitTesting.Tests.Tree public void SelectedTestsHasOneProject() { IProject[] expectedProjects = new IProject[] { project }; - List actualProjects = new List(selectedTests.Projects); + var actualProjects = selectedTests.Projects.ToArray(); - Assert.AreEqual(expectedProjects, actualProjects.ToArray()); + Assert.AreEqual(expectedProjects, actualProjects); } [Test] diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/MethodTestSelectedTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/MethodTestSelectedTestFixture.cs index 3b8588bd3c..95ca634dc3 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/MethodTestSelectedTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/MethodTestSelectedTestFixture.cs @@ -3,6 +3,8 @@ using System; using System.Collections.Generic; +using System.Linq; + using ICSharpCode.SharpDevelop.Project; using ICSharpCode.UnitTesting; using NUnit.Framework; @@ -43,9 +45,9 @@ namespace UnitTesting.Tests.Tree public void SelectedTestsHasOneProject() { IProject[] expectedProjects = new IProject[] { project }; - List actualProjects = new List(selectedTests.Projects); + var actualProjects = selectedTests.Projects.ToArray(); - Assert.AreEqual(expectedProjects, actualProjects.ToArray()); + Assert.AreEqual(expectedProjects, actualProjects); } [Test] diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/NoOwnerForSelectedTestsTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/NoOwnerForSelectedTestsTestFixture.cs index c873f6b0c6..555ca3a426 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/NoOwnerForSelectedTestsTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/NoOwnerForSelectedTestsTestFixture.cs @@ -3,6 +3,8 @@ using System; using System.Collections.Generic; +using System.Linq; + using ICSharpCode.SharpDevelop.Project; using ICSharpCode.UnitTesting; using NUnit.Framework; @@ -30,14 +32,14 @@ namespace UnitTesting.Tests.Tree [Test] public void SelectedTestsHaveThreeProjects() { - Assert.AreEqual(3, selectedTests.Projects.Count); + Assert.AreEqual(3, selectedTests.ProjectsCount); } [Test] public void SelectedProjectsMatchProjectsPassedToConstructor() { - List actualProjects = new List(selectedTests.Projects); - Assert.AreEqual(projects.ToArray(), actualProjects.ToArray()); + var actualProjects = selectedTests.Projects.ToArray(); + Assert.AreEqual(projects.ToArray(), actualProjects); } [Test] diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/SelectedTestsTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/SelectedTestsTestFixture.cs index ada47fc730..947b384f90 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/SelectedTestsTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/SelectedTestsTestFixture.cs @@ -3,6 +3,8 @@ using System; using System.Collections.Generic; +using System.Linq; + using ICSharpCode.SharpDevelop.Project; using ICSharpCode.UnitTesting; using NUnit.Framework; @@ -49,7 +51,7 @@ namespace UnitTesting.Tests.Tree [Test] public void ProjectsReturnsSingleItemContainingProjectPassedToConstructor() { - List projects = new List(selectedTests.Projects); + var projects = selectedTests.Projects.ToArray(); IProject[] expectedProjects = new IProject[] { project }; Assert.AreEqual(expectedProjects, projects); @@ -71,7 +73,7 @@ namespace UnitTesting.Tests.Tree public void RemoveFirstProjectLeavesNoProjects() { selectedTests.RemoveFirstProject(); - Assert.AreEqual(0, selectedTests.Projects.Count); + Assert.AreEqual(0, selectedTests.ProjectsCount); } [Test] diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/SelectedTestsWithTestMethodTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/SelectedTestsWithTestMethodTestFixture.cs index ea44f34a67..8ed6d5f4c1 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/SelectedTestsWithTestMethodTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/SelectedTestsWithTestMethodTestFixture.cs @@ -29,7 +29,7 @@ namespace UnitTesting.Tests.Utils.Tests [Test] public void SelectedTestsHasOneProjectSelected() { - Assert.AreEqual(1, selectedTestsWithTestMethod.Projects.Count); + Assert.AreEqual(1, selectedTestsWithTestMethod.ProjectsCount); } [Test]