MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

+ use JUnit4 test runner

Browse Source 
GitOrigin-RevId: a13f13a46a4066867174eb509428f4ea6c5a70ae
This commit is contained in:
adelf
2022-03-01 04:54:58 +03:00
committed by intellij-monorepo-bot
parent 707f3f676b
commit ea70b361d2
17 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/env-files-support/build.gradle.kts
View File

@@ -32,15 +32,15 @@ sourceSets {
}
intellij {
version.set("IU-221.3427.89-EAP-SNAPSHOT")
version.set("IU-221.4501.155-EAP-SNAPSHOT")
plugins.set(
listOf(
"com.jetbrains.php:221.3427.92",
"com.jetbrains.php:221.4501.163",
"yaml",
"org.jetbrains.plugins.go:221.3427.89",
"org.jetbrains.plugins.go:221.4501.155",
"Docker",
"pythonid:221.3427.93",
"org.jetbrains.plugins.ruby:221.3427.89",
"pythonid:221.4501.155",
"org.jetbrains.plugins.ruby:221.4501.155",
"Kotlin",
"coverage",
"CSS",

4
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/api/EnvironmentVariablesApi.java
View File

@@ -57,7 +57,9 @@ public class EnvironmentVariablesApi {
return true;
}, project);
return keyValues.size() > 0 ? keyValues : secondaryKeyValues;
secondaryKeyValues.putAll(keyValues);
return secondaryKeyValues;
}
/**

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/DotEnvLightCodeInsightFixtureTestCase.java
View File

@@ -7,6 +7,8 @@ import com.intellij.testFramework.fixtures.BasePlatformTestCase;
import com.intellij.util.indexing.FileBasedIndexImpl;
import com.intellij.util.indexing.ID;
import org.jetbrains.annotations.NotNull;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import ru.adelf.idea.dotenv.api.EnvironmentVariablesApi;
import ru.adelf.idea.dotenv.indexing.DotEnvKeyValuesIndex;
@@ -16,6 +18,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
/**
* Copy of LaravelLightCodeInsightFixtureTestCase from laravel plugin
*/
@RunWith(JUnit4.class)
public abstract class DotEnvLightCodeInsightFixtureTestCase extends BasePlatformTestCase {
protected String basePath = "src/test/java/ru/adelf/idea/dotenv/tests/";

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/completions/BaseCompletionsTest.java
View File

@@ -7,6 +7,7 @@ abstract class BaseCompletionsTest extends DotEnvLightCodeInsightFixtureTestCase
public void setUp() throws Exception {
super.setUp();
myFixture.copyFileToProject(".env");
myFixture.copyFileToProject(".env.example");
}
protected String getTestDataPath() {
@@ -14,6 +15,6 @@ abstract class BaseCompletionsTest extends DotEnvLightCodeInsightFixtureTestCase
}
protected void assertEnvCompletions() {
assertCompletion("ENV_KEY1", "ENV_KEY2");
assertCompletion("ENV_KEY1", "ENV_KEY2", "ENV_KEY_EXAMPLE");
}
}

20
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/completions/CompletionValuesTest.java Normal file
View File

@@ -0,0 +1,20 @@
package ru.adelf.idea.dotenv.tests.completions;
import org.junit.Test;
import ru.adelf.idea.dotenv.api.EnvironmentVariablesApi;
public class CompletionValuesTest extends BaseCompletionsTest {
@Test
public void testEnvFunction() {
var keyValues = EnvironmentVariablesApi.getAllKeyValues(getProject());
assertTrue(keyValues.containsKey("ENV_KEY1"));
assertEquals("1", keyValues.get("ENV_KEY1"));
assertTrue(keyValues.containsKey("ENV_KEY2"));
assertEquals("2", keyValues.get("ENV_KEY2"));
assertTrue(keyValues.containsKey("ENV_KEY_EXAMPLE"));
assertEquals("3", keyValues.get("ENV_KEY_EXAMPLE"));
}
}

5
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/completions/PhpCompletionsTest.java
View File

@@ -1,26 +1,31 @@
package ru.adelf.idea.dotenv.tests.completions;
import com.jetbrains.php.lang.PhpFileType;
import org.junit.Test;
public class PhpCompletionsTest extends BaseCompletionsTest {
@Test
public void testEnvFunction() {
myFixture.configureByText(PhpFileType.INSTANCE, "<?php env('<caret>')");
assertEnvCompletions();
}
@Test
public void testGetEnvFunction() {
myFixture.configureByText(PhpFileType.INSTANCE, "<?php getenv('<caret>')");
assertEnvCompletions();
}
@Test
public void testEnvArray() {
myFixture.configureByText(PhpFileType.INSTANCE, "<?php $_ENV['<caret>'];");
assertEnvCompletions();
}
@Test
public void testServerArray() {
myFixture.configureByText(PhpFileType.INSTANCE, "<?php $_SERVER['<caret>'];");

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/completions/PhpUnitXmlCompletionsTest.java
View File

@@ -1,6 +1,9 @@
package ru.adelf.idea.dotenv.tests.completions;
import org.junit.Test;
public class PhpUnitXmlCompletionsTest extends BaseCompletionsTest {
@Test
public void testCompletion() {
myFixture.configureByFile("phpunit.xml");

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/completions/fixtures/.env.example Normal file
View File

@@ -0,0 +1,3 @@
ENV_KEY1=4
ENV_KEY2=5
ENV_KEY_EXAMPLE=3

11
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/DotEnvFileTest.java
View File

@@ -1,5 +1,6 @@
package ru.adelf.idea.dotenv.tests.dotenv;
import org.junit.Test;
import ru.adelf.idea.dotenv.indexing.DotEnvKeyValuesIndex;
import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase;
@@ -15,10 +16,12 @@ public class DotEnvFileTest extends DotEnvLightCodeInsightFixtureTestCase {
return basePath + "dotenv/fixtures";
}
@Test
public void testEnvKeys() {
assertIndexContains(DotEnvKeyValuesIndex.KEY, "TEST", "TEST2", "TEST3", "EMPTY_KEY", "OFFSET_KEY");
}
@Test
public void testEnvKeyValues() {
assertContainsKeyAndValue("TEST", "1");
@@ -27,6 +30,7 @@ public class DotEnvFileTest extends DotEnvLightCodeInsightFixtureTestCase {
assertContainsKeyAndValue("OFFSET_KEY", "offset");
}
@Test
public void testEnvCommentedVars() {
assertContainsKeyAndValue("COMMENTED_VAR", "123");
assertContainsKeyAndValue("COMMENTED_VAR2", "123 #comment");
@@ -35,15 +39,18 @@ public class DotEnvFileTest extends DotEnvLightCodeInsightFixtureTestCase {
assertContainsKeyAndValue("COMMENTED_VAR4", "1");
}
@Test
public void testEnvEmptyCommentedVars() {
assertContainsKeyAndValue("COMMENTED_EMPTY", "");
assertContainsKeyAndValue("COMMENTED_EMPTY2", "");
}
@Test
public void testEnvComments() {
assertIndexNotContains(DotEnvKeyValuesIndex.KEY, "Comment", "#Comment", "#Another comment");
}
@Test
public void testSlashInTheEndOfQuoted() {
assertIndexContains(DotEnvKeyValuesIndex.KEY, "SLASH_IN_THE_END_OF_QUOTED", "AFTER");
@@ -51,20 +58,24 @@ public class DotEnvFileTest extends DotEnvLightCodeInsightFixtureTestCase {
assertContainsKeyAndValue("AFTER", "1");
}
@Test
public void testMultiLine() {
assertContainsKeyAndValue("MULTI_LINE", "MULTI...");
assertContainsKeyAndValue("MULTI_LINE_SINGLE", "MULTI...");
}
@Test
public void testMultiLineSlashed() {
assertContainsKeyAndValue("MULTI_LINE_SLASHED", "MULTI...");
assertContainsKeyAndValue("MULTI_LINE_SLASHED_SINGLE", "MULTI...");
}
@Test
public void testEnvExportKeys() {
assertIndexContains(DotEnvKeyValuesIndex.KEY, "EXPORTED");
}
@Test
public void testSingleQuotes() {
assertContainsKeyAndValue("SINGLE_QUOTE", "1");
assertContainsKeyAndValue("SINGLE_QUOTE_WITH_COMMENT", "123#comment");

7
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/dotenv/InspectionsTest.java
View File

@@ -4,8 +4,6 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.InspectionProfileEntry;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import ru.adelf.idea.dotenv.inspections.*;
import ru.adelf.idea.dotenv.tests.DotEnvLightCodeInsightFixtureTestCase;
@@ -14,7 +12,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@RunWith(JUnit4.class)
public class InspectionsTest extends DotEnvLightCodeInsightFixtureTestCase {
@Override
@@ -63,7 +60,7 @@ public class InspectionsTest extends DotEnvLightCodeInsightFixtureTestCase {
public void testTrailingWhitespaceInspection() {
doInspectionTest(new TrailingWhitespaceInspection(), Arrays.asList(" ", " ", " \n", " \n\n"));
}
@Test
public void testSpaceAroundSeparatorInspection() {
doInspectionTest(new SpaceAroundSeparatorInspection(), Arrays.asList(" = ", " = ", " =", "= ", " ="));
@@ -91,7 +88,7 @@ public class InspectionsTest extends DotEnvLightCodeInsightFixtureTestCase {
List<HighlightInfo> highlightInfoList = myFixture.doHighlighting();
List<String> actualHighlightedText = new ArrayList<>();
highlightInfoList.forEach( highlightInfo -> actualHighlightedText.add(highlightInfo.getText()));
highlightInfoList.forEach(highlightInfo -> actualHighlightedText.add(highlightInfo.getText()));
assertEquals(expectedHighlightedText, actualHighlightedText);
}

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/GoUsagesTest.java
View File

@@ -1,5 +1,7 @@
package ru.adelf.idea.dotenv.tests.usages;
import org.junit.Test;
public class GoUsagesTest extends BaseUsagesTest {
@Override
public void setUp() throws Exception {
@@ -7,6 +9,7 @@ public class GoUsagesTest extends BaseUsagesTest {
myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("usages.go"));
}
@Test
public void testUsages() {
assertUsagesContains("GO_TEST", "GO_TEST2");
}

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/JavaUsagesTest.java
View File

@@ -1,5 +1,7 @@
package ru.adelf.idea.dotenv.tests.usages;
import org.junit.Test;
public class JavaUsagesTest extends BaseUsagesTest {
@Override
public void setUp() throws Exception {
@@ -7,6 +9,7 @@ public class JavaUsagesTest extends BaseUsagesTest {
myFixture.copyDirectoryToProject("java", "src/java");
}
@Test
public void testGetEnvUsages() {
assertUsagesContains("JAVA_GET_ENV");
}

4
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/KotlinUsagesTest.java
View File

@@ -1,5 +1,7 @@
package ru.adelf.idea.dotenv.tests.usages;
import org.junit.Test;
public class KotlinUsagesTest extends BaseUsagesTest {
@Override
public void setUp() throws Exception {
@@ -7,10 +9,12 @@ public class KotlinUsagesTest extends BaseUsagesTest {
myFixture.copyDirectoryToProject("kotlin", "src/kotlin");
}
@Test
public void testGetEnvUsages() {
assertUsagesContains("KOTLIN_GET_ENV", "KOTLIN_GET_ENV2");
}
@Test
public void testDotEnvGetUsages() {
assertUsagesContains("KOTLIN_DOTENV_GET", "KOTLIN_DOTENV_GET2");
}

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PhpUsagesTest.java
View File

@@ -1,5 +1,7 @@
package ru.adelf.idea.dotenv.tests.usages;
import org.junit.Test;
public class PhpUsagesTest extends BaseUsagesTest {
@Override
public void setUp() throws Exception {
@@ -7,6 +9,7 @@ public class PhpUsagesTest extends BaseUsagesTest {
myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("usages.php"));
}
@Test
public void testUsages() {
assertUsagesContains("PHP_TEST", "PHP_TEST2", "PHP_TEST3", "PHP_TEST4");
}

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PhpunitUsagesTest.java
View File

@@ -1,5 +1,7 @@
package ru.adelf.idea.dotenv.tests.usages;
import org.junit.Test;
public class PhpunitUsagesTest extends BaseUsagesTest {
@Override
public void setUp() throws Exception {
@@ -8,6 +10,7 @@ public class PhpunitUsagesTest extends BaseUsagesTest {
myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("phpunit.xml"));
}
@Test
public void testUsages() {
assertUsagesContains("APP_ENV", "CACHE_DRIVER", "SESSION_DRIVER");
}

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/PythonUsagesTest.java
View File

@@ -1,5 +1,7 @@
package ru.adelf.idea.dotenv.tests.usages;
import org.junit.Test;
public class PythonUsagesTest extends BaseUsagesTest {
@Override
public void setUp() throws Exception {
@@ -7,6 +9,7 @@ public class PythonUsagesTest extends BaseUsagesTest {
myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("usages.py"));
}
@Test
public void testUsages() {
assertUsagesContains("PYTHON_TEST", "PYTHON_TEST2");
}

3
plugins/env-files-support/src/test/java/ru/adelf/idea/dotenv/tests/usages/RubyUsagesTest.java
View File

@@ -1,5 +1,7 @@
package ru.adelf.idea.dotenv.tests.usages;
import org.junit.Test;
public class RubyUsagesTest extends BaseUsagesTest {
@Override
public void setUp() throws Exception {
@@ -7,6 +9,7 @@ public class RubyUsagesTest extends BaseUsagesTest {
myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("usages.rb"));
}
@Test
public void testUsages() {
assertUsagesContains("RUBY_TEST");
}