tests fixed

This commit is contained in:
Dmitry Avdeev
2013-04-30 15:57:45 +04:00
parent 7bf09eb645
commit 99a2216bad
3 changed files with 72 additions and 31 deletions
@@ -1,25 +1,22 @@
package com.intellij.navigation;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.idea.Bombed;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManagerTestCase;
import com.intellij.openapi.fileEditor.HeavyFileEditorManagerTestCase;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiJavaFile;
import java.util.Calendar;
/**
* @author Dmitry Avdeev
* Date: 4/25/13
*/
public class GotoClassTest extends FileEditorManagerTestCase {
public class GotoClassTest extends HeavyFileEditorManagerTestCase {
@Bombed(month = Calendar.MAY, day = 20)
public void testGotoClass() throws Exception {
PsiJavaFile file = (PsiJavaFile)myFixture.configureByText("Foo.java", "public class Foo {\n" +
"}\n" +
"\n" +
@@ -0,0 +1,62 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.fileEditor;
import com.intellij.openapi.components.impl.ComponentManagerImpl;
import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
import com.intellij.openapi.fileEditor.impl.EditorHistoryManager;
import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
import com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
import com.intellij.ui.docking.DockManager;
import java.io.File;
/**
* @author Dmitry Avdeev
* Date: 4/30/13
*/
public abstract class HeavyFileEditorManagerTestCase extends CodeInsightFixtureTestCase {
@SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors")
protected HeavyFileEditorManagerTestCase() {
PlatformTestCase.autodetectPlatformPrefix();
}
protected FileEditorManagerImpl myManager;
protected VirtualFile getFile(String path) {
return LocalFileSystem.getInstance().refreshAndFindFileByPath(
PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/platform/platform-tests/testData/fileEditorManager" + path);
}
public void setUp() throws Exception {
super.setUp();
myManager = new FileEditorManagerImpl(getProject(), DockManager.getInstance(getProject()));
((ComponentManagerImpl)getProject()).registerComponentInstance(FileEditorManager.class, myManager);
((IdeDocumentHistoryImpl)IdeDocumentHistory.getInstance(getProject())).projectOpened();
EditorHistoryManager.getInstance(getProject()).projectOpened();
}
@Override
protected String getBasePath() {
return "/platform/platform-tests/testData/fileEditorManager";
}
}
@@ -1,26 +1,21 @@
package com.intellij.openapi.fileEditor;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.openapi.components.impl.ComponentManagerImpl;
import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
import com.intellij.openapi.fileEditor.impl.EditorHistoryManager;
import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
import com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.PlatformLangTestCase;
import com.intellij.psi.PsiManager;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.ui.docking.DockManager;
import java.io.File;
/**
* @author Dmitry Avdeev
* Date: 4/29/13
*/
public class NewDocumentHistoryTest extends PlatformLangTestCase {
public class NewDocumentHistoryTest extends HeavyFileEditorManagerTestCase {
private FileEditorManagerImpl myManager;
public NewDocumentHistoryTest() {
PlatformTestCase.initPlatformLangPrefix();
}
public void testBackNavigationBetweenEditors() throws Exception {
PlatformTestUtil.registerExtension(FileEditorProvider.EP_FILE_EDITOR_PROVIDER, new FileEditorManagerTest.MyFileEditorProvider(), getTestRootDisposable());
@@ -42,22 +37,9 @@ public class NewDocumentHistoryTest extends PlatformLangTestCase {
myManager.openFile(file1, true);
VirtualFile file2 = getFile("/src/2.txt");
myManager.openFile(file2, true);
NavigationUtil.activateFileWithPsiElement(getPsiManager().findFile(file1));
NavigationUtil.activateFileWithPsiElement(PsiManager.getInstance(getProject()).findFile(file1));
VirtualFile[] files = myManager.getSelectedFiles();
assertEquals(1, files.length);
assertEquals("1.txt", files[0].getName());
}
protected VirtualFile getFile(String path) {
return LocalFileSystem.getInstance().refreshAndFindFileByPath(
PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/platform/platform-tests/testData/fileEditorManager" + path);
}
public void setUp() throws Exception {
super.setUp();
myManager = new FileEditorManagerImpl(getProject(), DockManager.getInstance(getProject()));
((ComponentManagerImpl)getProject()).registerComponentInstance(FileEditorManager.class, myManager);
((IdeDocumentHistoryImpl)IdeDocumentHistory.getInstance(getProject())).projectOpened();
EditorHistoryManager.getInstance(getProject()).projectOpened();
}
}