From 4f31c4098e0d1ab6b76b4be72e11ac29374e418a Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 18 Sep 2011 13:53:25 +0200 Subject: [PATCH] Fix unit tests - GetProjectContentForReference requires a full path for all assemblies since the special cases were removed. --- .../Boo/BooBinding/Test/BooBinding.Tests.csproj | 1 + .../BackendBindings/Boo/BooBinding/Test/ResolverTests.cs | 2 +- .../BackendBindings/VBNetBinding/Test/MockTextEditor.cs | 8 ++++---- .../VBNetBinding/Test/VBNetBinding.Tests.csproj | 1 + .../XamlBinding/XamlBinding.Tests/MockTextEditor.cs | 6 +++--- .../Test/AbstractTestProjectTestFixture.cs | 2 +- src/Main/Base/Test/CodeConverterTests.cs | 4 ++-- src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj | 1 + src/Main/Base/Test/MemberLookupHelperTests.cs | 2 +- src/Main/Base/Test/NRefactoryResolverTests.cs | 8 ++++---- .../CodeSnippetConverterTests.cs | 2 +- .../NRefactoryAstConverterTests.cs | 2 +- 12 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj b/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj index b5a7360023..34f55841e7 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj @@ -40,6 +40,7 @@ + ..\..\..\..\..\Tools\NUnit\nunit.framework.dll diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs b/src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs index 4749adb149..f239c59619 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs @@ -51,7 +51,7 @@ namespace Grunwald.BooBinding.Tests lastPC = pc; HostCallback.GetCurrentProjectContent = delegate { return pc; }; pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.Mscorlib); - pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.GetProjectContentForReference("System.Windows.Forms", "System.Windows.Forms")); + pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.GetProjectContentForReference("System.Windows.Forms", typeof(System.Windows.Forms.Form).Module.FullyQualifiedName)); pc.ReferencedContents.Add(booLangPC); ICompilationUnit cu = new BooParser().Parse(pc, fileName, new StringTextBuffer(prog)); ParserService.RegisterParseInformation(fileName, cu); diff --git a/src/AddIns/BackendBindings/VBNetBinding/Test/MockTextEditor.cs b/src/AddIns/BackendBindings/VBNetBinding/Test/MockTextEditor.cs index 31cb150197..72ebc330fb 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Test/MockTextEditor.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Test/MockTextEditor.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; - +using System.Linq; using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.Core; @@ -35,9 +35,9 @@ namespace ICSharpCode.VBNetBinding.Tests pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.Mscorlib); Dictionary referencedAssemblies = new Dictionary() { - { "System", null }, - { "System.Core", null }, - { "Microsoft.VisualBasic", null } + { "System", typeof(Uri).Module.FullyQualifiedName }, + { "System.Core", typeof(Enumerable).Module.FullyQualifiedName }, + { "Microsoft.VisualBasic", typeof(Microsoft.VisualBasic.Constants).Module.FullyQualifiedName } }; foreach (var assembly in referencedAssemblies) { IProjectContent referenceProjectContent = AssemblyParserService.DefaultProjectContentRegistry.GetProjectContentForReference(assembly.Key, assembly.Value ?? assembly.Key); diff --git a/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj b/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj index fdedcb7e74..2f1bb750be 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj @@ -32,6 +32,7 @@ None + 3.0 diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs index 0eee387cdd..2f59a61e1f 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs @@ -33,11 +33,11 @@ namespace ICSharpCode.XamlBinding.Tests pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.Mscorlib); Dictionary referencedAssemblies = new Dictionary() { - { "System", null }, - { "System.Xml", null }, + { "System", typeof(Uri).Assembly.Location }, + { "System.Xml", typeof(System.Xml.XmlDocument).Assembly.Location }, { "System.Xaml", typeof(System.Xaml.XamlReader).Assembly.Location }, { "WindowsBase", typeof(System.Windows.Media.Matrix).Assembly.Location }, - { "System.Core", null }, + { "System.Core", typeof(System.Linq.Enumerable).Assembly.Location }, { "PresentationCore", typeof(System.Windows.Media.Brush).Assembly.Location }, { "PresentationFramework", typeof(System.Windows.EventSetter).Assembly.Location } }; diff --git a/src/AddIns/Misc/ResourceToolkit/Test/AbstractTestProjectTestFixture.cs b/src/AddIns/Misc/ResourceToolkit/Test/AbstractTestProjectTestFixture.cs index aece48bd1a..cb02c90399 100644 --- a/src/AddIns/Misc/ResourceToolkit/Test/AbstractTestProjectTestFixture.cs +++ b/src/AddIns/Misc/ResourceToolkit/Test/AbstractTestProjectTestFixture.cs @@ -92,7 +92,7 @@ namespace ResourceToolkit.Tests DefaultProjectContent pc = new DefaultProjectContent(); pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.Mscorlib); - pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.GetProjectContentForReference("System", "System")); + pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.GetProjectContentForReference("System", typeof(Uri).Module.FullyQualifiedName)); if (project != null) { if (project.LanguageProperties != null) { diff --git a/src/Main/Base/Test/CodeConverterTests.cs b/src/Main/Base/Test/CodeConverterTests.cs index e1c58a21b7..99f926698e 100644 --- a/src/Main/Base/Test/CodeConverterTests.cs +++ b/src/Main/Base/Test/CodeConverterTests.cs @@ -37,9 +37,9 @@ namespace ICSharpCode.SharpDevelop.Tests { DefaultProjectContent pc = new DefaultProjectContent(); pc.ReferencedContents.Add(projectContentRegistry.Mscorlib); - pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Windows.Forms", "System.Windows.Forms")); + pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Windows.Forms", typeof(System.Windows.Forms.Form).Module.FullyQualifiedName)); if (sourceLanguage == SupportedLanguage.VBNet) { - pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("Microsoft.VisualBasic", "Microsoft.VisualBasic")); + pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("Microsoft.VisualBasic", typeof(Microsoft.VisualBasic.Constants).Module.FullyQualifiedName)); pc.DefaultImports = new DefaultUsing(pc); pc.DefaultImports.Usings.Add("System"); pc.DefaultImports.Usings.Add("Microsoft.VisualBasic"); diff --git a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj index 9563deb35d..9147ba976f 100644 --- a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj +++ b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj @@ -33,6 +33,7 @@ 4096 + 3.0 diff --git a/src/Main/Base/Test/MemberLookupHelperTests.cs b/src/Main/Base/Test/MemberLookupHelperTests.cs index a7c8b52955..b0821d10ee 100644 --- a/src/Main/Base/Test/MemberLookupHelperTests.cs +++ b/src/Main/Base/Test/MemberLookupHelperTests.cs @@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Tests { ProjectContentRegistry r = new ProjectContentRegistry(); msc = r.Mscorlib; - swf = r.GetProjectContentForReference("System.Windows.Forms", "System.Windows.Forms"); + swf = r.GetProjectContentForReference("System.Windows.Forms", typeof(System.Windows.Forms.Form).Module.FullyQualifiedName); DefaultProjectContent dpc = new DefaultProjectContent(); dpc.ReferencedContents.Add(msc); diff --git a/src/Main/Base/Test/NRefactoryResolverTests.cs b/src/Main/Base/Test/NRefactoryResolverTests.cs index 3401c93c27..ed635376fc 100644 --- a/src/Main/Base/Test/NRefactoryResolverTests.cs +++ b/src/Main/Base/Test/NRefactoryResolverTests.cs @@ -29,8 +29,8 @@ namespace ICSharpCode.SharpDevelop.Tests p.Parse(); DefaultProjectContent pc = new DefaultProjectContent(); pc.ReferencedContents.Add(projectContentRegistry.Mscorlib); - pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Core", "System.Core")); - pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Windows.Forms", "System.Windows.Forms")); + pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Core", typeof(System.Linq.Enumerable).Module.FullyQualifiedName )); + pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Windows.Forms", typeof(System.Windows.Forms.Form).Module.FullyQualifiedName )); HostCallback.GetCurrentProjectContent = delegate { return pc; }; @@ -59,8 +59,8 @@ namespace ICSharpCode.SharpDevelop.Tests return pc; }; pc.ReferencedContents.Add(projectContentRegistry.Mscorlib); - pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Windows.Forms", "System.Windows.Forms")); - pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("Microsoft.VisualBasic", "Microsoft.VisualBasic")); + pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("System.Windows.Forms", typeof(System.Windows.Forms.Form).Module.FullyQualifiedName)); + pc.ReferencedContents.Add(projectContentRegistry.GetProjectContentForReference("Microsoft.VisualBasic", typeof(Microsoft.VisualBasic.Constants).Module.FullyQualifiedName)); pc.Language = LanguageProperties.VBNet; lastPC = pc; NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(pc, ICSharpCode.NRefactory.SupportedLanguage.VBNet); diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/CodeSnippetConverterTests.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/CodeSnippetConverterTests.cs index 33c43b79b1..69cf070aa2 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/CodeSnippetConverterTests.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/CodeSnippetConverterTests.cs @@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Tests { referencedContents = new List { SharedProjectContentRegistryForTests.Instance.Mscorlib, - SharedProjectContentRegistryForTests.Instance.GetProjectContentForReference("System", "System") + SharedProjectContentRegistryForTests.Instance.GetProjectContentForReference("System", typeof(Uri).Module.FullyQualifiedName) }; } diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryAstConverterTests.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryAstConverterTests.cs index 89f9c3c546..7ff7d07035 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryAstConverterTests.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryAstConverterTests.cs @@ -308,7 +308,7 @@ Module StringExtensions End Sub End Module"; ICompilationUnit cu = Parse(code, SupportedLanguage.VBNet, SharedProjectContentRegistryForTests.Instance.Mscorlib, - SharedProjectContentRegistryForTests.Instance.GetProjectContentForReference("System.Core", "System.Core")); + SharedProjectContentRegistryForTests.Instance.GetProjectContentForReference("System.Core", typeof(System.Linq.Enumerable).Module.FullyQualifiedName)); Assert.Greater(cu.Classes.Count, 0); Assert.AreEqual("StringExtensions", cu.Classes[0].Name); Assert.AreEqual(ClassType.Module, cu.Classes[0].ClassType);