From 1712aa315ef5fb0b19119911c2e1d3869b6d31bb Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Mon, 15 Nov 2010 12:59:11 +0300 Subject: [PATCH] maven: test template --- .../importing/DependenciesImportingTest.java | 49 ++++++++++++++++++- .../importing/DependenciesManagementTest.java | 28 +++++------ 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java index 66e08718b44a..51ceaea5287b 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java @@ -1640,7 +1640,7 @@ public class DependenciesImportingTest extends MavenImportingTestCase { public void testCustomSourcesAndJavadocPaths() throws Exception { if (!checkUltimate()) return; - + importProject("test" + "project" + "1" + @@ -2041,4 +2041,51 @@ public class DependenciesImportingTest extends MavenImportingTestCase { assertModuleLibDep("project", "Maven: junit:junit:3.8.2", "jar://" + repoPath + "/junit/junit/3.8.2/junit-3.8.2.jar!/"); } + + //public void testVersionRangeDoesntBreakIndirectDependency() throws Exception { + // createProjectPom("test" + + // "project" + + // "1" + + // "pom" + + // + // "" + + // " m1" + + // " m2" + + // ""); + // + // createModulePom("m1", "test" + + // "m1" + + // "1" + + // + // "" + + // " " + + // " asm" + + // " asm" + + // " 2.2.3" + + // " " + + // ""); + // + // createModulePom("m2", "test" + + // "m2" + + // "1" + + // + // "" + + // " " + + // " test" + + // " m1" + + // " 1" + + // " " + + // " " + + // " asm" + + // " asm" + + // " [2.2.3]" + + // " " + + // ""); + // + // importProject(); + // + // assertModuleModuleDeps("m2", "m1"); + // assertModuleLibDeps("m1", "Maven: asm:asm:2.2.3"); + // assertModuleLibDeps("m2", "Maven: asm:asm:2.2.3"); + //} } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesManagementTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesManagementTest.java index c886494cc88c..e7a135848e8a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesManagementTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesManagementTest.java @@ -74,7 +74,7 @@ public class DependenciesManagementTest extends MavenImportingTestCase { public void testImportingNotInstalledDependencies() throws Exception { if (ignore()) return; - + setRepositoryPath(new File(myDir, "/repo").getPath()); updateSettingsXml("" + getRepositoryPath() + ""); @@ -144,20 +144,20 @@ public class DependenciesManagementTest extends MavenImportingTestCase { updateSettingsXml("" + getRepositoryPath() + ""); VirtualFile parent = createModulePom("parent", - "test" + - "parent" + - "pom" + - "1" + + "test" + + "parent" + + "pom" + + "1" + - "" + - " " + - " " + - " junit" + - " junit" + - " 4.0" + - " " + - " " + - ""); + "" + + " " + + " " + + " junit" + + " junit" + + " 4.0" + + " " + + " " + + ""); VirtualFile project = createModulePom("project", "test" +