Browse Source

fix build of UnitTesting

newNRvisualizers
Siegfried Pammer 13 years ago
parent
commit
8346f38845
  1. 12
      src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs
  2. 1
      src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs
  3. 6
      src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs
  4. 2
      src/AddIns/Analysis/UnitTesting/Service/TestProject.cs

12
src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs

@ -50,7 +50,7 @@ namespace ICSharpCode.UnitTesting
// Add the load solution projects thread ended handler before // Add the load solution projects thread ended handler before
// we try to display the open solution so the event does not // we try to display the open solution so the event does not
// get missed. // get missed.
ParserService.LoadSolutionProjectsThreadEnded += LoadSolutionProjectsThreadEnded; SD.ParserService.LoadSolutionProjectsThread.Finished += LoadSolutionProjectsThreadFinished;
OnAddedLoadSolutionProjectsThreadEndedHandler(); OnAddedLoadSolutionProjectsThreadEndedHandler();
// Display currently open solution. // Display currently open solution.
@ -61,7 +61,7 @@ namespace ICSharpCode.UnitTesting
} }
} }
ParserService.ParseInformationUpdated += ParseInformationUpdated; SD.ParserService.ParseInformationUpdated += ParseInformationUpdated;
ProjectService.SolutionClosed += SolutionClosed; ProjectService.SolutionClosed += SolutionClosed;
ProjectService.SolutionFolderRemoved += SolutionFolderRemoved; ProjectService.SolutionFolderRemoved += SolutionFolderRemoved;
ProjectService.ProjectAdded += ProjectAdded; ProjectService.ProjectAdded += ProjectAdded;
@ -89,8 +89,8 @@ namespace ICSharpCode.UnitTesting
ProjectService.ProjectAdded -= ProjectAdded; ProjectService.ProjectAdded -= ProjectAdded;
ProjectService.SolutionFolderRemoved -= SolutionFolderRemoved; ProjectService.SolutionFolderRemoved -= SolutionFolderRemoved;
ProjectService.SolutionClosed -= SolutionClosed; ProjectService.SolutionClosed -= SolutionClosed;
ParserService.ParseInformationUpdated -= ParseInformationUpdated; SD.ParserService.ParseInformationUpdated -= ParseInformationUpdated;
ParserService.LoadSolutionProjectsThreadEnded -= LoadSolutionProjectsThreadEnded; SD.ParserService.LoadSolutionProjectsThread.Finished -= LoadSolutionProjectsThreadFinished;
} }
} }
@ -246,7 +246,7 @@ namespace ICSharpCode.UnitTesting
/// solution. /// solution.
/// </summary> /// </summary>
protected virtual bool IsParserLoadingSolution { protected virtual bool IsParserLoadingSolution {
get { return ParserService.LoadSolutionProjectsThreadRunning; } get { return SD.ParserService.LoadSolutionProjectsThread.IsRunning; }
} }
/// <summary> /// <summary>
@ -275,7 +275,7 @@ namespace ICSharpCode.UnitTesting
UpdateToolbar(); UpdateToolbar();
} }
void LoadSolutionProjectsThreadEnded(object source, EventArgs e) void LoadSolutionProjectsThreadFinished(object source, EventArgs e)
{ {
WorkbenchSingleton.SafeThreadAsyncCall(UpdateToolbar); WorkbenchSingleton.SafeThreadAsyncCall(UpdateToolbar);
Solution solution = ProjectService.OpenSolution; Solution solution = ProjectService.OpenSolution;

1
src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs

@ -24,7 +24,6 @@ namespace ICSharpCode.UnitTesting
public ProjectUnitTestNode(TestProject project) public ProjectUnitTestNode(TestProject project)
{ {
this.project = project; this.project = project;
project.
} }
protected override void LoadChildren() protected override void LoadChildren()

6
src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.UnitTesting
this.solution = solution; this.solution = solution;
ProjectService.ProjectAdded += OnProjectAdded; ProjectService.ProjectAdded += OnProjectAdded;
ProjectService.ProjectRemoved += OnProjectRemoved; ProjectService.ProjectRemoved += OnProjectRemoved;
ParserService.LoadSolutionProjectsThreadEnded += delegate { LoadChildren(); }; SD.ParserService.LoadSolutionProjectsThread.Finished += delegate { LoadChildren(); };
LazyLoading = true; LazyLoading = true;
} }
@ -47,7 +47,7 @@ namespace ICSharpCode.UnitTesting
protected override void LoadChildren() protected override void LoadChildren()
{ {
this.Children.Clear(); this.Children.Clear();
if (!ParserService.LoadSolutionProjectsThreadRunning) if (!SD.ParserService.LoadSolutionProjectsThread.IsRunning)
this.Children.AddRange(solution.Projects.Where(p => p.IsTestProject()).Select(p => new ProjectUnitTestNode(new TestProject(p)))); this.Children.AddRange(solution.Projects.Where(p => p.IsTestProject()).Select(p => new ProjectUnitTestNode(new TestProject(p))));
} }
@ -64,7 +64,7 @@ namespace ICSharpCode.UnitTesting
throw new ArgumentNullException("project"); throw new ArgumentNullException("project");
if (project.ProjectContent == null) if (project.ProjectContent == null)
return false; return false;
return ParserService.GetCompilation(project).FindType(typeof(TestAttribute)).Kind != TypeKind.Unknown; return SD.ParserService.GetCompilation(project).FindType("NUnit.Framework.TestAttribute").Kind != TypeKind.Unknown;
} }
} }
} }

2
src/AddIns/Analysis/UnitTesting/Service/TestProject.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.UnitTesting
this.project = project; this.project = project;
this.projectContent = project.ProjectContent; this.projectContent = project.ProjectContent;
this.testFrameworks = TestService.RegisteredTestFrameworks; this.testFrameworks = TestService.RegisteredTestFrameworks;
project.ProjectContent.GetAllTypeDefinitions().Where(td => td.Attributes.Select(a => a.CreateResolvedAttribute(project.ProjectContent.CreateCompilation(). // project.ProjectContent.GetAllTypeDefinitions().Where(td => td.Attributes.Select(a => a.CreateResolvedAttribute(project.ProjectContent.CreateCompilation().
} }
public IProject Project { public IProject Project {

Loading…
Cancel
Save