From a1baa62c1bc31bbe1143b146a24dc8563478ab39 Mon Sep 17 00:00:00 2001
From: Alexandr Suhinin <alexandr.suhinin@jetbrains.com>
Date: Wed, 6 May 2020 16:45:05 +0300
Subject: [PATCH] extract method: fix test so they dont test if conditions

GitOrigin-RevId: 7282f25d9aa56643b42f1ef6a279dd1a7bf53a09
---
 .../BuilderChainWith2DimArrayAccess.java      |  4 +++-
 ...BuilderChainWith2DimArrayAccess_after.java |  4 +++-
 .../BuilderChainWithArrayAccessIf.java        |  4 +++-
 .../BuilderChainWithArrayAccessIf_after.java  |  4 +++-
 .../extractMethodNew/DontMissReturn.java      |  5 ++++-
 .../DontMissReturn_after.java                 |  5 ++++-
 .../extractMethodNew/ExitPoints2.java         | 17 ++++++++++-------
 .../extractMethodNew/ExitPoints2_after.java   | 19 +++++++++++--------
 .../ExtractConditionalBreak.java              |  5 ++++-
 .../ExtractConditionalBreak_after.java        |  5 ++++-
 .../ExtractConditionalContinue.java           |  5 ++++-
 .../ExtractConditionalContinue_after.java     |  5 ++++-
 12 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess.java b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess.java
index 4c8b730e589c..67d7cb4b8200 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess.java
@@ -2,8 +2,10 @@ class Foo {
     boolean bar(String[][] a) {
         for (int i = 0; i < a.length; i++)
             for (int j = 0; i < a[i].length; j++) {<selection>
-                if (a[i][j].length() > 3 && i % 3 == 0)
+                if (a[i][j].length() > 3 && i % 3 == 0) {
+                    System.out.println();
                     return true;
+                }
             </selection>
         }
         return false;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess_after.java b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess_after.java
index c04f3fb6da0a..f1c7117e4f12 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWith2DimArrayAccess_after.java
@@ -9,8 +9,10 @@ class Foo {
     }
 
     private boolean newMethod(String[][] a, int i, int j) {
-        if (a[i][j].length() > 3 && i % 3 == 0)
+        if (a[i][j].length() > 3 && i % 3 == 0) {
+            System.out.println();
             return true;
+        }
         return false;
     }
 }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf.java b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf.java
index d5a624418922..1a9d2f37148e 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf.java
@@ -1,8 +1,10 @@
 class Foo {
     boolean bar(String[] a) {
         for (int i = 0; i < a.length; i++) {<selection>
-            if (a[i].length() > 3 && i % 3 == 0)
+            if (a[i].length() > 3 && i % 3 == 0) {
+                System.out.println();
                 return true;
+            }
         </selection>}
         return false;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf_after.java b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf_after.java
index 68d0467f17db..a8475860b08f 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/BuilderChainWithArrayAccessIf_after.java
@@ -7,8 +7,10 @@ class Foo {
     }
 
     private boolean newMethod(String[] a, int i) {
-        if (a[i].length() > 3 && i % 3 == 0)
+        if (a[i].length() > 3 && i % 3 == 0) {
+            System.out.println();
             return true;
+        }
         return false;
     }
 }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn.java b/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn.java
index fe65cb843af4..3aa729a367b2 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn.java
@@ -2,7 +2,10 @@ class Test {
     public void test(int x, int y) {
         while (x < 10) {
             x++;
-            <selection>if (x == y) return;</selection>
+            <selection>if (x == y) {
+                System.out.println();
+                return;
+            }</selection>
         }
         System.out.println();
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn_after.java b/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn_after.java
index d0b42072a852..7af9d3aad27d 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturn_after.java
@@ -8,7 +8,10 @@ class Test {
     }
 
     private boolean newMethod(int x, int y) {
-        if (x == y) return true;
+        if (x == y) {
+            System.out.println();
+            return true;
+        }
         return false;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2.java
index d291d24c451d..ce60bf099bab 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2.java
@@ -1,10 +1,13 @@
 class Test{
-  public void foo() {
-    if (cond1){
-      <selection>if (cond2) return;</selection>
+    public void foo() {
+        if (cond1){
+            <selection>if (cond2) {
+                System.out.println();
+                return;
+            }</selection>
+        }
+        else if (cond3){
+        }
+        x();
     }
-    else if (cond3){
-    }
-    x();
-  }
 }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2_after.java
index 196bcde15a8f..e87d6ce3f259 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints2_after.java
@@ -1,15 +1,18 @@
 class Test{
-  public void foo() {
-    if (cond1){
-        if (newMethod()) return;
+    public void foo() {
+        if (cond1){
+            if (newMethod()) return;
+        }
+        else if (cond3){
+        }
+        x();
     }
-    else if (cond3){
-    }
-    x();
-  }
 
     private boolean newMethod() {
-        if (cond2) return true;
+        if (cond2) {
+            System.out.println();
+            return true;
+        }
         return false;
     }
 }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak.java
index df556d42eacd..778d79408700 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak.java
@@ -2,7 +2,10 @@ class Test {
     public void test(int x, int y) {
         while (x < 10) {
             x++;
-            <selection>if (x == y) break;</selection>
+            <selection>if (x == y) {
+                System.out.println();
+                break;
+            }</selection>
         }
         System.out.println();
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak_after.java
index 07ab3a64417a..52511f47b088 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalBreak_after.java
@@ -8,7 +8,10 @@ class Test {
     }
 
     private boolean newMethod(int x, int y) {
-        if (x == y) return true;
+        if (x == y) {
+            System.out.println();
+            return true;
+        }
         return false;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue.java
index 1cda740cdd71..840953130a22 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue.java
@@ -1,7 +1,10 @@
 class Test {
     public void test(int x, int y) {
         while (x < y) {
-            <selection>if (x == y) continue;</selection>
+            <selection>if (x == y) {
+                System.out.println();
+                continue;
+            }</selection>
             x++;
         }
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue_after.java
index d1b67eff0f78..f979498b2bc0 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConditionalContinue_after.java
@@ -7,7 +7,10 @@ class Test {
     }
 
     private boolean newMethod(int x, int y) {
-        if (x == y) return true;
+        if (x == y) {
+            System.out.println();
+            return true;
+        }
         return false;
     }
 }
\ No newline at end of file