azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

183: MavenImportingTestCase: no more runs for Maven2

Browse Source 
because IDEA gets rid of maven2-tests
This commit is contained in:
Nicolay Mitropolsky
2018-08-13 15:40:36 +03:00
parent 696b05eb6e
commit 7f49b78e5f
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.183
+3 -24
View File
@@ -46,7 +46,6 @@ import org.jetbrains.idea.maven.execution.*;
import org.jetbrains.idea.maven.model.MavenArtifact; import org.jetbrains.idea.maven.model.MavenArtifact;
import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.model.MavenExplicitProfiles;
import org.jetbrains.idea.maven.project.*; import org.jetbrains.idea.maven.project.*;
import org.jetbrains.idea.maven.server.MavenServerManager;
import org.jetbrains.jps.model.java.JavaResourceRootType; import org.jetbrains.jps.model.java.JavaResourceRootType;
import org.jetbrains.jps.model.java.JavaSourceRootProperties; import org.jetbrains.jps.model.java.JavaSourceRootProperties;
import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.java.JavaSourceRootType;
@@ -389,34 +388,14 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
} }
protected void importProjectWithProfiles(String... profiles) { protected void importProjectWithProfiles(String... profiles) {
doImportProjects(true, Collections.singletonList(myProjectPom), profiles); doImportProjects(Collections.singletonList(myProjectPom), profiles);
}
protected void importProject(VirtualFile file) {
importProjects(file);
} }
protected void importProjects(VirtualFile... files) { protected void importProjects(VirtualFile... files) {
doImportProjects(true, Arrays.asList(files)); doImportProjects(Arrays.asList(files));
} }
protected void importProjectWithMaven3(@NonNls String xml) throws IOException { private void doImportProjects(List<VirtualFile> files, String... profiles) {
createProjectPom(xml);
importProjectWithMaven3();
}
protected void importProjectWithMaven3() {
importProjectWithMaven3WithProfiles();
}
protected void importProjectWithMaven3WithProfiles(String... profiles) {
doImportProjects(false, Collections.singletonList(myProjectPom), profiles);
}
private void doImportProjects(boolean useMaven2, final List<VirtualFile> files, String... profiles) {
if (useMaven2)
MavenServerManager.getInstance().setUseMaven2();
initProjectsManager(false); initProjectsManager(false);
readProjects(files, profiles); readProjects(files, profiles);