Browse Source

Exposing ProjectCount property from SelectedTests class. Narrowing Projects property type from IList to IEnumerable ( missing changes).

pull/23/head
Tomasz Tretkowski 14 years ago
parent
commit
ab63247b74
  1. 8
      src/AddIns/Analysis/UnitTesting/Src/AbstractRunTestCommand.cs
  2. 6
      src/AddIns/Analysis/UnitTesting/Src/SelectedTests.cs
  3. 6
      src/AddIns/Analysis/UnitTesting/Test/Tree/ClassTestFixtureSelectedTestFixture.cs
  4. 6
      src/AddIns/Analysis/UnitTesting/Test/Tree/MethodTestSelectedTestFixture.cs
  5. 8
      src/AddIns/Analysis/UnitTesting/Test/Tree/NoOwnerForSelectedTestsTestFixture.cs
  6. 6
      src/AddIns/Analysis/UnitTesting/Test/Tree/SelectedTestsTestFixture.cs
  7. 2
      src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/SelectedTestsWithTestMethodTestFixture.cs

8
src/AddIns/Analysis/UnitTesting/Src/AbstractRunTestCommand.cs

@ -301,10 +301,10 @@ namespace ICSharpCode.UnitTesting @@ -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 @@ -326,9 +326,9 @@ namespace ICSharpCode.UnitTesting
return StringParser.Parse("${res:ICSharpCode.UnitTesting.StatusBarProgressLabel}", tagPair);
}
double GetProgress(IList<IProject> projectsLeftToRun)
double GetProgress(int projectsLeftToRunCount)
{
return (double)(totalProjectCount - projectsLeftToRun.Count) / totalProjectCount;
return (double)(totalProjectCount - projectsLeftToRunCount) / totalProjectCount;
}
protected virtual ITestRunner CreateTestRunner(IProject project)

6
src/AddIns/Analysis/UnitTesting/Src/SelectedTests.cs

@ -64,10 +64,14 @@ namespace ICSharpCode.UnitTesting @@ -64,10 +64,14 @@ namespace ICSharpCode.UnitTesting
}
}
public IList<IProject> Projects {
public IEnumerable<IProject> Projects {
get { return projects; }
}
public int ProjectsCount {
get {return projects.Count;}
}
public IProject Project {
get {
if (projects.Count > 0) {

6
src/AddIns/Analysis/UnitTesting/Test/Tree/ClassTestFixtureSelectedTestFixture.cs

@ -3,6 +3,8 @@ @@ -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 @@ -40,9 +42,9 @@ namespace UnitTesting.Tests.Tree
public void SelectedTestsHasOneProject()
{
IProject[] expectedProjects = new IProject[] { project };
List<IProject> actualProjects = new List<IProject>(selectedTests.Projects);
var actualProjects = selectedTests.Projects.ToArray();
Assert.AreEqual(expectedProjects, actualProjects.ToArray());
Assert.AreEqual(expectedProjects, actualProjects);
}
[Test]

6
src/AddIns/Analysis/UnitTesting/Test/Tree/MethodTestSelectedTestFixture.cs

@ -3,6 +3,8 @@ @@ -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 @@ -43,9 +45,9 @@ namespace UnitTesting.Tests.Tree
public void SelectedTestsHasOneProject()
{
IProject[] expectedProjects = new IProject[] { project };
List<IProject> actualProjects = new List<IProject>(selectedTests.Projects);
var actualProjects = selectedTests.Projects.ToArray();
Assert.AreEqual(expectedProjects, actualProjects.ToArray());
Assert.AreEqual(expectedProjects, actualProjects);
}
[Test]

8
src/AddIns/Analysis/UnitTesting/Test/Tree/NoOwnerForSelectedTestsTestFixture.cs

@ -3,6 +3,8 @@ @@ -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 @@ -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<IProject> actualProjects = new List<IProject>(selectedTests.Projects);
Assert.AreEqual(projects.ToArray(), actualProjects.ToArray());
var actualProjects = selectedTests.Projects.ToArray();
Assert.AreEqual(projects.ToArray(), actualProjects);
}
[Test]

6
src/AddIns/Analysis/UnitTesting/Test/Tree/SelectedTestsTestFixture.cs

@ -3,6 +3,8 @@ @@ -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 @@ -49,7 +51,7 @@ namespace UnitTesting.Tests.Tree
[Test]
public void ProjectsReturnsSingleItemContainingProjectPassedToConstructor()
{
List<IProject> projects = new List<IProject>(selectedTests.Projects);
var projects = selectedTests.Projects.ToArray();
IProject[] expectedProjects = new IProject[] { project };
Assert.AreEqual(expectedProjects, projects);
@ -71,7 +73,7 @@ namespace UnitTesting.Tests.Tree @@ -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]

2
src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/SelectedTestsWithTestMethodTestFixture.cs

@ -29,7 +29,7 @@ namespace UnitTesting.Tests.Utils.Tests @@ -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]

Loading…
Cancel
Save