This commit is contained in:
Alexey Kudravtsev
2013-11-01 18:07:31 +04:00
parent 6bdf2d1d39
commit 89cbfa1c11
50 changed files with 224 additions and 147 deletions
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* 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.
@@ -19,7 +19,6 @@ import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.util.io.FileUtil;
@@ -555,7 +554,7 @@ public class ClsRepositoryUseTest extends PsiTestCase {
assertEquals("java.util.Map.Entry", setTypeResolveResultElement.getQualifiedName());
final PsiTypeParameter[] typeParameters = setTypeResolveResultElement.getTypeParameters();
assertEquals(2, typeParameters.length);
PsiType[] mapParams = new PsiType[]{
PsiType[] mapParams = {
setTypeResolveResult.getSubstitutor().substitute(typeParameters[0]),
setTypeResolveResult.getSubstitutor().substitute(typeParameters[1])
};
@@ -1,3 +1,18 @@
/*
* 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.psi;
import com.intellij.openapi.application.ApplicationManager;
@@ -23,7 +38,7 @@ public abstract class GenericsTestCase extends PsiTestCase {
protected void setupGenericSampleClasses() {
final String commonPath = PathManagerEx.getTestDataPath().replace(File.separatorChar, '/') + "/psi/types/src";
final VirtualFile[] commonRoot = new VirtualFile[] { null };
final VirtualFile[] commonRoot = { null };
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
@@ -1,3 +1,18 @@
/*
* 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.psi;
import com.intellij.openapi.application.ApplicationManager;
@@ -44,7 +59,7 @@ public class MiscPsiTest extends LightCodeInsightFixtureTestCase {
public void testCopyBinaryFile() throws Exception{
VirtualFile vFile = myFixture.addFileToProject("Test.xxx", "").getVirtualFile();
final byte[] bytes = new byte[]{12,34,56,78,90,45,83,0x22,(byte)0xff, (byte)0xff, (byte)0xff, (byte)0xee};
final byte[] bytes = {12,34,56,78,90,45,83,0x22,(byte)0xff, (byte)0xff, (byte)0xff, (byte)0xee};
vFile.setBinaryContent(bytes);
VirtualFile vDir = myFixture.getTempDirFixture().findOrCreateDir("dir");
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* 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.
@@ -60,7 +60,7 @@ public class InvalidateClassFileTest extends PsiTestCase {
PsiClass clazz = getJavaFacade().findClass("Clazz", GlobalSearchScope.allScope(myProject));
assertNotNull(clazz);
final boolean[] notified = new boolean[] {false};
final boolean[] notified = {false};
final PsiTreeChangeAdapter listener = new PsiTreeChangeAdapter() {
@Override
public void childRemoved(@NotNull PsiTreeChangeEvent event) {