Java surrounders: if and not surrounder should be able to handle java.lang

.Boolean expressions

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithIf.java

@@ -0,0 +1,9 @@
+class Test {
+  boolean foo() {
+    return null;
+  }
+  
+  void bar() {
+    <selection>foo()</selection>
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithIfForBoxedBooleans.java

@@ -0,0 +1,11 @@
+import java.lang.Boolean;
+
+class Test {
+  Boolean foo() {
+    return null;
+  }
+  
+  void bar() {
+    <selection>foo()</selection>
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithIfForBoxedBooleans_after.java

@@ -0,0 +1,13 @@
+import java.lang.Boolean;
+
+class Test {
+  Boolean foo() {
+    return null;
+  }
+  
+  void bar() {
+      if (foo()) {
+          
+      }
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithIf_after.java

@@ -0,0 +1,11 @@
+class Test {
+  boolean foo() {
+    return null;
+  }
+  
+  void bar() {
+      if (foo()) {
+          
+      }
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithNotForBoxedBooleans.java

@@ -0,0 +1,11 @@
+import java.lang.Boolean;
+
+class Test {
+  Boolean foo() {
+    return null;
+  }
+  
+  void bar() {
+    <selection>foo()</selection>
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithNotForBoxedBooleans_after.java

@@ -0,0 +1,11 @@
+import java.lang.Boolean;
+
+class Test {
+  Boolean foo() {
+    return null;
+  }
+  
+  void bar() {
+      !(foo())
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java

@@ -130,6 +130,21 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
     TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
     doTest(getTestName(false), new JavaWithNullCheckSurrounder());
   }
+  
+  public void testSurroundExpressionWithIf() {
+    TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
+    doTest(getTestName(false), new JavaWithIfExpressionSurrounder());
+  }
+
+  public void testSurroundExpressionWithIfForBoxedBooleans() {
+    TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
+    doTest(getTestName(false), new JavaWithIfExpressionSurrounder());
+  }
+  
+  public void testSurroundExpressionWithNotForBoxedBooleans() {
+    TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
+    doTest(getTestName(false), new JavaWithNotSurrounder());
+  }
 
   private void doTest(@NotNull String fileName, final Surrounder surrounder) {
     configureByFile(BASE_PATH + fileName + ".java");