1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587
|
//
// ExtractMethodTests.cs
//
// Author:
// Mike Krüger <mkrueger@xamarin.com>
//
// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using NUnit.Framework;
using ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod;
namespace ICSharpCode.NRefactory.CSharp.CodeActions
{
[TestFixture]
public class ExtractMethodTests : ContextActionTestBase
{
[Test]
public void SimpleArgument()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
int i = 5;
<-Console.WriteLine (i);->
}
}
", @"class TestClass
{
static void NewMethod (int i)
{
Console.WriteLine (i);
}
void TestMethod ()
{
int i = 5;
NewMethod (i);
}
}
");
}
[Test]
public void NoArgument()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
int i = 5;
<-Console.WriteLine (""Hello World"");->
}
}
", @"class TestClass
{
static void NewMethod ()
{
Console.WriteLine (""Hello World"");
}
void TestMethod ()
{
int i = 5;
NewMethod ();
}
}
");
}
[Test]
public void ExtractMethodResultStatementTest()
{
Test<ExtractMethodAction>(@"class TestClass
{
int member = 5;
void TestMethod ()
{
int i = 5;
<-i = member + 1;->
Console.WriteLine (i);
}
}
", @"class TestClass
{
int member = 5;
void NewMethod (ref int i)
{
i = member + 1;
}
void TestMethod ()
{
int i = 5;
NewMethod (ref i);
Console.WriteLine (i);
}
}
");
}
[Test]
public void ExtractMethodResultExpressionTest()
{
Test<ExtractMethodAction>(@"class TestClass
{
int member = 5;
void TestMethod ()
{
int i = <-member + 1->;
Console.WriteLine (i);
}
}
", @"class TestClass
{
int member = 5;
int NewMethod ()
{
return member + 1;
}
void TestMethod ()
{
int i = NewMethod ();
Console.WriteLine (i);
}
}
");
}
[Test]
public void ExtractMethodStaticResultStatementTest()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
int i = 5;
<-i = i + 1;->
Console.WriteLine (i);
}
}
", @"class TestClass
{
static void NewMethod (ref int i)
{
i = i + 1;
}
void TestMethod ()
{
int i = 5;
NewMethod (ref i);
Console.WriteLine (i);
}
}
");
}
[Test]
public void ExtractMethodStaticResultExpressionTest()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
int i = <-5 + 1->;
Console.WriteLine (i);
}
}
", @"class TestClass
{
static int NewMethod ()
{
return 5 + 1;
}
void TestMethod ()
{
int i = NewMethod ();
Console.WriteLine (i);
}
}
");
}
[Test]
public void ExtractMethodMultiVariableTest()
{
Test<ExtractMethodAction>(@"class TestClass
{
int member;
void TestMethod ()
{
int i = 5, j = 10, k;
<-j = i + j;
k = j + member;->
Console.WriteLine (k + j);
}
}
", @"class TestClass
{
int member;
void NewMethod (int i, ref int j, out int k)
{
j = i + j;
k = j + member;
}
void TestMethod ()
{
int i = 5, j = 10, k;
NewMethod (i, ref j, out k);
Console.WriteLine (k + j);
}
}
");
}
/// <summary>
/// Bug 607990 - "Extract Method" refactoring sometimes tries to pass in unnecessary parameter depending on selection
/// </summary>
[Test]
public void TestBug607990()
{
Test<ExtractMethodAction>(@"using System;
class TestClass
{
void TestMethod ()
{
<-Object obj1 = new Object();
obj1.ToString();->
}
}
", @"using System;
class TestClass
{
static void NewMethod ()
{
Object obj1 = new Object ();
obj1.ToString ();
}
void TestMethod ()
{
NewMethod ();
}
}
");
}
/// <summary>
/// Bug 616193 - Extract method passes param with does not exists any more in main method
/// </summary>
[Test]
public void TestBug616193()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
string ret;
string x;
int y;
<-string z = ret + y;
ret = x + z;->
}
}
", @"class TestClass
{
static void NewMethod (out string ret, string x, int y)
{
string z = ret + y;
ret = x + z;
}
void TestMethod ()
{
string ret;
string x;
int y;
NewMethod (out ret, x, y);
}
}
");
}
/// <summary>
/// Bug 616199 - Extract method forgets to return a local var which is used in main method
/// </summary>
[Test]
public void TestBug616199()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
<-string z = ""test"" + ""x"";->
string ret = ""test1"" + z;
}
}
", @"class TestClass
{
static string NewMethod ()
{
string z = ""test"" + ""x"";
return z;
}
void TestMethod ()
{
var z = NewMethod ();
string ret = ""test1"" + z;
}
}
");
}
/// <summary>
/// Bug 666271 - "Extract Method" on single line adds two semi-colons in method, none in replaced text
/// </summary>
[Test]
public void TestBug666271()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
<-TestMethod ();->
}
}
", @"class TestClass
{
void NewMethod ()
{
TestMethod ();
}
void TestMethod ()
{
NewMethod ();
}
}
");
}
/// <summary>
/// Bug 693944 - Extracted method returns void instead of the correct type
/// </summary>
[Test]
public void TestBug693944()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
TestMethod (<-""Hello""->);
}
}
", @"class TestClass
{
static string NewMethod ()
{
return ""Hello"";
}
void TestMethod ()
{
TestMethod (NewMethod ());
}
}
");
}
[Ignore("Fix me!")]
[Test]
public void ExtractMethodMultiVariableWithLocalReturnVariableTest()
{
Test<ExtractMethodAction>(@"class TestClass
{
int member;
void TestMethod ()
{
int i = 5, j = 10, k;
<-int test;
j = i + j;
k = j + member;
test = i + j + k;->
Console.WriteLine (test);
}
}
", @"class TestClass
{
int member;
void NewMethod (int i, ref int j, out int k, out int test)
{
j = i + j;
k = j + member;
test = i + j + k;
}
void TestMethod ()
{
int i = 5, j = 10, k;
int test;
NewMethod (i, ref j, out k, out test);
Console.WriteLine (test);
}
}
");
}
/// <summary>
/// Bug 8835 - missing "extract method" in the code editor
/// </summary>
[Test]
public void TestBug8835 ()
{
Test<ExtractMethodAction>(@"class TestClass
{
void TestMethod ()
{
<-// comment
Foo ();->
}
}
", @"class TestClass
{
static void NewMethod ()
{
// comment
Foo ();
}
void TestMethod ()
{
NewMethod ();
}
}
");
}
/// <summary>
/// Bug 9881 - Extract method is broken
/// </summary>
[Test]
public void TestBug9881()
{
Test<ExtractMethodAction>(@"using System.Linq;
class TestClass
{
void Foo ()
{
var val = Enumerable.Range (0, 10).ToList ();
<-for (int j = 0; j < val.Count; j++) {
int i = val [j];
Console.WriteLine (i);
}->
foreach (var i in val) {
Console.WriteLine (i + 2);
}
}
}", @"using System.Linq;
class TestClass
{
static void NewMethod (System.Collections.Generic.List<int> val)
{
for (int j = 0; j < val.Count; j++) {
int i = val [j];
Console.WriteLine (i);
}
}
void Foo ()
{
var val = Enumerable.Range (0, 10).ToList ();
NewMethod (val);
foreach (var i in val) {
Console.WriteLine (i + 2);
}
}
}");
}
[Test]
public void TestStaticSimpleExtractMethodFromExpression ()
{
Test<ExtractMethodAction> (@"class TestClass
{
public static void TestMethod ()
{
int i;
var f = <-i % 5 == 0->;
}
}", @"class TestClass
{
static bool NewMethod (int i)
{
return i % 5 == 0;
}
public static void TestMethod ()
{
int i;
var f = NewMethod (i);
}
}");
}
/// <summary>
/// Bug 10858 - Extract Method should use return, not out
/// </summary>
[Test]
[Ignore ("FIXME")]
public void TestBug10858 ()
{
Test<ExtractMethodAction> (@"class TestClass
{
public static void TestMethod ()
{
int i = 5, j, k = 7;
<-j = i + k;->
System.Console.WriteLine (j);
}
}", @"class TestClass
{
static int NewMethod (int i, int k)
{
int j;
j = i + k;
return j
}
public static void TestMethod ()
{
int i = 5, j, k = 7;
j = NewMethod (i, k);
System.Console.WriteLine (j);
}
}");
}
/// <summary>
/// Bug 13054 - Extract method creates params on new method for params declared on lambdas in method body
/// </summary>
[Test]
public void TestBug13054 ()
{
Test<ExtractMethodAction> (@"class TestClass
{
public static void TestMethod ()
{
<-int i = 0;
Action<string> action = (str) => {
Console.WriteLine (str);
};->
}
}", @"class TestClass
{
static void NewMethod ()
{
int i = 0;
Action<string> action = str => {
Console.WriteLine (str);
};
}
public static void TestMethod ()
{
NewMethod ();
}
}");
}
}
}
|