MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

junit 5 conversion: convert tests without @RunWith/@Rule/@ClassRule annotations

Browse Source
This commit is contained in:
Anna.Kozlova
2016-10-28 15:36:23 +02:00
parent 7a832bc131
commit d17336c6db
16 changed files with 393 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/migration/MigrationManager.java
+8 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -16,6 +16,8 @@
package com.intellij.refactoring.migration;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class MigrationManager {
private final Project myProject;
@@ -35,4 +37,9 @@ public class MigrationManager {
new MigrationProcessor(myProject, migrationMap).run();
}
@Nullable
public MigrationMap findMigrationMap(@NotNull String name) {
return myMigrationMapSet.findMigrationMap(name);
}
}
java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java
+15 -1
View File
@@ -29,13 +29,14 @@ import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Iterator;
@@ -70,6 +71,19 @@ public class MigrationMapSet {
// saveMaps();
}
@Nullable
public MigrationMap findMigrationMap(@NotNull String name) {
if (myMaps == null) {
loadMaps();
}
for (MigrationMap map : myMaps) {
if (name.equals(map.getName())) {
return map;
}
}
return null;
}
public void replaceMap(MigrationMap oldMap, MigrationMap newMap) {
for(int i = 0; i < myMaps.size(); i++){
if (myMaps.get(i) == oldMap){
java/java-impl/src/com/intellij/refactoring/migration/MigrationProcessor.java
+10 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMigration;
import com.intellij.psi.impl.migration.PsiMigrationManager;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.RefactoringHelper;
@@ -42,10 +43,16 @@ public class MigrationProcessor extends BaseRefactoringProcessor {
private final MigrationMap myMigrationMap;
private static final String REFACTORING_NAME = RefactoringBundle.message("migration.title");
private PsiMigration myPsiMigration;
private final GlobalSearchScope mySearchScope;
public MigrationProcessor(Project project, MigrationMap migrationMap) {
this(project, migrationMap, GlobalSearchScope.projectScope(project));
}
public MigrationProcessor(Project project, MigrationMap migrationMap, GlobalSearchScope scope) {
super(project);
myMigrationMap = migrationMap;
mySearchScope = scope;
myPsiMigration = startMigration(project);
}
@@ -88,10 +95,10 @@ public class MigrationProcessor extends BaseRefactoringProcessor {
MigrationMapEntry entry = myMigrationMap.getEntryAt(i);
UsageInfo[] usages;
if (entry.getType() == MigrationMapEntry.PACKAGE) {
usages = MigrationUtil.findPackageUsages(myProject, myPsiMigration, entry.getOldName());
usages = MigrationUtil.findPackageUsages(myProject, myPsiMigration, entry.getOldName(), mySearchScope);
}
else {
usages = MigrationUtil.findClassUsages(myProject, myPsiMigration, entry.getOldName());
usages = MigrationUtil.findClassUsages(myProject, myPsiMigration, entry.getOldName(), mySearchScope);
}
for (UsageInfo usage : usages) {
java/java-impl/src/com/intellij/refactoring/migration/MigrationUtil.java
+10 -20
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -15,11 +15,10 @@
*/
package com.intellij.refactoring.migration;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReference;
@@ -36,10 +35,10 @@ public class MigrationUtil {
private MigrationUtil() {
}
public static UsageInfo[] findPackageUsages(Project project, PsiMigration migration, String qName) {
public static UsageInfo[] findPackageUsages(Project project, PsiMigration migration, String qName, GlobalSearchScope searchScope) {
PsiPackage aPackage = findOrCreatePackage(project, migration, qName);
return findRefs(project, aPackage);
return findRefs(project, aPackage, searchScope);
}
public static void doPackageMigration(Project project, PsiMigration migration, String newQName, UsageInfo[] usages) {
@@ -82,16 +81,15 @@ public class MigrationUtil {
}
}
public static UsageInfo[] findClassUsages(Project project, PsiMigration migration, String qName) {
public static UsageInfo[] findClassUsages(Project project, PsiMigration migration, String qName, GlobalSearchScope searchScope) {
PsiClass aClass = findOrCreateClass(project, migration, qName);
return findRefs(project, aClass);
return findRefs(project, aClass, searchScope);
}
private static UsageInfo[] findRefs(final Project project, final PsiElement aClass) {
private static UsageInfo[] findRefs(final Project project, final PsiElement aClass, GlobalSearchScope searchScope) {
final ArrayList<UsageInfo> results = new ArrayList<>();
GlobalSearchScope projectScope = GlobalSearchScope.projectScope(project);
for (PsiReference usage : ReferencesSearch.search(aClass, projectScope, false)) {
for (PsiReference usage : ReferencesSearch.search(aClass, searchScope, false)) {
results.add(new UsageInfo(usage));
}
@@ -133,22 +131,14 @@ public class MigrationUtil {
return aPackage;
}
else {
return ApplicationManager.getApplication().runWriteAction(new Computable<PsiPackage>() {
public PsiPackage compute() {
return migration.createPackage(qName);
}
});
return WriteAction.compute(() -> migration.createPackage(qName));
}
}
static PsiClass findOrCreateClass(Project project, final PsiMigration migration, final String qName) {
PsiClass aClass = JavaPsiFacade.getInstance(project).findClass(qName, GlobalSearchScope.allScope(project));
if (aClass == null) {
aClass = ApplicationManager.getApplication().runWriteAction(new Computable<PsiClass>() {
public PsiClass compute() {
return migration.createClass(qName);
}
});
aClass = WriteAction.compute(() -> migration.createClass(qName));
}
return aClass;
}