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

tests: check for jar availability in the classpath when package is selected

Browse Source
This commit is contained in:
anna
2012-02-20 10:40:05 +01:00
parent 329c041758
commit ebb5594010
3 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/junit2/info/LocationUtil.java
+52
View File
@@ -0,0 +1,52 @@
/*
* Copyright 2000-2012 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.execution.junit2.info;
import com.intellij.execution.Location;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiPackage;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
/**
* User: anna
* Date: 2/20/12
*/
public class LocationUtil {
public static boolean isJarAttached(@NotNull Location location, final PsiPackage aPackage, final String fqn) {
final JavaPsiFacade facade = JavaPsiFacade.getInstance(location.getProject());
boolean testngJarFound = false;
final Module locationModule = location.getModule();
if (locationModule != null) {
testngJarFound = facade.findClass(fqn, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(locationModule, true)) != null;
}
else {
for (PsiDirectory directory : aPackage.getDirectories()) {
final Module module = ModuleUtil.findModuleForFile(directory.getVirtualFile(), location.getProject());
if (module != null) {
if (facade.findClass(fqn, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, true)) != null) {
testngJarFound = true;
break;
}
}
}
}
return testngJarFound;
}
}
plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java
+2 -23
View File
@@ -20,14 +20,10 @@ import com.intellij.execution.JavaRunConfigurationExtensionManager;
import com.intellij.execution.Location;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.execution.junit2.info.LocationUtil;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiPackage;
import com.intellij.psi.search.GlobalSearchScope;
public class AllInPackageConfigurationProducer extends JUnitConfigurationProducer {
@@ -38,24 +34,7 @@ public class AllInPackageConfigurationProducer extends JUnitConfigurationProduce
final PsiElement element = location.getPsiElement();
myPackage = checkPackage(element);
if (myPackage == null) return null;
final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
boolean junitJarFound = false;
final Module locationModule = location.getModule();
if (locationModule != null) {
junitJarFound = facade.findClass(JUnitUtil.TESTCASE_CLASS,
GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(locationModule, true)) != null;
} else {
for (PsiDirectory directory : myPackage.getDirectories()) {
final Module module = ModuleUtil.findModuleForFile(directory.getVirtualFile(), project);
if (module != null) {
if (facade.findClass(JUnitUtil.TESTCASE_CLASS, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, true)) != null) {
junitJarFound = true;
break;
}
}
}
}
if (!junitJarFound) return null;
if (!LocationUtil.isJarAttached(location, myPackage, JUnitUtil.TESTCASE_CLASS)) return null;
RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context);
final JUnitConfiguration configuration = (JUnitConfiguration)settings.getConfiguration();
final JUnitConfiguration.Data data = configuration.getPersistentData();
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPackageConfigurationProducer.java
+2 -17
View File
@@ -19,14 +19,10 @@ import com.intellij.execution.JavaRunConfigurationExtensionManager;
import com.intellij.execution.Location;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.execution.junit2.info.LocationUtil;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiPackage;
import com.intellij.psi.search.GlobalSearchScope;
import com.theoryinpractice.testng.model.TestData;
import com.theoryinpractice.testng.model.TestType;
import com.theoryinpractice.testng.util.TestNGUtil;
@@ -39,18 +35,7 @@ public class TestNGPackageConfigurationProducer extends TestNGConfigurationProdu
final PsiElement element = location.getPsiElement();
myPackage = checkPackage(element);
if (myPackage == null) return null;
final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
boolean testngJarFound = false;
for (PsiDirectory directory : myPackage.getDirectories()) {
final Module module = ModuleUtil.findModuleForFile(directory.getVirtualFile(), project);
if (module != null) {
if (facade.findClass(TestNGUtil.TEST_ANNOTATION_FQN, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, true)) != null) {
testngJarFound = true;
break;
}
}
}
if (!testngJarFound) return null;
if (!LocationUtil.isJarAttached(location, myPackage, TestNGUtil.TEST_ANNOTATION_FQN)) return null;
RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context);
final TestNGConfiguration configuration = (TestNGConfiguration)settings.getConfiguration();
final TestData data = configuration.data;