From c7b05d5f55d07cc602d1405782e4722b60afc310 Mon Sep 17 00:00:00 2001 From: Alexandr Suhinin Date: Mon, 30 Mar 2020 17:54:21 +0300 Subject: [PATCH] [extract method] fix test data GitOrigin-RevId: 4d64e2fced6e7b3c87b1361de36909fec8d7db0a --- .../ClassReference_after.java | 2 +- .../extractMethodNew/ExitPoints6.java | 2 +- .../extractMethodNew/ExitPoints6_after.java | 19 +++++++++++++++ .../extractMethodNew/NormalExitTry.java | 24 +++++++++---------- .../extractMethodNew/NormalExitTry_after.java | 19 +++++++-------- ...alifyWhenConflictingNamePresent_after.java | 2 +- .../extractMethodNew/SCR15815_after.java | 5 ++-- .../extractMethodNew/SCR27887_after.java | 7 ++++-- .../refactoring/ExtractMethodNewTest.java | 2 +- 9 files changed, 51 insertions(+), 31 deletions(-) create mode 100644 java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java index 87324962ce5d..7f0cf0808701 100644 --- a/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java +++ b/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java @@ -10,7 +10,7 @@ class C { } @NotNull - private Object newMethod() { + private A newMethod() { return A.getInstance(); } } diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6.java index b0887cb7c497..7738a9e9eabe 100644 --- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6.java +++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6.java @@ -1,4 +1,4 @@ -// multiple output values: one for modelling control flow + output value +// nullable variable with flow statement class K { int f(Object o) { if (o == null) return 0; diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java new file mode 100644 index 000000000000..8bba01ef5c9f --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java @@ -0,0 +1,19 @@ +import org.jetbrains.annotations.Nullable; + +// nullable variable with flow statement +class K { + int f(Object o) { + o = newMethod(o); + if (o == null) return 0; + Object oo = o; + + return 1; + } + + @Nullable + private Object newMethod(Object o) { + if (o == null) return null; + o = new Object(); + return o; + } +} diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry.java b/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry.java index d170445f5624..e5cd2edcf812 100644 --- a/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry.java +++ b/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry.java @@ -1,17 +1,17 @@ class Test { - private static void f(boolean a, boolean b) { - if (a) { - try { - System.out.println(); - return; - } - catch (Exception e) { - return; - } - } else { - System.out.println(""); + private static void f(boolean a, boolean b) { + if (a) { + try { + System.out.println(); + return; + } + catch (Exception e) { + return; + } + } else { + System.out.println(""); + } } - } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry_after.java index 9f0a21499dbb..98d41459dced 100644 --- a/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry_after.java +++ b/java/java-tests/testData/refactoring/extractMethodNew/NormalExitTry_after.java @@ -1,21 +1,20 @@ class Test { - private static void f(boolean a, boolean b) { - if (a) { - newMethod(); - return; - } else { - System.out.println(""); + private static void f(boolean a, boolean b) { + if (a) { + newMethod(); + } else { + System.out.println(""); + } } - } private static void newMethod() { try { - System.out.println(); - return; + System.out.println(); + return; } catch (Exception e) { - return; + return; } } diff --git a/java/java-tests/testData/refactoring/extractMethodNew/QualifyWhenConflictingNamePresent_after.java b/java/java-tests/testData/refactoring/extractMethodNew/QualifyWhenConflictingNamePresent_after.java index 8892139ce8c5..29b214be2e9a 100644 --- a/java/java-tests/testData/refactoring/extractMethodNew/QualifyWhenConflictingNamePresent_after.java +++ b/java/java-tests/testData/refactoring/extractMethodNew/QualifyWhenConflictingNamePresent_after.java @@ -9,7 +9,7 @@ class B { } } - private void newMethod() { + private static void newMethod() { System.out.println(); } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java b/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java index 9d0877031ae0..a2fd5cfe52ec 100644 --- a/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java +++ b/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java @@ -6,13 +6,12 @@ public class Foo { public String toString() { return newMethod(); } - }; + }, + f2 = new Foo(){}; @NotNull private static String newMethod() { return "a" + "b"; } - static Foo f2 = new Foo(){}; - } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java b/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java index b2e5e3348534..784e6a7d0704 100644 --- a/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java +++ b/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java @@ -1,5 +1,7 @@ package extractMethod; +import org.jetbrains.annotations.NotNull; + import java.io.*; import java.util.Iterator; @@ -7,9 +9,9 @@ public class SCR27887 { public int publishx(OutputStream out, boolean includeCode) throws IOException { if (VERBOSE) System.err.println("PUBLISH: publishing subsystem '" + subsystem.refQualifiedIdentifyingName() + "' with" + (includeCode ? "" : "out") + " code"); ZippingXMLGeneratorFactory genFac = new ZippingXMLGeneratorFactory(out); -//======== + //======== RefObjectUList included = newMethod(genFac); -//======== + //======== if (includeCode) { for (Iterator i = subsystem.getModule().iterator(); i.hasNext();) { OptimalModule module = (OptimalModule) i.next(); @@ -35,6 +37,7 @@ public class SCR27887 { return included.size(); } + @NotNull private RefObjectUList newMethod(ZippingXMLGeneratorFactory genFac) { RefObjectUList included = makeIncludedSet(); if (!included.isEmpty()) { diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java index 21ae4a18eb1a..20767c8293c4 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java @@ -73,7 +73,7 @@ public class ExtractMethodNewTest extends LightJavaCodeInsightTestCase { } public void testExitPoints6() throws Exception { - doExitPointsTest(false); + doTest(); } public void testExitPoints7() throws Exception {