testng integration tests on TC

This commit is contained in:
Anna.Kozlova
2018-04-11 10:19:16 +02:00
parent 74f6d68ea3
commit f9e7bc12f9
3 changed files with 16 additions and 4 deletions
+1
View File
@@ -126,5 +126,6 @@
<orderEntry type="library" scope="RUNTIME" name="commons-net" level="project" />
<orderEntry type="module" module-name="intellij.tools.jetCheck" scope="TEST" />
<orderEntry type="module" module-name="intellij.devkit.java.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.testng.rt.tests" scope="TEST" />
</component>
</module>
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.SystemProperties;
import jetbrains.buildServer.messages.serviceMessages.ServiceMessage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.aether.ArtifactRepositoryManager;
@@ -112,6 +113,7 @@ public abstract class AbstractTestFrameworkIntegrationTest extends BaseConfigura
Collection<File> files = repoManager.resolveDependency(descriptor.getGroupId(), descriptor.getArtifactId(), descriptor.getVersion(),
descriptor.isIncludeTransitiveDependencies());
assertFalse("No files retrieved for: " + descriptor.getGroupId(), files.isEmpty());
for (File artifact : files) {
VirtualFile libJarLocal = LocalFileSystem.getInstance().findFileByIoFile(artifact);
assertNotNull(libJarLocal);
@@ -121,13 +123,16 @@ public abstract class AbstractTestFrameworkIntegrationTest extends BaseConfigura
}
protected ArtifactRepositoryManager getRepoManager() {
final String userHome = System.getProperty("user.home", null);
final File localRepo = userHome != null ? new File(userHome, ".m2/repository") : new File(".m2/repository");
final File localRepo = new File(SystemProperties.getUserHome(), ".m2/repository");
return new ArtifactRepositoryManager(
localRepo,
Collections.singletonList(ArtifactRepositoryManager.createRemoteRepository("maven", "http://maven.labs.intellij.net/repo1")),
ProgressConsumer.DEAF
new ProgressConsumer() {
@Override
public void consume(String message) {
System.out.println(message);
}
}
);
}
@@ -4,12 +4,15 @@ package com.intellij.testng.integration;
import com.intellij.execution.ExecutionException;
import com.intellij.java.execution.AbstractTestFrameworkCompilingIntegrationTest;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.EdtRule;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.RunsInEdt;
import com.theoryinpractice.testng.configuration.TestNGConfiguration;
import com.theoryinpractice.testng.util.TestNGUtil;
import org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor;
import org.junit.After;
import org.junit.Before;
@@ -50,6 +53,9 @@ public class TestNGIntegrationTest extends AbstractTestFrameworkCompilingIntegra
protected void setupModule() throws Exception {
super.setupModule();
addLibs(myModule, new JpsMavenRepositoryLibraryDescriptor("org.testng", "testng", myTestNGVersion), getRepoManager());
assertNotNull("Test annotation not found",
JavaPsiFacade.getInstance(getProject())
.findClass(TestNGUtil.TEST_ANNOTATION_FQN, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
}
@Override