diff options
| author | Noopur Gupta | 2019-04-22 08:57:32 +0000 |
|---|---|---|
| committer | Noopur Gupta | 2019-04-22 08:57:46 +0000 |
| commit | c4aea0588954b9382f470c6cdf082daa4421b5d1 (patch) | |
| tree | 0b54f1bf85c213795c1bf1b6081f22a2f77f3eff | |
| parent | eabd059a8747d8a367a9daf461d5ab0c0979eda1 (diff) | |
| download | eclipse.jdt.ui-c4aea0588954b9382f470c6cdf082daa4421b5d1.tar.gz eclipse.jdt.ui-c4aea0588954b9382f470c6cdf082daa4421b5d1.tar.xz eclipse.jdt.ui-c4aea0588954b9382f470c6cdf082daa4421b5d1.zip | |
Bug 545112: Tests - [12][extract method] Incorrect extract of switch
case node
Change-Id: I0b15ffa89e34c09ad34e0df4994bd5d259b64d37
3 files changed, 35 insertions, 4 deletions
diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection12/A_testSwitchExpr2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection12/A_testSwitchExpr2.java new file mode 100644 index 0000000000..cb3d559b5d --- /dev/null +++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection12/A_testSwitchExpr2.java @@ -0,0 +1,20 @@ +package try12_in;
+
+public class A_testSwitchExpr1 {
+ String foo(Day day) {
+ int x = 0;
+ var today = switch(day){
+ /*]*/case SATURDAY, SUNDAY:/*[*/ break "Weekend day";
+ case MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY: {
+ var kind = "Working day";
+ break kind;
+ }
+ default: {
+ var kind = day.name();
+ System.out.println(kind + x);
+ throw new IllegalArgumentException("Invalid day: " + kind);
+ }
+ };
+ return today;
+ }
+}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup12.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup12.java index aa849fe302..1cf485acca 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup12.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup12.java @@ -23,6 +23,7 @@ import junit.framework.Test; public class ExtractMethodTestSetup12 extends Java12Setup {
private IPackageFragment fTry12Package;
+ private IPackageFragment fInvalidSelectionPackage;
public ExtractMethodTestSetup12(Test test) {
super(test);
@@ -36,9 +37,14 @@ public class ExtractMethodTestSetup12 extends Java12Setup { IPackageFragmentRoot root= getDefaultSourceFolder();
fTry12Package= root.createPackageFragment("try12_in", true, null);
+ fInvalidSelectionPackage= root.createPackageFragment("invalidSelection12", true, null);
}
public IPackageFragment getTry12Package() {
return fTry12Package;
}
+
+ public IPackageFragment getInvalidSelectionPackage() {
+ return fInvalidSelectionPackage;
+ }
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests12.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests12.java index 2c28a28d22..0ed4656522 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests12.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests12.java @@ -32,16 +32,21 @@ public class ExtractMethodTests12 extends ExtractMethodTests { return fgTestSetup;
}
+ @Override
+ protected void invalidSelectionTest() throws Exception {
+ performTest(fgTestSetup.getInvalidSelectionPackage(), "A", INVALID_SELECTION, null);
+ }
+
protected void try12Test() throws Exception {
performTest(fgTestSetup.getTry12Package(), "A", COMPARE_WITH_OUTPUT, "try12_out");
}
- //====================================================================================
- // Testing var type
- //====================================================================================
-
public void testSwitchExpr1() throws Exception {
try12Test();
}
+ public void testSwitchExpr2() throws Exception {
+ invalidSelectionTest();
+ }
+
}
|