Skip to content

Commit 6bb51d6

Browse files
SeeSharpSoftSeeSharpSoft
committed
Fix: Update tests
1 parent f586cb9 commit 6bb51d6

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvFileEditorTest.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.jdom.Element;
1414
import org.jetbrains.annotations.NotNull;
1515

16+
import java.util.List;
17+
1618
public class CsvFileEditorTest extends CsvBasePlatformTestCase {
1719

1820
@Override
@@ -28,30 +30,30 @@ protected void setUp() throws Exception {
2830
}
2931

3032
protected void disposeTextEditor(FileEditor fileEditor) {
31-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(myFixture.getProject(), myFixture.getFile().getVirtualFile());
32-
fileEditorProviders[1].disposeEditor(fileEditor);
33+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
34+
fileEditorProviders.get(0).disposeEditor(fileEditor);
3335
}
3436

3537
public void testCsvFileEditorProviderIsAvailableAndHasCorrectNameAndPolicy() {
36-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(myFixture.getProject(), myFixture.getFile().getVirtualFile());
37-
assertEquals(2, fileEditorProviders.length);
38-
assertInstanceOf(fileEditorProviders[1], CsvFileEditorProvider.class);
38+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
39+
assertEquals(2, fileEditorProviders.size());
40+
assertInstanceOf(fileEditorProviders.get(0), CsvFileEditorProvider.class);
3941

40-
FileEditorProvider fileEditorProvider = fileEditorProviders[1];
42+
FileEditorProvider fileEditorProvider = fileEditorProviders.get(0);
4143
assertEquals(CsvFileEditorProvider.EDITOR_TYPE_ID, fileEditorProvider.getEditorTypeId());
42-
assertEquals(FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
44+
assertEquals(FileEditorPolicy.HIDE_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
4345

4446
CsvEditorSettings csvEditorSettings = CsvEditorSettings.getInstance();
4547
csvEditorSettings.setEditorPrio(CsvEditorSettings.EditorPrio.TEXT_ONLY);
4648
assertEquals(FileEditorPolicy.HIDE_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
4749

48-
csvEditorSettings.setEditorPrio(CsvEditorSettings.EditorPrio.TEXT_FIRST);
49-
assertEquals(FileEditorPolicy.HIDE_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
50+
csvEditorSettings.setEditorPrio(CsvEditorSettings.EditorPrio.TABLE_FIRST);
51+
assertEquals(FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
5052
}
5153

5254
public void testCsvEditorIsTextEditorWithInitialCsvEditorSettings() {
53-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(myFixture.getProject(), myFixture.getFile().getVirtualFile());
54-
FileEditor fileEditor = fileEditorProviders[1].createEditor(myFixture.getProject(), myFixture.getFile().getVirtualFile());
55+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
56+
FileEditor fileEditor = fileEditorProviders.get(0).createEditor(myFixture.getProject(), myFixture.getFile().getVirtualFile());
5557
assertInstanceOf(fileEditor, TextEditor.class);
5658

5759
TextEditor textEditor = (TextEditor) fileEditor;
@@ -65,8 +67,8 @@ public void testCsvEditorIsTextEditorWithInitialCsvEditorSettings() {
6567
}
6668

6769
private TextEditor getCurrentTextEditor() {
68-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(myFixture.getProject(), myFixture.getFile().getVirtualFile());
69-
return (TextEditor) fileEditorProviders[1].createEditor(myFixture.getProject(), myFixture.getFile().getVirtualFile());
70+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
71+
return (TextEditor) fileEditorProviders.get(0).createEditor(myFixture.getProject(), myFixture.getFile().getVirtualFile());
7072
}
7173

7274
public void testCsvEditorSettingsAreApplied() {
@@ -86,8 +88,8 @@ public void testCsvEditorSettingsAreApplied() {
8688
public void testCsvEditorStateReadsAndWritesStates() {
8789
TextEditor textEditor = getCurrentTextEditor();
8890

89-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(myFixture.getProject(), myFixture.getFile().getVirtualFile());
90-
CsvFileEditorProvider fileEditorProvider = (CsvFileEditorProvider) fileEditorProviders[1];
91+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
92+
CsvFileEditorProvider fileEditorProvider = (CsvFileEditorProvider) fileEditorProviders.get(0);
9193
Element dummy = new Element("dummy");
9294

9395
FileEditorState state = fileEditorProvider.readState(dummy, this.getProject(), myFixture.getFile().getVirtualFile());

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorProviderTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
1010
import org.jdom.Element;
1111

12+
import java.util.List;
1213
import java.util.Objects;
1314

1415
public class CsvTableEditorProviderTest extends CsvBasePlatformTestCase {
@@ -26,28 +27,28 @@ protected void setUp() throws Exception {
2627
}
2728

2829
public void testCsvTableEditorProviderIsAvailableAndHasCorrectNameAndPolicy() {
29-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), myFixture.getFile().getVirtualFile());
30-
assertEquals(2, fileEditorProviders.length);
31-
assertInstanceOf(fileEditorProviders[0], CsvTableEditorProvider.class);
30+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
31+
assertEquals(2, fileEditorProviders.size());
32+
assertInstanceOf(fileEditorProviders.get(1), CsvTableEditorProvider.class);
3233

33-
FileEditorProvider fileEditorProvider = fileEditorProviders[0];
34+
FileEditorProvider fileEditorProvider = fileEditorProviders.get(1);
3435
assertEquals(CsvTableEditorProvider.EDITOR_TYPE_ID, fileEditorProvider.getEditorTypeId());
35-
assertEquals(FileEditorPolicy.HIDE_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
36-
assertEquals(true, fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
36+
assertEquals(FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
37+
assertTrue(fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
3738

3839
CsvEditorSettings csvEditorSettings = CsvEditorSettings.getInstance();
3940
csvEditorSettings.setEditorPrio(CsvEditorSettings.EditorPrio.TEXT_ONLY);
4041
assertEquals(FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
41-
assertEquals(false, fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
42+
assertFalse(fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
4243

4344
csvEditorSettings.setEditorPrio(CsvEditorSettings.EditorPrio.TEXT_FIRST);
4445
assertEquals(FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
45-
assertEquals(true, fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
46+
assertTrue(fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
4647
}
4748

4849
public void testCsvTableEditorCreatesInstanceOfCsvTableEditor() {
49-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), myFixture.getFile().getVirtualFile());
50-
FileEditorProvider fileEditorProvider = fileEditorProviders[0];
50+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
51+
FileEditorProvider fileEditorProvider = fileEditorProviders.get(1);
5152

5253
FileEditor fileEditor = fileEditorProvider.createEditor(getProject(), myFixture.getFile().getVirtualFile());
5354
assertInstanceOf(fileEditor, CsvTableEditor.class);
@@ -56,8 +57,8 @@ public void testCsvTableEditorCreatesInstanceOfCsvTableEditor() {
5657
}
5758

5859
public void testWriteAndReadTableEditorState() {
59-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), myFixture.getFile().getVirtualFile());
60-
FileEditorProvider fileEditorProvider = fileEditorProviders[0];
60+
List<FileEditorProvider> fileEditorProviders = FileEditorProviderManager.getInstance().getProviderList(myFixture.getProject(), myFixture.getFile().getVirtualFile());
61+
FileEditorProvider fileEditorProvider = fileEditorProviders.get(1);
6162

6263
CsvTableEditorState editorState = new CsvTableEditorState();
6364
editorState.setColumnWidths(new int[]{120, 32, 9});

0 commit comments

Comments
 (0)