Merge pull request JetBrains#105 from JohnHake/master

yole · web-flow · commit a951bfaf9b51 · 2018-08-04T09:54:31.000+02:00
IJSDK-348: Changes so conditional_operator_intention YourTest passes
diff --git a/code_samples/conditional_operator_intention/testData/before.template.after.java b/code_samples/conditional_operator_intention/testData/before.template.after.java
@@ -1,11 +1,11 @@
 public class X {
-  void f(boolean isMale) {
-    String title;
-    if (isMale) {
-      title = "Mr.";
-    } else {
-      title = "Ms.";
+    void f(boolean isMale) {
+        String title;
+        if (isMale) {
+            title = "Mr.";
+        } else {
+            title = "Ms.";
+        }
+        System.out.println("title = " + title);
     }
-    System.out.println("title = " + title);
-  }
 }
diff --git a/code_samples/conditional_operator_intention/testData/before.template.java b/code_samples/conditional_operator_intention/testData/before.template.java
@@ -1,6 +1,6 @@
 public class X {
-  void f(boolean isMale) {
-    String title = isMale <caret>? "Mr." : "Ms.";
-    System.out.println("title = " + title);
-  }
+    void f(boolean isMale) {
+        String title = isMale <caret>? "Mr." : "Ms.";
+        System.out.println("title = " + title);
+    }
 }
diff --git a/code_samples/conditional_operator_intention/testSource/testPlugin/YourTest.java b/code_samples/conditional_operator_intention/testSource/testPlugin/YourTest.java
@@ -5,7 +5,6 @@
 import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
 import com.intellij.testFramework.fixtures.*;
-import junit.framework.Assert;
 import org.junit.*;
 
 /**
@@ -14,6 +13,7 @@
  * Date: Sep 13, 2010
  * Time: 9:35:50 PM
  * To change this template use File | Settings | File Templates.
+ * This test requires Editor > Code Style set to Default IDE
  */
 
 public class YourTest extends UsefulTestCase {
