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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-11-02 12:15:49 +01:00
parent b8d0499865 9911a30f60
commit 7c097ea5b2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
+6 -2
View File
@@ -781,6 +781,7 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
iof2.mkdirs();
VirtualFile f1 = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(iof1);
VirtualFile f2 = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(iof2);
VirtualFile f3 = createProjectSubDir("m1/foo/bar3");
VirtualFile m1 = createModulePom("m1", "<groupId>test</groupId>" +
"<artifactId>m1</artifactId>" +
@@ -804,6 +805,7 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
" <additionalClasspathElements>" +
" <additionalClasspathElement>" + f1.getPath() + "</additionalClasspathElement>" +
" <additionalClasspathElement>" + f2.getPath() + "</additionalClasspathElement>" +
" <additionalClasspathElement>${project.basedir}/foo/bar3</additionalClasspathElement>" +
" </additionalClasspathElements>" +
" </configuration>" +
" </plugin>" +
@@ -832,7 +834,8 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
getProjectPath() + "/m1/src/test/java",
getRepositoryPath() + "/junit/junit/4.0/junit-4.0.jar",
f1.getPath(),
f2.getPath());
f2.getPath(),
f3.getPath());
assertAllProductionClasspath("m1",
getProjectPath() + "/m1/target/classes",
@@ -842,7 +845,8 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
getProjectPath() + "/m1/target/classes",
getRepositoryPath() + "/junit/junit/4.0/junit-4.0.jar",
f1.getPath(),
f2.getPath());
f2.getPath(),
f3.getPath());
}
public void testDoNotChangeClasspathForRegularModules() throws Exception {