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

testng: do not copy user's jar when it won't be able to start tests

Browse Source
This commit is contained in:
anna
2012-04-30 15:44:05 +02:00
parent 65b36e157c
commit 5bf0a1ebc0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGVersionChecker.java
+7 -3
View File
@@ -52,7 +52,7 @@ public class TestNGVersionChecker {
private static final Logger LOG = Logger.getInstance("#" + TestNGVersionChecker.class.getName());
private static final String TEST_NG_VERSIONS_INCOMPATIBILITY = "<html><b>!!!TestNG protocol incompatibility!!!</b><br>";
private static final String COPY_MESSAGE = "In order to use your project testng.jar, please, <a href=\"copy\">copy</a> it in the plugin lib directory.</html>";
private static final String COPY_MESSAGE = "In order to use your project testng.jar, please, <a href=\"copy\">copy</a> it in the plugin lib directory.";
@Nullable
public static String getVersionIncompatibilityMessage(Project project, GlobalSearchScope scope, String pathToBundledJar) {
@@ -85,7 +85,8 @@ public class TestNGVersionChecker {
@Nullable
private static String getIncompatibilityMessage(Project project, GlobalSearchScope scope, String pathToBundledJar) {
final String protocolClassMessageClass = TestResultMessage.class.getName();
final PsiClass psiProtocolClass = JavaPsiFacade.getInstance(project).findClass(protocolClassMessageClass, scope);
final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
final PsiClass psiProtocolClass = psiFacade.findClass(protocolClassMessageClass, scope);
if (psiProtocolClass != null) {
final ZipFile workingLibrary = getZipLibrary(project, scope);
if (workingLibrary != null) {
@@ -101,11 +102,14 @@ public class TestNGVersionChecker {
catch (IOException e) {
return null;
}
final boolean ableToStartWithUserJar = psiFacade.findClass("com.beust.jcommander.JCommander", scope) != null;
return TEST_NG_VERSIONS_INCOMPATIBILITY +
"Right now " + ApplicationNamesInfo.getInstance().getFullProductName() +
" does not support testng version (v." + jarVersion + ") used in your project due to the protocol changes on the TestNG side.<br>" +
"Bundled jar (v." + bundledVersion + ") was used instead to run your tests.<br>" +
COPY_MESSAGE;
(ableToStartWithUserJar ? COPY_MESSAGE
: "In order to use your project testng.jar, please, download & copy it in the plugin lib directory.") +
"</html>";
}
}
}