mirror of
https://github.com/JetBrains/intellij-sdk-code-samples.git
synced 2025-07-29 09:47:50 +08:00
Merge remote-tracking branch 'remotes/upstream/master'
# Conflicts: # code_samples/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java
This commit is contained in:
commit
68e189084c
@ -4,25 +4,6 @@ package org.intellij.sdk.intention;
|
|||||||
import com.intellij.codeInsight.intention.IntentionAction;
|
import com.intellij.codeInsight.intention.IntentionAction;
|
||||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
|
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by IntelliJ IDEA.
|
|
||||||
* User: Alexey.Chursin
|
|
||||||
* 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
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by IntelliJ IDEA.
|
|
||||||
* User: Alexey.Chursin
|
|
||||||
* 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 ConditionalOperatorConverterTest extends LightJavaCodeInsightFixtureTestCase {
|
public class ConditionalOperatorConverterTest extends LightJavaCodeInsightFixtureTestCase {
|
||||||
|
|
||||||
@ -45,8 +26,7 @@ public class ConditionalOperatorConverterTest extends LightJavaCodeInsightFixtur
|
|||||||
myFixture.checkResultByFile(testName + ".after.java");
|
myFixture.checkResultByFile(testName + ".after.java");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
public void testIntention() {
|
||||||
public void test() {
|
|
||||||
doTest("before.template", "SDK Convert ternary operator to if statement");
|
doTest("before.template", "SDK Convert ternary operator to if statement");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user