From bba71e608ac2e9524de039b63a0e1f4fd24da366 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 31 Jul 2012 17:48:07 +0200 Subject: [PATCH] Cleanup --- .../projectView/FileStructureDialogTest.java | 78 +++++++++---------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/projectView/FileStructureDialogTest.java b/java/java-tests/testSrc/com/intellij/projectView/FileStructureDialogTest.java index d8a717ef67d5..eab9203b4d19 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/FileStructureDialogTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/FileStructureDialogTest.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2012 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.projectView; @@ -38,39 +22,53 @@ import com.intellij.ide.structureView.StructureViewModel; import com.intellij.ide.structureView.TreeBasedStructureViewBuilder; import com.intellij.ide.util.FileStructureDialog; import com.intellij.openapi.Disposable; +import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.JavaDirectoryService; import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiPackage; import javax.swing.*; public class FileStructureDialogTest extends BaseProjectViewTestCase { public void testFileStructureForClass() throws Exception { - final PsiClass psiClass = JavaDirectoryService.getInstance().getPackage(getPackageDirectory()).getClasses()[0]; + final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage(getPackageDirectory()); + assertNotNull(aPackage); + final PsiClass psiClass = aPackage.getClasses()[0]; final VirtualFile virtualFile = psiClass.getContainingFile().getVirtualFile(); + assertNotNull(virtualFile); final StructureViewBuilder structureViewBuilder = StructureViewBuilder.PROVIDER.getStructureViewBuilder(virtualFile.getFileType(), virtualFile, myProject); + assertNotNull(structureViewBuilder); final StructureViewModel structureViewModel = ((TreeBasedStructureViewBuilder)structureViewBuilder).createStructureViewModel(); - Editor editor = null; - FileStructureDialog dialog = null; + final EditorFactory factory = EditorFactory.getInstance(); + assertNotNull(factory); + final Document document = FileDocumentManager.getInstance().getDocument(virtualFile); + assertNotNull(document); + + final Editor editor = factory.createEditor(document); try { - editor = EditorFactory.getInstance().createEditor(FileDocumentManager.getInstance().getDocument(virtualFile)); - dialog = ViewStructureAction.createStructureViewBasedDialog(structureViewModel, editor, myProject, psiClass, new Disposable() { - @Override - public void dispose() { - structureViewModel.dispose(); - } - }); - final CommanderPanel panel = dialog.getPanel(); - assertListsEqual((ListModel)panel.getModel(), "Inner1\n" + "Inner2\n" + "__method(): void\n" + "_myField1: int\n" + "_myField2: String\n"); + final FileStructureDialog dialog = + ViewStructureAction.createStructureViewBasedDialog(structureViewModel, editor, myProject, psiClass, new Disposable() { + @Override + public void dispose() { + structureViewModel.dispose(); + } + }); + try { + final CommanderPanel panel = dialog.getPanel(); + assertListsEqual((ListModel)panel.getModel(), "Inner1\n" + "Inner2\n" + "__method(): void\n" + "_myField1: int\n" + "_myField2: String\n"); + } + finally { + dialog.close(0); + } } finally { - if (dialog != null) dialog.close(0); - if (editor != null) EditorFactory.getInstance().releaseEditor(editor); + factory.releaseEditor(editor); } } }