From 0eecec2cce408fcbaf7f184f2045b220ae2ed4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Fri, 8 Feb 2013 07:26:28 +0100 Subject: [PATCH] Adjusted unit tests to the new invocation resolve result. --- .../CSharp/Resolver/ExtensionMethodTests.cs | 21 ++++++++----------- .../CSharp/Resolver/LinqTests.cs | 4 ++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs index 047e3da60c..4c720fb8b6 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs @@ -51,25 +51,23 @@ namespace XN { } } "; - InvocationResolveResult mrr; - - mrr = Resolve(program.Replace("$", "$a.F(1)$")); - var member = ((IMethod)mrr.Member).ReducedFrom; + var mrr = Resolve(program.Replace("$", "$a.F(1)$")); + var member = mrr.ReducedMethod; 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(program.Replace("$", "$a.F(\"text\")$")); - member = ((IMethod)mrr.Member).ReducedFrom; + member = mrr.ReducedMethod; 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(program.Replace("$", "$b.F(1)$")); Assert.AreEqual("B.F", mrr.Member.FullName); mrr = Resolve(program.Replace("$", "$b.F(\"text\")$")); - member = ((IMethod)mrr.Member).ReducedFrom; + member = mrr.ReducedMethod; 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(program.Replace("$", "$c.F(1)$")); Assert.AreEqual("C.F", mrr.Member.FullName); @@ -146,9 +144,8 @@ public static class XC { "; var rr = Resolve(program); Assert.AreEqual("A[]", rr.Type.ReflectionName); - var member = ((IMethod)rr.Member).ReducedFrom; - Assert.AreEqual("System.Linq.Enumerable.ToArray", member.FullName); - Assert.AreEqual("A", ((SpecializedMethod)member).TypeArguments.Single().ReflectionName); + Assert.AreEqual("System.Linq.Enumerable.ToArray", rr.Member.FullName); + Assert.AreEqual("A", ((IMethod)rr.Member).TypeArguments.Single().ReflectionName); } [Test] diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs index beffba026b..e02a324b20 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs @@ -349,7 +349,7 @@ class TestClass }"; var rr = Resolve(program); Assert.IsFalse(rr.IsError); - var member = ((IMethod)rr.Member).ReducedFrom; + var member = (IMethod)rr.Member; Assert.AreEqual("SelectMany", member.Name); Assert.AreEqual(3, member.Parameters.Count); var typeArguments = ((SpecializedMethod)member).TypeArguments; @@ -372,7 +372,7 @@ class TestClass }"; var rr = Resolve(program); Assert.IsFalse(rr.IsError); - var member = ((IMethod)rr.Member).ReducedFrom; + var member = (IMethod)rr.Member; Assert.AreEqual("SelectMany", member.Name); Assert.AreEqual(3, member.Parameters.Count); var typeArguments = ((SpecializedMethod)member).TypeArguments;