Browse Source

Attempt to fix IntroduceMethodTests.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6263 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Martin Koníček 16 years ago
parent
commit
837200f577
  1. 21
      src/AddIns/Misc/SharpRefactoring/Test/IntroduceMethodTests.cs

21
src/AddIns/Misc/SharpRefactoring/Test/IntroduceMethodTests.cs

@ -152,10 +152,11 @@ interface ITest {
ExpressionResult expression = FindFullExpressionAtCaret(editor, expressionFinder); ExpressionResult expression = FindFullExpressionAtCaret(editor, expressionFinder);
ResolveResult rr = ResolveExpressionAtCaret(editor, expression); ResolveResult rr = ResolveExpressionAtCaret(editor, expression);
Ast.Expression ex = IntroduceMethod.GetExpressionInContext(rr as UnknownMethodResolveResult, editor); //Ast.Expression ex = GenerateCode.GetExpressionInContext(rr as UnknownMethodResolveResult, editor);
IntroduceMethod method = new IntroduceMethod(); var introduceMethodAction = GenerateCode.GetContextAction(rr, editor);
method.ExecuteIntroduceMethod(rr as UnknownMethodResolveResult, ex, editor, false, null); Assert.IsNotNull(introduceMethodAction);
introduceMethodAction.Execute();// .ExecuteIntroduceMethod(rr as UnknownMethodResolveResult, ex, editor, false, null);
Assert.AreEqual(simpleStart + definitions + call + expected + simpleEnd, editor.Document.Text); Assert.AreEqual(simpleStart + definitions + call + expected + simpleEnd, editor.Document.Text);
} }
@ -176,10 +177,9 @@ interface ITest {
ExpressionResult expression = FindFullExpressionAtCaret(editor, expressionFinder); ExpressionResult expression = FindFullExpressionAtCaret(editor, expressionFinder);
ResolveResult rr = ResolveExpressionAtCaret(editor, expression); ResolveResult rr = ResolveExpressionAtCaret(editor, expression);
Ast.Expression ex = IntroduceMethod.GetExpressionInContext(rr as UnknownMethodResolveResult, editor); var introduceMethodAction = GenerateCode.GetContextAction(rr, editor);
Assert.IsNotNull(introduceMethodAction);
IntroduceMethod method = new IntroduceMethod(); introduceMethodAction.Execute(); //ExecuteIntroduceMethod(rr as UnknownMethodResolveResult, ex, editor, false, null);
method.ExecuteIntroduceMethod(rr as UnknownMethodResolveResult, ex, editor, false, null);
Assert.AreEqual(otherClassStart + existingDefinitions + expected + otherClassEnd + simpleStart + definitions + call + simpleEnd, editor.Document.Text); Assert.AreEqual(otherClassStart + existingDefinitions + expected + otherClassEnd + simpleStart + definitions + call + simpleEnd, editor.Document.Text);
} }
@ -200,10 +200,9 @@ interface ITest {
ExpressionResult expression = FindFullExpressionAtCaret(editor, expressionFinder); ExpressionResult expression = FindFullExpressionAtCaret(editor, expressionFinder);
ResolveResult rr = ResolveExpressionAtCaret(editor, expression); ResolveResult rr = ResolveExpressionAtCaret(editor, expression);
Ast.Expression ex = IntroduceMethod.GetExpressionInContext(rr as UnknownMethodResolveResult, editor); var introduceMethodAction = GenerateCode.GetContextAction(rr, editor);
Assert.IsNotNull(introduceMethodAction);
IntroduceMethod method = new IntroduceMethod(); introduceMethodAction.Execute(); //ExecuteIntroduceMethod(rr as UnknownMethodResolveResult, ex, editor, false, null);
method.ExecuteIntroduceMethod(rr as UnknownMethodResolveResult, ex, editor, false, null);
Assert.AreEqual(interfaceStart + existingDefinitions + expected + interfaceEnd + simpleStart + definitions + call + simpleEnd, editor.Document.Text); Assert.AreEqual(interfaceStart + existingDefinitions + expected + interfaceEnd + simpleStart + definitions + call + simpleEnd, editor.Document.Text);
} }

Loading…
Cancel
Save