Browse Source

Adjusted unit tests to the new invocation resolve result.

pull/32/merge
Mike Krüger 13 years ago
parent
commit
0eecec2cce
  1. 21
      ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs
  2. 4
      ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs

21
ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs

@ -51,25 +51,23 @@ namespace XN {
} }
} }
"; ";
InvocationResolveResult mrr; var mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$a.F(1)$"));
var member = mrr.ReducedMethod;
mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$a.F(1)$"));
var member = ((IMethod)mrr.Member).ReducedFrom;
Assert.AreEqual("XN.XC.F", member.FullName); Assert.AreEqual("XN.XC.F", member.FullName);
Assert.AreEqual("System.Int32", member.Parameters [1].Type.FullName); Assert.AreEqual("System.Int32", member.Parameters [0].Type.FullName);
mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$a.F(\"text\")$")); mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$a.F(\"text\")$"));
member = ((IMethod)mrr.Member).ReducedFrom; member = mrr.ReducedMethod;
Assert.AreEqual("XN.XC.F", member.FullName); Assert.AreEqual("XN.XC.F", member.FullName);
Assert.AreEqual("System.String", member.Parameters[1].Type.FullName); Assert.AreEqual("System.String", member.Parameters[0].Type.FullName);
mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$b.F(1)$")); mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$b.F(1)$"));
Assert.AreEqual("B.F", mrr.Member.FullName); Assert.AreEqual("B.F", mrr.Member.FullName);
mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$b.F(\"text\")$")); mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$b.F(\"text\")$"));
member = ((IMethod)mrr.Member).ReducedFrom; member = mrr.ReducedMethod;
Assert.AreEqual("XN.XC.F", member.FullName); Assert.AreEqual("XN.XC.F", member.FullName);
Assert.AreEqual("System.String", member.Parameters[1].Type.FullName); Assert.AreEqual("System.String", member.Parameters[0].Type.FullName);
mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$c.F(1)$")); mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$c.F(1)$"));
Assert.AreEqual("C.F", mrr.Member.FullName); Assert.AreEqual("C.F", mrr.Member.FullName);
@ -146,9 +144,8 @@ public static class XC {
"; ";
var rr = Resolve<CSharpInvocationResolveResult>(program); var rr = Resolve<CSharpInvocationResolveResult>(program);
Assert.AreEqual("A[]", rr.Type.ReflectionName); Assert.AreEqual("A[]", rr.Type.ReflectionName);
var member = ((IMethod)rr.Member).ReducedFrom; Assert.AreEqual("System.Linq.Enumerable.ToArray", rr.Member.FullName);
Assert.AreEqual("System.Linq.Enumerable.ToArray", member.FullName); Assert.AreEqual("A", ((IMethod)rr.Member).TypeArguments.Single().ReflectionName);
Assert.AreEqual("A", ((SpecializedMethod)member).TypeArguments.Single().ReflectionName);
} }
[Test] [Test]

4
ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs

@ -349,7 +349,7 @@ class TestClass
}"; }";
var rr = Resolve<CSharpInvocationResolveResult>(program); var rr = Resolve<CSharpInvocationResolveResult>(program);
Assert.IsFalse(rr.IsError); Assert.IsFalse(rr.IsError);
var member = ((IMethod)rr.Member).ReducedFrom; var member = (IMethod)rr.Member;
Assert.AreEqual("SelectMany", member.Name); Assert.AreEqual("SelectMany", member.Name);
Assert.AreEqual(3, member.Parameters.Count); Assert.AreEqual(3, member.Parameters.Count);
var typeArguments = ((SpecializedMethod)member).TypeArguments; var typeArguments = ((SpecializedMethod)member).TypeArguments;
@ -372,7 +372,7 @@ class TestClass
}"; }";
var rr = Resolve<CSharpInvocationResolveResult>(program); var rr = Resolve<CSharpInvocationResolveResult>(program);
Assert.IsFalse(rr.IsError); Assert.IsFalse(rr.IsError);
var member = ((IMethod)rr.Member).ReducedFrom; var member = (IMethod)rr.Member;
Assert.AreEqual("SelectMany", member.Name); Assert.AreEqual("SelectMany", member.Name);
Assert.AreEqual(3, member.Parameters.Count); Assert.AreEqual(3, member.Parameters.Count);
var typeArguments = ((SpecializedMethod)member).TypeArguments; var typeArguments = ((SpecializedMethod)member).TypeArguments;

Loading…
Cancel
Save