From 8346f38845d153d07823eae8b3b45c579a53162c Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 14 Apr 2012 15:24:36 +0200 Subject: [PATCH] fix build of UnitTesting --- src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs | 12 ++++++------ .../UnitTesting/Nodes/ProjectUnitTestNode.cs | 1 - .../Analysis/UnitTesting/Nodes/RootUnitTestNode.cs | 6 +++--- .../Analysis/UnitTesting/Service/TestProject.cs | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs b/src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs index a43ac2dea4..3a782a7abc 100644 --- a/src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs +++ b/src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs @@ -50,7 +50,7 @@ namespace ICSharpCode.UnitTesting // Add the load solution projects thread ended handler before // we try to display the open solution so the event does not // get missed. - ParserService.LoadSolutionProjectsThreadEnded += LoadSolutionProjectsThreadEnded; + SD.ParserService.LoadSolutionProjectsThread.Finished += LoadSolutionProjectsThreadFinished; OnAddedLoadSolutionProjectsThreadEndedHandler(); // Display currently open solution. @@ -61,7 +61,7 @@ namespace ICSharpCode.UnitTesting } } - ParserService.ParseInformationUpdated += ParseInformationUpdated; + SD.ParserService.ParseInformationUpdated += ParseInformationUpdated; ProjectService.SolutionClosed += SolutionClosed; ProjectService.SolutionFolderRemoved += SolutionFolderRemoved; ProjectService.ProjectAdded += ProjectAdded; @@ -89,8 +89,8 @@ namespace ICSharpCode.UnitTesting ProjectService.ProjectAdded -= ProjectAdded; ProjectService.SolutionFolderRemoved -= SolutionFolderRemoved; ProjectService.SolutionClosed -= SolutionClosed; - ParserService.ParseInformationUpdated -= ParseInformationUpdated; - ParserService.LoadSolutionProjectsThreadEnded -= LoadSolutionProjectsThreadEnded; + SD.ParserService.ParseInformationUpdated -= ParseInformationUpdated; + SD.ParserService.LoadSolutionProjectsThread.Finished -= LoadSolutionProjectsThreadFinished; } } @@ -246,7 +246,7 @@ namespace ICSharpCode.UnitTesting /// solution. /// protected virtual bool IsParserLoadingSolution { - get { return ParserService.LoadSolutionProjectsThreadRunning; } + get { return SD.ParserService.LoadSolutionProjectsThread.IsRunning; } } /// @@ -275,7 +275,7 @@ namespace ICSharpCode.UnitTesting UpdateToolbar(); } - void LoadSolutionProjectsThreadEnded(object source, EventArgs e) + void LoadSolutionProjectsThreadFinished(object source, EventArgs e) { WorkbenchSingleton.SafeThreadAsyncCall(UpdateToolbar); Solution solution = ProjectService.OpenSolution; diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs index ca09d237c2..a77a30dc26 100644 --- a/src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs +++ b/src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs @@ -24,7 +24,6 @@ namespace ICSharpCode.UnitTesting public ProjectUnitTestNode(TestProject project) { this.project = project; - project. } protected override void LoadChildren() diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs index 5081f3ff52..d7cd39000c 100644 --- a/src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs +++ b/src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs @@ -30,7 +30,7 @@ namespace ICSharpCode.UnitTesting this.solution = solution; ProjectService.ProjectAdded += OnProjectAdded; ProjectService.ProjectRemoved += OnProjectRemoved; - ParserService.LoadSolutionProjectsThreadEnded += delegate { LoadChildren(); }; + SD.ParserService.LoadSolutionProjectsThread.Finished += delegate { LoadChildren(); }; LazyLoading = true; } @@ -47,7 +47,7 @@ namespace ICSharpCode.UnitTesting protected override void LoadChildren() { 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)))); } @@ -64,7 +64,7 @@ namespace ICSharpCode.UnitTesting throw new ArgumentNullException("project"); if (project.ProjectContent == null) return false; - return ParserService.GetCompilation(project).FindType(typeof(TestAttribute)).Kind != TypeKind.Unknown; + return SD.ParserService.GetCompilation(project).FindType("NUnit.Framework.TestAttribute").Kind != TypeKind.Unknown; } } } diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestProject.cs b/src/AddIns/Analysis/UnitTesting/Service/TestProject.cs index 2fa8fe33a0..ba712be570 100644 --- a/src/AddIns/Analysis/UnitTesting/Service/TestProject.cs +++ b/src/AddIns/Analysis/UnitTesting/Service/TestProject.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.UnitTesting this.project = project; this.projectContent = project.ProjectContent; 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 {