[INTERNAL] compatibility fix for v202

SeeSharpSoft · SeeSharpSoft · commit 3d8954eba39d · 2020-06-07T14:59:29.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -76,7 +76,7 @@ intellij {
     pluginName = 'CSV Plugin'
     instrumentCode = true
     updateSinceUntilBuild = false
-    downloadSources = true
+    downloadSources = false
 }
 publishPlugin {
     token = System.getenv().getOrDefault('JI_TOKEN', '')
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandler.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandler.java
@@ -15,7 +15,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CsvHighlightUsagesHandler extends HighlightUsagesHandlerBase<PsiElement> {
+public class CsvHighlightUsagesHandler extends HighlightUsagesHandlerBase {
 
     protected CsvHighlightUsagesHandler(@NotNull Editor editor, @NotNull CsvFile file) {
         super(editor, file);
@@ -46,20 +46,21 @@ public List<PsiElement> getTargets() {
     }
 
     @Override
-    protected void selectTargets(List<PsiElement> list, Consumer<List<PsiElement>> consumer) {
-        consumer.consume(list);
-    }
-
-    @Override
-    public void computeUsages(List<PsiElement> list) {
+    public void computeUsages(List list) {
         CsvColumnInfoMap<PsiElement> columnInfoMap = getCsvFile().getColumnInfoMap();
-        for (PsiElement listElement : list) {
+        for (PsiElement listElement : (List<PsiElement>)list) {
             CsvColumnInfo<PsiElement> csvColumnInfo = getCsvFile().getColumnInfoMap().getColumnInfo(listElement);
             if (csvColumnInfo == null) {
                 continue;
             }
             csvColumnInfo.getElements().forEach(element -> this.addOccurrence(columnInfoMap.getRowInfo(element)));
         }
+
+    }
+
+    @Override
+    protected void selectTargets(List list, Consumer consumer) {
+        consumer.consume(list);
     }
 
     protected void addOccurrence(CsvColumnInfo<PsiElement>.RowInfo rowInfo) {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionTest.java
@@ -1,12 +1,12 @@
 package net.seesharpsoft.intellij.plugins.csv.actions;
 
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 
-public class CsvChangeEscapeCharacterActionTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvChangeEscapeCharacterActionTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionTest.java
@@ -1,12 +1,12 @@
 package net.seesharpsoft.intellij.plugins.csv.actions;
 
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.CsvValueSeparator;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 
-public class CsvChangeSeparatorActionTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvChangeSeparatorActionTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributesTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributesTest.java
@@ -1,11 +1,11 @@
 package net.seesharpsoft.intellij.plugins.csv.components;
 
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 
-public class CsvFileAttributesTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvFileAttributesTest extends BasePlatformTestCase {
     @Override
     protected String getTestDataPath() {
         return "./src/test/resources/components";
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotatorTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotatorTest.java
@@ -3,6 +3,7 @@
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
@@ -14,7 +15,8 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testFramework.EdtTestUtil;
 import com.intellij.testFramework.ExpectedHighlightingData;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+import net.seesharpsoft.intellij.plugins.csv.editor.table.ExpectedHighlightingDataWrapper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -23,7 +25,7 @@
 
 import static net.seesharpsoft.intellij.plugins.csv.editor.CsvAnnotator.CSV_COLUMN_INFO_SEVERITY;
 
-public class CsvAnnotatorTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvAnnotatorTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
@@ -36,7 +38,7 @@ public void testAnnotator() {
     }
 
     private long collectAndCheckHighlighting() {
-        ExpectedHighlightingData data = new ExpectedHighlightingData(myFixture.getEditor().getDocument(), false, false, true, false, this.getHostFile());
+        ExpectedHighlightingDataWrapper data = new ExpectedHighlightingDataWrapper(myFixture.getEditor().getDocument(), false, false, true);
         data.registerHighlightingType("csv_column_info", new ExpectedHighlightingData.ExpectedHighlightingSet(CSV_COLUMN_INFO_SEVERITY, false, true));
         data.init();
         return this.collectAndCheckHighlighting(data);
@@ -46,21 +48,21 @@ private PsiFile getHostFile() {
         return myFixture.getFile();
     }
 
-    private long collectAndCheckHighlighting(@NotNull ExpectedHighlightingData data) {
+    private long collectAndCheckHighlighting(@NotNull ExpectedHighlightingDataWrapper data) {
         Project project = myFixture.getProject();
         EdtTestUtil.runInEdtAndWait(() -> {
             PsiDocumentManager.getInstance(project).commitAllDocuments();
         });
         PsiFileImpl file = (PsiFileImpl)this.getHostFile();
         FileElement hardRefToFileElement = file.calcTreeElement();
         if (!DumbService.isDumb(project)) {
-            CacheManager.SERVICE.getInstance(project).getFilesWithWord("XXX", (short)2, GlobalSearchScope.allScope(project), true);
+            ServiceManager.getService(project, CacheManager.class).getFilesWithWord("XXX", (short)2, GlobalSearchScope.allScope(project), true);
         }
 
         long start = System.currentTimeMillis();
         Disposable disposable = Disposer.newDisposable();
 
-        List infos;
+        List<HighlightInfo> infos;
         try {
             infos = myFixture.doHighlighting();
             this.removeDuplicatedRangesForInjected(infos);
@@ -69,7 +71,7 @@ private long collectAndCheckHighlighting(@NotNull ExpectedHighlightingData data)
         }
 
         long elapsed = System.currentTimeMillis() - start;
-        data.checkResult(infos, file.getText());
+        data.checkResultWrapper(file, infos, file.getText());
         hardRefToFileElement.hashCode();
         return elapsed;
     }
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvFileEditorTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvFileEditorTest.java
@@ -4,11 +4,11 @@
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
 import com.intellij.openapi.fileEditor.impl.text.TextEditorState;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jdom.Element;
 
-public class CsvFileEditorTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvFileEditorTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorProviderTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorProviderTest.java
@@ -5,13 +5,13 @@
 import com.intellij.openapi.fileEditor.FileEditorProvider;
 import com.intellij.openapi.fileEditor.FileEditorState;
 import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jdom.Element;
 
 import java.util.Objects;
 
-public class CsvTableEditorProviderTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvTableEditorProviderTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorStateTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorStateTest.java
@@ -1,10 +1,10 @@
 package net.seesharpsoft.intellij.plugins.csv.editor.table;
 
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jdom.Element;
 
-public class CsvTableEditorStateTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvTableEditorStateTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/ExpectedHighlightingDataWrapper.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/ExpectedHighlightingDataWrapper.java
@@ -0,0 +1,43 @@
+package net.seesharpsoft.intellij.plugins.csv.editor.table;
+
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.openapi.editor.Document;
+import com.intellij.psi.PsiFile;
+import com.intellij.testFramework.ExpectedHighlightingData;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * This class provides a common API for the incompatible change of the 'checkResult' method, that happened in 202.*
+ */
+public class ExpectedHighlightingDataWrapper extends ExpectedHighlightingData {
+
+    public ExpectedHighlightingDataWrapper(@NotNull Document document, boolean checkWarnings, boolean checkWeakWarnings, boolean checkInfos) {
+        super(document, checkWarnings, checkWeakWarnings, checkInfos);
+    }
+
+    private boolean findMethodAndInvoke(String name, Object... parameters) {
+        Class[] classes = Arrays.stream(parameters).map(obj -> obj.getClass()).toArray(n -> new Class[n]);
+        Method methodToCall;
+        try {
+            methodToCall = ExpectedHighlightingData.class.getMethod("checkResult", classes);
+            methodToCall.invoke(this, parameters);
+        } catch (NoSuchMethodException e) {
+            return false;
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    public void checkResultWrapper(PsiFile psiFile, Collection<? extends HighlightInfo> infos, String text) {
+        if(!findMethodAndInvoke("checkResult", PsiFile.class, Collection.class, String.class)) {
+            findMethodAndInvoke("checkResult", Collection.class, String.class);
+        }
+    }
+}
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/api/TableDataChangeEventTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/api/TableDataChangeEventTest.java
@@ -1,12 +1,12 @@
 package net.seesharpsoft.intellij.plugins.csv.editor.table.api;
 
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import org.junit.Test;
 
 import java.util.Arrays;
 
 
-public class TableDataChangeEventTest extends LightPlatformCodeInsightFixtureTestCase {
+public class TableDataChangeEventTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/api/TableDataHandlerTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/api/TableDataHandlerTest.java
@@ -1,13 +1,13 @@
 package net.seesharpsoft.intellij.plugins.csv.editor.table.api;
 
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.CsvTableEditor;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.swing.CsvTableEditorSwing;
 
 import java.util.Arrays;
 
 
-public class TableDataHandlerTest extends LightPlatformCodeInsightFixtureTestCase {
+public class TableDataHandlerTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwingTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwingTest.java
@@ -3,9 +3,9 @@
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.openapi.fileEditor.FileEditorStateLevel;
 import com.intellij.openapi.util.Key;
-import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.CsvTableEditor;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.CsvTableEditorState;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 
 import javax.swing.table.DefaultTableModel;
 import java.beans.PropertyChangeEvent;
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwingTestBase.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwingTestBase.java
@@ -1,14 +1,14 @@
 package net.seesharpsoft.intellij.plugins.csv.editor.table.swing;
 
 import com.intellij.testFramework.exceptionCases.AbstractExceptionCase;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import com.intellij.util.ThrowableRunnable;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class CsvTableEditorSwingTestBase extends LightPlatformCodeInsightFixtureTestCase {
+public abstract class CsvTableEditorSwingTestBase extends BasePlatformTestCase {
 
     protected CsvTableEditorSwing fileEditor;
 
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/formatter/CsvFormatterTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/formatter/CsvFormatterTest.java
@@ -3,7 +3,7 @@
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import com.intellij.util.containers.ContainerUtil;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 import org.junit.Assert;
@@ -12,7 +12,7 @@
 import java.time.Instant;
 import java.util.Properties;
 
-public class CsvFormatterTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvFormatterTest extends BasePlatformTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -60,7 +60,7 @@ private void initCsvCodeStyleSettings(int binarySettings) {
     private void executeTestConfiguration(int binarySettings, String relativeTargetPath) {
         executeTestConfiguration(binarySettings, relativeTargetPath, true);
     }
-    
+
     private void executeTestConfiguration(int binarySettings, String relativeTargetPath, boolean checkResults) {
         if (relativeTargetPath == null || relativeTargetPath.isEmpty()) {
             relativeTargetPath = ".";
@@ -139,7 +139,7 @@ public void testHeader() throws Exception {
             }
         }
     }
-    
+
     public void testInvalidRangeException() throws Exception {
         executeTestConfiguration(0, "/invalidRange");
     }
@@ -148,15 +148,15 @@ public void _testRuntimeSimple() throws Exception {
         Long threshold = 1000l;
         Properties runtime = new Properties();
         runtime.load(this.getClass().getResourceAsStream("/formatter/performance/runtime.prop"));
-        
+
         long start = Instant.now().toEpochMilli();
         executeTestConfiguration(0, "/performance", false);
         long end = Instant.now().toEpochMilli();
         System.out.println(end - start);
 
         Assert.assertTrue(end - start <= Long.parseLong(runtime.getProperty("00000000")) + threshold);
     }
-    
+
     /**
      * This function should be executed (remove the underscore) if the current results are correct (manual testing).
      *
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandlerTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/highlighter/CsvHighlightUsagesHandlerTest.java
@@ -6,9 +6,9 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
-public class CsvHighlightUsagesHandlerTest extends LightPlatformCodeInsightFixtureTestCase {
+public class CsvHighlightUsagesHandlerTest extends BasePlatformTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/inspection/CsvInspectionTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/inspection/CsvInspectionTest.java
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvIntentionTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvIntentionTest.java
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProviderTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProviderTest.java
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsTest.java
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/csv/structureview/CsvStructureViewTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/csv/structureview/CsvStructureViewTest.java
diff --git a/src/test/java/net/seesharpsoft/intellij/plugins/tsv/inspection/TsvInspectionTest.java b/src/test/java/net/seesharpsoft/intellij/plugins/tsv/inspection/TsvInspectionTest.java

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ intellij {`
`76`	`76`	`pluginName = 'CSV Plugin'`
`77`	`77`	`instrumentCode = true`
`78`	`78`	`updateSinceUntilBuild = false`
`79`		`- downloadSources = true`
	`79`	`+ downloadSources = false`
`80`	`80`	`}`
`81`	`81`	`publishPlugin {`
`82`	`82`	`token = System.getenv().getOrDefault('JI_TOKEN', '')`