From 2ffe23e57fb3bbcd739dbfb31338b99f35e3af7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 16 Apr 2020 11:45:54 +0200 Subject: [PATCH 1/3] [code samples] ConditionalOperatorConverterTest: cleanup --- .../ConditionalOperatorConverterTest.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java b/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java index 35472080c..7eb3aef27 100644 --- a/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java +++ b/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java @@ -1,22 +1,9 @@ // Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - package org.intellij.sdk.intention; import com.intellij.codeInsight.intention.IntentionAction; -import com.intellij.openapi.application.PathManager; -import com.intellij.testFramework.UsefulTestCase; -import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; -import com.intellij.testFramework.fixtures.*; -import org.junit.*; - -/** - * 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 - */ +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; +import org.junit.Assert; public class ConditionalOperatorConverterTest extends LightJavaCodeInsightFixtureTestCase { @@ -32,7 +19,6 @@ public class ConditionalOperatorConverterTest extends LightJavaCodeInsightFixtur } protected void doTest(String testName, String hint) { - // Messages.showInfoMessage("Test started", "Info"); myFixture.configureByFile(testName + ".java"); final IntentionAction action = myFixture.findSingleIntention(hint); Assert.assertNotNull(action); @@ -40,8 +26,7 @@ public class ConditionalOperatorConverterTest extends LightJavaCodeInsightFixtur myFixture.checkResultByFile(testName + ".after.java"); } - @Test - public void test() { + public void testIntention() { doTest("before.template", "SDK Convert ternary operator to if statement"); } From d26f27a807174a59ccf7ef36941892e17d292e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 16 Apr 2020 11:48:02 +0200 Subject: [PATCH 2/3] [code samples] conditional_operator_intention: use `testData` for test data files --- .../sdk/intention/ConditionalOperatorConverterTest.java | 2 +- .../src/test/{resources => testData}/before.template.after.java | 0 .../src/test/{resources => testData}/before.template.java | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename conditional_operator_intention/src/test/{resources => testData}/before.template.after.java (100%) rename conditional_operator_intention/src/test/{resources => testData}/before.template.java (100%) diff --git a/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java b/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java index 7eb3aef27..670b33ac9 100644 --- a/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java +++ b/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java @@ -15,7 +15,7 @@ public class ConditionalOperatorConverterTest extends LightJavaCodeInsightFixtur */ @Override protected String getTestDataPath() { - return "src/test/resources"; + return "src/test/testData"; } protected void doTest(String testName, String hint) { diff --git a/conditional_operator_intention/src/test/resources/before.template.after.java b/conditional_operator_intention/src/test/testData/before.template.after.java similarity index 100% rename from conditional_operator_intention/src/test/resources/before.template.after.java rename to conditional_operator_intention/src/test/testData/before.template.after.java diff --git a/conditional_operator_intention/src/test/resources/before.template.java b/conditional_operator_intention/src/test/testData/before.template.java similarity index 100% rename from conditional_operator_intention/src/test/resources/before.template.java rename to conditional_operator_intention/src/test/testData/before.template.java From ee3426685eafe85af663f57f9440f07494617a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 16 Apr 2020 11:50:12 +0200 Subject: [PATCH 3/3] [code samples] comparing_references_inspection: use `testData` for test data files --- .../sdk/codeInspection/ComparingReferencesInspectionTest.java | 2 +- .../src/test/{resources => testData}/Eq.after.java | 0 .../src/test/{resources => testData}/Eq.java | 0 .../src/test/{resources => testData}/Neq.after.java | 0 .../src/test/{resources => testData}/Neq.java | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename comparing_references_inspection/src/test/{resources => testData}/Eq.after.java (100%) rename comparing_references_inspection/src/test/{resources => testData}/Eq.java (100%) rename comparing_references_inspection/src/test/{resources => testData}/Neq.after.java (100%) rename comparing_references_inspection/src/test/{resources => testData}/Neq.java (100%) diff --git a/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java b/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java index 78725a58f..a3161bf00 100644 --- a/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java +++ b/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java @@ -24,7 +24,7 @@ public class ComparingReferencesInspectionTest extends LightJavaCodeInsightFixtu */ @Override protected String getTestDataPath() { - return "src/test/resources"; + return "src/test/testData"; } /** diff --git a/comparing_references_inspection/src/test/resources/Eq.after.java b/comparing_references_inspection/src/test/testData/Eq.after.java similarity index 100% rename from comparing_references_inspection/src/test/resources/Eq.after.java rename to comparing_references_inspection/src/test/testData/Eq.after.java diff --git a/comparing_references_inspection/src/test/resources/Eq.java b/comparing_references_inspection/src/test/testData/Eq.java similarity index 100% rename from comparing_references_inspection/src/test/resources/Eq.java rename to comparing_references_inspection/src/test/testData/Eq.java diff --git a/comparing_references_inspection/src/test/resources/Neq.after.java b/comparing_references_inspection/src/test/testData/Neq.after.java similarity index 100% rename from comparing_references_inspection/src/test/resources/Neq.after.java rename to comparing_references_inspection/src/test/testData/Neq.after.java diff --git a/comparing_references_inspection/src/test/resources/Neq.java b/comparing_references_inspection/src/test/testData/Neq.java similarity index 100% rename from comparing_references_inspection/src/test/resources/Neq.java rename to comparing_references_inspection/src/test/testData/Neq.java