| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test.services.refactoring.rename_unit_member; | 5 library test.services.refactoring.rename_unit_member; |
| 6 | 6 |
| 7 import 'package:analysis_server/src/protocol.dart'; | 7 import 'package:analysis_server/src/protocol.dart'; |
| 8 import 'package:analysis_testing/reflective_tests.dart'; | 8 import 'package:analysis_testing/reflective_tests.dart'; |
| 9 import 'package:unittest/unittest.dart'; | 9 import 'package:unittest/unittest.dart'; |
| 10 | 10 |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 Test t1 = new Test(); | 339 Test t1 = new Test(); |
| 340 Test t2 = new Test.named(); | 340 Test t2 = new Test.named(); |
| 341 } | 341 } |
| 342 '''); | 342 '''); |
| 343 // configure refactoring | 343 // configure refactoring |
| 344 createRenameRefactoringAtString('Test implements'); | 344 createRenameRefactoringAtString('Test implements'); |
| 345 expect(refactoring.refactoringName, 'Rename Class'); | 345 expect(refactoring.refactoringName, 'Rename Class'); |
| 346 expect(refactoring.oldName, 'Test'); | 346 expect(refactoring.oldName, 'Test'); |
| 347 refactoring.newName = 'NewName'; | 347 refactoring.newName = 'NewName'; |
| 348 // validate change | 348 // validate change |
| 349 return assertSuccessfulRename(''' | 349 return assertSuccessfulRefactoring(''' |
| 350 class NewName implements Other { | 350 class NewName implements Other { |
| 351 NewName() {} | 351 NewName() {} |
| 352 NewName.named() {} | 352 NewName.named() {} |
| 353 } | 353 } |
| 354 class Other { | 354 class Other { |
| 355 factory Other.a() = NewName; | 355 factory Other.a() = NewName; |
| 356 factory Other.b() = NewName.named; | 356 factory Other.b() = NewName.named; |
| 357 } | 357 } |
| 358 main() { | 358 main() { |
| 359 NewName t1 = new NewName(); | 359 NewName t1 = new NewName(); |
| 360 NewName t2 = new NewName.named(); | 360 NewName t2 = new NewName.named(); |
| 361 } | 361 } |
| 362 '''); | 362 '''); |
| 363 } | 363 } |
| 364 | 364 |
| 365 test_createChange_ClassElement_parameterTypeNested() { | 365 test_createChange_ClassElement_parameterTypeNested() { |
| 366 indexTestUnit(''' | 366 indexTestUnit(''' |
| 367 class Test { | 367 class Test { |
| 368 } | 368 } |
| 369 main(f(Test p)) { | 369 main(f(Test p)) { |
| 370 } | 370 } |
| 371 '''); | 371 '''); |
| 372 // configure refactoring | 372 // configure refactoring |
| 373 createRenameRefactoringAtString('Test {'); | 373 createRenameRefactoringAtString('Test {'); |
| 374 expect(refactoring.refactoringName, 'Rename Class'); | 374 expect(refactoring.refactoringName, 'Rename Class'); |
| 375 expect(refactoring.oldName, 'Test'); | 375 expect(refactoring.oldName, 'Test'); |
| 376 refactoring.newName = 'NewName'; | 376 refactoring.newName = 'NewName'; |
| 377 // validate change | 377 // validate change |
| 378 return assertSuccessfulRename(''' | 378 return assertSuccessfulRefactoring(''' |
| 379 class NewName { | 379 class NewName { |
| 380 } | 380 } |
| 381 main(f(NewName p)) { | 381 main(f(NewName p)) { |
| 382 } | 382 } |
| 383 '''); | 383 '''); |
| 384 } | 384 } |
| 385 | 385 |
| 386 test_createChange_ClassElement_typeAlias() { | 386 test_createChange_ClassElement_typeAlias() { |
| 387 indexTestUnit(''' | 387 indexTestUnit(''' |
| 388 class A {} | 388 class A {} |
| 389 class Test = Object with A; | 389 class Test = Object with A; |
| 390 main(Test t) { | 390 main(Test t) { |
| 391 } | 391 } |
| 392 '''); | 392 '''); |
| 393 // configure refactoring | 393 // configure refactoring |
| 394 createRenameRefactoringAtString('Test ='); | 394 createRenameRefactoringAtString('Test ='); |
| 395 expect(refactoring.refactoringName, 'Rename Class'); | 395 expect(refactoring.refactoringName, 'Rename Class'); |
| 396 expect(refactoring.oldName, 'Test'); | 396 expect(refactoring.oldName, 'Test'); |
| 397 refactoring.newName = 'NewName'; | 397 refactoring.newName = 'NewName'; |
| 398 // validate change | 398 // validate change |
| 399 return assertSuccessfulRename(''' | 399 return assertSuccessfulRefactoring(''' |
| 400 class A {} | 400 class A {} |
| 401 class NewName = Object with A; | 401 class NewName = Object with A; |
| 402 main(NewName t) { | 402 main(NewName t) { |
| 403 } | 403 } |
| 404 '''); | 404 '''); |
| 405 } | 405 } |
| 406 | 406 |
| 407 test_createChange_FunctionElement() { | 407 test_createChange_FunctionElement() { |
| 408 indexTestUnit(''' | 408 indexTestUnit(''' |
| 409 test() {} | 409 test() {} |
| 410 foo() {} | 410 foo() {} |
| 411 main() { | 411 main() { |
| 412 print(test); | 412 print(test); |
| 413 print(test()); | 413 print(test()); |
| 414 foo(); | 414 foo(); |
| 415 } | 415 } |
| 416 '''); | 416 '''); |
| 417 // configure refactoring | 417 // configure refactoring |
| 418 createRenameRefactoringAtString('test() {}'); | 418 createRenameRefactoringAtString('test() {}'); |
| 419 expect(refactoring.refactoringName, 'Rename Top-Level Function'); | 419 expect(refactoring.refactoringName, 'Rename Top-Level Function'); |
| 420 expect(refactoring.oldName, 'test'); | 420 expect(refactoring.oldName, 'test'); |
| 421 refactoring.newName = 'newName'; | 421 refactoring.newName = 'newName'; |
| 422 // validate change | 422 // validate change |
| 423 return assertSuccessfulRename(''' | 423 return assertSuccessfulRefactoring(''' |
| 424 newName() {} | 424 newName() {} |
| 425 foo() {} | 425 foo() {} |
| 426 main() { | 426 main() { |
| 427 print(newName); | 427 print(newName); |
| 428 print(newName()); | 428 print(newName()); |
| 429 foo(); | 429 foo(); |
| 430 } | 430 } |
| 431 '''); | 431 '''); |
| 432 } | 432 } |
| 433 | 433 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 test = 1; | 476 test = 1; |
| 477 test += 2; | 477 test += 2; |
| 478 } | 478 } |
| 479 '''); | 479 '''); |
| 480 // configure refactoring | 480 // configure refactoring |
| 481 createRenameRefactoringAtString(search); | 481 createRenameRefactoringAtString(search); |
| 482 expect(refactoring.refactoringName, 'Rename Top-Level Variable'); | 482 expect(refactoring.refactoringName, 'Rename Top-Level Variable'); |
| 483 expect(refactoring.oldName, 'test'); | 483 expect(refactoring.oldName, 'test'); |
| 484 refactoring.newName = 'newName'; | 484 refactoring.newName = 'newName'; |
| 485 // validate change | 485 // validate change |
| 486 return assertSuccessfulRename(''' | 486 return assertSuccessfulRefactoring(''' |
| 487 get newName {} | 487 get newName {} |
| 488 set newName(x) {} | 488 set newName(x) {} |
| 489 main() { | 489 main() { |
| 490 print(newName); | 490 print(newName); |
| 491 newName = 1; | 491 newName = 1; |
| 492 newName += 2; | 492 newName += 2; |
| 493 } | 493 } |
| 494 '''); | 494 '''); |
| 495 } | 495 } |
| 496 | 496 |
| 497 _test_createChange_TopLevelVariableElement(String search) { | 497 _test_createChange_TopLevelVariableElement(String search) { |
| 498 indexTestUnit(''' | 498 indexTestUnit(''' |
| 499 int test = 0; | 499 int test = 0; |
| 500 main() { | 500 main() { |
| 501 print(test); | 501 print(test); |
| 502 test = 1; | 502 test = 1; |
| 503 test += 2; | 503 test += 2; |
| 504 } | 504 } |
| 505 '''); | 505 '''); |
| 506 // configure refactoring | 506 // configure refactoring |
| 507 createRenameRefactoringAtString(search); | 507 createRenameRefactoringAtString(search); |
| 508 expect(refactoring.refactoringName, 'Rename Top-Level Variable'); | 508 expect(refactoring.refactoringName, 'Rename Top-Level Variable'); |
| 509 expect(refactoring.oldName, 'test'); | 509 expect(refactoring.oldName, 'test'); |
| 510 refactoring.newName = 'newName'; | 510 refactoring.newName = 'newName'; |
| 511 // validate change | 511 // validate change |
| 512 return assertSuccessfulRename(''' | 512 return assertSuccessfulRefactoring(''' |
| 513 int newName = 0; | 513 int newName = 0; |
| 514 main() { | 514 main() { |
| 515 print(newName); | 515 print(newName); |
| 516 newName = 1; | 516 newName = 1; |
| 517 newName += 2; | 517 newName += 2; |
| 518 } | 518 } |
| 519 '''); | 519 '''); |
| 520 } | 520 } |
| 521 } | 521 } |
| OLD | NEW |