Browse Source

Fix unit tests - GetProjectContentForReference requires a full path for all assemblies since the special cases were removed.

pull/20/merge
Daniel Grunwald 14 years ago
parent
commit
4f31c4098e
  1. 1
      src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj
  2. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs
  3. 8
      src/AddIns/BackendBindings/VBNetBinding/Test/MockTextEditor.cs
  4. 1
      src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj
  5. 6
      src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs
  6. 2
      src/AddIns/Misc/ResourceToolkit/Test/AbstractTestProjectTestFixture.cs
  7. 4
      src/Main/Base/Test/CodeConverterTests.cs
  8. 1
      src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
  9. 2
      src/Main/Base/Test/MemberLookupHelperTests.cs
  10. 8
      src/Main/Base/Test/NRefactoryResolverTests.cs
  11. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/CodeSnippetConverterTests.cs
  12. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryAstConverterTests.cs

1
src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj

@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="nunit.framework">
<HintPath>..\..\..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>

2
src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs

@ -51,7 +51,7 @@ namespace Grunwald.BooBinding.Tests @@ -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);

8
src/AddIns/BackendBindings/VBNetBinding/Test/MockTextEditor.cs

@ -4,7 +4,7 @@ @@ -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 @@ -35,9 +35,9 @@ namespace ICSharpCode.VBNetBinding.Tests
pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.Mscorlib);
Dictionary<string, string> referencedAssemblies = new Dictionary<string, string>() {
{ "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);

1
src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj

@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
<DebugType>None</DebugType>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>

6
src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs

@ -33,11 +33,11 @@ namespace ICSharpCode.XamlBinding.Tests @@ -33,11 +33,11 @@ namespace ICSharpCode.XamlBinding.Tests
pc.ReferencedContents.Add(AssemblyParserService.DefaultProjectContentRegistry.Mscorlib);
Dictionary<string, string> referencedAssemblies = new Dictionary<string, string>() {
{ "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 }
};

2
src/AddIns/Misc/ResourceToolkit/Test/AbstractTestProjectTestFixture.cs

@ -92,7 +92,7 @@ namespace ResourceToolkit.Tests @@ -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) {

4
src/Main/Base/Test/CodeConverterTests.cs

@ -37,9 +37,9 @@ namespace ICSharpCode.SharpDevelop.Tests @@ -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");

1
src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj

@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>

2
src/Main/Base/Test/MemberLookupHelperTests.cs

@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Tests @@ -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);

8
src/Main/Base/Test/NRefactoryResolverTests.cs

@ -29,8 +29,8 @@ namespace ICSharpCode.SharpDevelop.Tests @@ -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 @@ -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);

2
src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/CodeSnippetConverterTests.cs

@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Tests @@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Tests
{
referencedContents = new List<IProjectContent> {
SharedProjectContentRegistryForTests.Instance.Mscorlib,
SharedProjectContentRegistryForTests.Instance.GetProjectContentForReference("System", "System")
SharedProjectContentRegistryForTests.Instance.GetProjectContentForReference("System", typeof(Uri).Module.FullyQualifiedName)
};
}

2
src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryAstConverterTests.cs

@ -308,7 +308,7 @@ Module StringExtensions @@ -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);

Loading…
Cancel
Save