From 4f473648ee97503c6b4dcbe72845f31e3f8ab7ca Mon Sep 17 00:00:00 2001
From: Artemiy Sartakov <Artemiy.Sartakov@jetbrains.com>
Date: Wed, 25 Sep 2019 15:22:31 +0700
Subject: [PATCH] OptionalToIfInspection: tests for parenthesized expression
 and partial chains (IDEA-CR-52832)

GitOrigin-RevId: cbfa6550167e9dd9e157ab860a6ead486938f2cd
---
 .../quickFix/optionalToIf/afterContext.java        | 11 ++++++++---
 .../quickFix/optionalToIf/beforeContext.java       | 14 +++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/afterContext.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/afterContext.java
index 1623dca40ab4..32d90b72cb26 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/afterContext.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/afterContext.java
@@ -5,14 +5,15 @@ import java.util.*;
 class Test {
 
   private String returnStatement(String in) {
-      if (in != null) return in;
-      return "foo";
+      if (in != null) return (in);
+      return ("foo");
   }
 
   private void assignment(String in) {
     String out = null;
       out = "foo";
-      if (in != null) out = in;
+      String value = (in);
+      if (value != null) out = value;
   }
 
   private void declaration(String in) {
@@ -27,4 +28,8 @@ class Test {
   private void statementWithResult(String in) {
       if (in == null) throw new NullPointerException();
   }
+
+  private String partialChain(Optional<String> optional) {
+    return optional.orElse("foo");
+  }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/beforeContext.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/beforeContext.java
index 8dd044e07801..93cbb226935a 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/beforeContext.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/beforeContext.java
@@ -5,23 +5,27 @@ import java.util.*;
 class Test {
 
   private String returnStatement(String in) {
-    return Optional.ofNullable<caret>(in).orElse("foo");
+    return (Optional.ofNullable<caret>(in).orElse("foo"));
   }
 
   private void assignment(String in) {
     String out = null;
-    out = Optional.ofNullable(in).orElse("foo");
+    out = (Optional.ofNullable((in)).orElse("foo"));
   }
 
   private void declaration(String in) {
-    String out = Optional.ofNullable(in).orElse("foo");
+    String out = (Optional.ofNullable(in).orElse("foo"));
   }
 
   private void statement(String in) {
-    Optional.ofNullable(in).ifPresent(v -> System.out.println(v));
+    (Optional.ofNullable(in).ifPresent(v -> System.out.println(v)));
   }
 
   private void statementWithResult(String in) {
-    Optional.of(in).orElse("foo");
+    (Optional.of(in).orElse("foo"));
+  }
+
+  private String partialChain(Optional<String> optional) {
+    return optional.orElse("foo");
   }
 }
\ No newline at end of file