diff options
Diffstat (limited to 'plugins/maven/src/test')
11 files changed, 54 insertions, 26 deletions
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java index 6cc0966180b0..79639e96c8b8 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java @@ -42,6 +42,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.execution.*; import org.jetbrains.idea.maven.model.MavenArtifact; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.project.MavenArtifactDownloader; import org.jetbrains.idea.maven.project.MavenProject; import org.jetbrains.idea.maven.project.MavenProjectsManager; @@ -402,7 +403,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase { } protected void readProjects(List<VirtualFile> files, String... profiles) { - myProjectsManager.resetManagedFilesAndProfilesInTests(files, Arrays.asList(profiles)); + myProjectsManager.resetManagedFilesAndProfilesInTests(files, new MavenExplicitProfiles(Arrays.asList(profiles))); waitForReadingCompletion(); } @@ -502,7 +503,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase { protected void executeGoal(String relativePath, String goal) { VirtualFile dir = myProjectRoot.findFileByRelativePath(relativePath); - MavenRunnerParameters rp = new MavenRunnerParameters(true, dir.getPath(), Arrays.asList(goal), null); + MavenRunnerParameters rp = new MavenRunnerParameters(true, dir.getPath(), Arrays.asList(goal), Collections.<String>emptyList()); MavenRunnerSettings rs = new MavenRunnerSettings(); MavenExecutor e = new MavenExternalExecutor(myProject, rp, getMavenGeneralSettings(), rs, new SoutMavenConsole()); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java index 24b6e5f4e39c..38fc7e27d99a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java @@ -19,6 +19,7 @@ import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import java.util.Arrays; @@ -658,7 +659,7 @@ public class ResourceFilteringTest extends MavenCompilingTestCase { compileModules("project"); assertResult("target/classes/file.properties", "value=val1"); - myProjectsManager.setExplicitProfiles(Arrays.asList("two")); + myProjectsManager.setExplicitProfiles(new MavenExplicitProfiles(Arrays.asList("two"))); scheduleResolveAll(); resolveDependenciesAndImport(); compileModules("project"); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java index dc3fb091287b..f9c648cacd5b 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java @@ -27,6 +27,7 @@ import com.intellij.psi.xml.XmlTag; import org.jetbrains.idea.maven.dom.model.MavenDomProfiles; import org.jetbrains.idea.maven.dom.model.MavenDomProfilesModel; import org.jetbrains.idea.maven.dom.model.MavenDomSettingsModel; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.vfs.MavenPropertiesVirtualFileSystem; import java.util.Arrays; @@ -933,7 +934,7 @@ public class MavenPropertyCompletionAndResolutionTest extends MavenDomTestCase { assertContain(variants, "project.groupId"); assertDoNotContain(variants, "groupId"); } - + public void testCompletingAfterOpenBraceAndSomeTextWithDot() throws Exception { createProjectPom("<groupId>test</groupId>" + "<artifactId>project</artifactId>" + @@ -955,7 +956,7 @@ public class MavenPropertyCompletionAndResolutionTest extends MavenDomTestCase { } private void readWithProfiles(String... profiles) { - myProjectsManager.setExplicitProfiles(Arrays.asList(profiles)); + myProjectsManager.setExplicitProfiles(new MavenExplicitProfiles(Arrays.asList(profiles))); waitForReadingCompletion(); } } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenExecutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenExecutionTest.java index 4a0f5e22cc45..f8c019c5b6be 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenExecutionTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenExecutionTest.java @@ -30,6 +30,7 @@ import org.jetbrains.idea.maven.MavenImportingTestCase; import javax.swing.*; import java.io.File; import java.util.Arrays; +import java.util.Collections; @SuppressWarnings({"ConstantConditions"}) public class MavenExecutionTest extends MavenImportingTestCase { @@ -59,7 +60,7 @@ public class MavenExecutionTest extends MavenImportingTestCase { assertFalse(new File(getProjectPath(), "target").exists()); - execute(new MavenRunnerParameters(true, getProjectPath(), Arrays.asList("compile"), null)); + execute(new MavenRunnerParameters(true, getProjectPath(), Arrays.asList("compile"), Collections.<String>emptyList())); assertTrue(new File(getProjectPath(), "target").exists()); } @@ -84,7 +85,7 @@ public class MavenExecutionTest extends MavenImportingTestCase { assertModules("project"); assertExcludes("project", "target"); - MavenRunnerParameters params = new MavenRunnerParameters(true, getProjectPath(), Arrays.asList("compile"), null); + MavenRunnerParameters params = new MavenRunnerParameters(true, getProjectPath(), Arrays.asList("compile"), Collections.<String>emptyList()); execute(params); SwingUtilities.invokeAndWait(new Runnable() { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java index e98fe82ec4b8..008fc9c88076 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java @@ -19,6 +19,7 @@ import com.intellij.idea.Bombed; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.idea.maven.MavenImportingTestCase; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.project.MavenProject; import java.util.Calendar; @@ -34,7 +35,7 @@ public abstract class MavenPerformanceTest extends MavenImportingTestCase { super.setUp(); VirtualFile file = LocalFileSystem.getInstance().findFileByPath("C:\\projects\\mvn\\_projects\\geronimo\\pom.xml"); initProjectsManager(false); - myProjectsManager.resetManagedFilesAndProfilesInTests(Collections.singletonList(file), Collections.<String>emptyList()); + myProjectsManager.resetManagedFilesAndProfilesInTests(Collections.singletonList(file), MavenExplicitProfiles.NONE); } public void testReading() throws Exception { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorTest.java index 86a80e0b98e6..a04fe5bd94d5 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorTest.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.maven.navigator; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.idea.maven.MavenImportingTestCase; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import java.util.Arrays; import java.util.Collections; @@ -50,7 +51,7 @@ public class MavenProjectsNavigatorTest extends MavenImportingTestCase { createModulePom("m", "<groupId>test</groupId>" + "<artifactId>m</artifactId>" + "<version>1</version>"); - myProjectsManager.resetManagedFilesAndProfilesInTests(Collections.singletonList(myProjectPom), Collections.<String>emptyList()); + myProjectsManager.resetManagedFilesAndProfilesInTests(Collections.singletonList(myProjectPom), MavenExplicitProfiles.NONE); waitForReadingCompletion(); myProjectsManager.fireActivatedInTests(); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java index e6e946e71c15..cea4ea2232e9 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java @@ -18,6 +18,8 @@ package org.jetbrains.idea.maven.project; import com.intellij.ProjectTopics; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.roots.*; +import com.intellij.openapi.util.registry.Registry; +import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Consumer; import org.jetbrains.idea.maven.MavenImportingTestCase; @@ -49,6 +51,23 @@ public class MavenFoldersImporterTest extends MavenImportingTestCase { assertNull(myProjectRoot.findChild("target")); } + public void testIgnoreTargetFolder() throws Exception { + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>"); + + new File(myProjectRoot.getPath(), "target/classes").mkdirs(); + updateProjectFolders(); + + assertExcludes("project", "target"); + myProjectRoot.refresh(false, true); + VirtualFile target = myProjectRoot.findChild("target"); + assertNotNull(target); + if (!Registry.is("ide.hide.excluded.files")) { + assertTrue(ChangeListManager.getInstance(myProject).isIgnoredFile(target)); + } + } + public void testUpdatingFoldersForAllTheProjects() throws Exception { createProjectPom("<groupId>test</groupId>" + "<artifactId>project</artifactId>" + diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java index 770196b390b9..8fc251ac3791 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java @@ -1586,7 +1586,7 @@ public class MavenProjectReaderTest extends MavenTestCase { String... profiles) { MavenProjectReaderResult result = new MavenProjectReader().readProject(getMavenGeneralSettings(), file, - Arrays.asList(profiles), + new MavenExplicitProfiles(Arrays.asList(profiles)), locator); return result; } @@ -1629,7 +1629,7 @@ public class MavenProjectReaderTest extends MavenTestCase { private void assertActiveProfiles(List<String> explicitProfiles, String... expected) { MavenProjectReaderResult result = readProject(myProjectPom, new NullProjectLocator(), ArrayUtil.toStringArray(explicitProfiles)); - assertUnorderedElementsAreEqual(result.activatedProfiles, expected); + assertUnorderedElementsAreEqual(result.activatedProfiles.getEnabledProfiles(), expected); } private static class NullProjectLocator implements MavenProjectReaderProjectLocator { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsManagerTest.java index 6c9bc1c4d08f..dc7f5490f272 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsManagerTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsManagerTest.java @@ -29,6 +29,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.FileContentUtil; import org.jetbrains.idea.maven.MavenImportingTestCase; import org.jetbrains.idea.maven.importing.MavenRootModelAdapter; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.server.NativeMavenProjectHolder; import java.io.File; @@ -686,7 +687,7 @@ public class MavenProjectsManagerTest extends MavenImportingTestCase { "<version>1</version>"); importProjects(p1, p2); - myProjectsManager.setExplicitProfiles(Arrays.asList("one", "two")); + myProjectsManager.setExplicitProfiles(new MavenExplicitProfiles(Arrays.asList("one", "two"))); myProjectsManager.setIgnoredFilesPaths(Arrays.asList(p1.getPath())); myProjectsManager.setIgnoredFilesPatterns(Arrays.asList("*.xxx")); @@ -707,7 +708,7 @@ public class MavenProjectsManagerTest extends MavenImportingTestCase { assertUnorderedPathsAreEqual(myProjectsManager.getProjectsTreeForTests().getManagedFilesPaths(), Arrays.asList(p1.getPath(), p3.getPath())); - assertUnorderedElementsAreEqual(myProjectsManager.getExplicitProfiles(), "three"); + assertUnorderedElementsAreEqual(myProjectsManager.getExplicitProfiles().getEnabledProfiles(), "three"); assertUnorderedPathsAreEqual(myProjectsManager.getIgnoredFilesPaths(), Arrays.asList(p1.getPath())); assertUnorderedElementsAreEqual(myProjectsManager.getIgnoredFilesPatterns(), "*.zzz"); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeReadingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeReadingTest.java index 842b6099b721..c3a322c49c0a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeReadingTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeReadingTest.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.util.Function; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.server.NativeMavenProjectHolder; import org.jetbrains.idea.maven.utils.MavenUtil; @@ -1539,7 +1540,7 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { MyLoggingListener l = new MyLoggingListener(); myTree.addListener(l); - myTree.addManagedFilesWithProfiles(Collections.singletonList(myProjectPom), Collections.<String>emptyList()); + myTree.addManagedFilesWithProfiles(Collections.singletonList(myProjectPom), MavenExplicitProfiles.NONE); myTree.updateAll(false, getMavenGeneralSettings(), EMPTY_MAVEN_PROCESS); assertEquals("updated: parent m1 m2 deleted: <none> ", l.log); @@ -2022,7 +2023,7 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { myProjectPom); MavenProject project = myTree.findProject(myProjectPom); - assertUnorderedElementsAreEqual(project.getActivatedProfilesIds(), + assertUnorderedElementsAreEqual(project.getActivatedProfilesIds().getEnabledProfiles(), "projectProfileXml", "projectProfile", "parent1Profile", @@ -2044,7 +2045,7 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { embeddersManager.releaseInTests(); } - assertUnorderedElementsAreEqual(project.getActivatedProfilesIds(), + assertUnorderedElementsAreEqual(project.getActivatedProfilesIds().getEnabledProfiles(), "projectProfileXml", "projectProfile", "parent1Profile", @@ -2069,24 +2070,24 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { "</profile>"); updateAll(Arrays.asList("one", "two"), myProjectPom); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles(), "one", "two"); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles(), "one", "two"); deleteProfilesXml(); update(myProjectPom); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles(), "one"); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles(), "one"); createProjectPom("<groupId>test</groupId>" + "<artifactId>project</artifactId>" + "<version>1</version>"); update(myProjectPom); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles()); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles()); createProfilesXml("<profile>" + " <id>two</id>" + "</profile>"); update(myProjectPom); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles(), "two"); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles(), "two"); createProjectPom("<groupId>test</groupId>" + "<artifactId>project</artifactId>" + @@ -2097,7 +2098,7 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { " </profile>" + "</profiles>"); update(myProjectPom); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles(), "one", "two"); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles(), "one", "two"); } public void testDeletingAndRestoringActiveProfilesWhenProjectDeletes() throws Exception { @@ -2128,7 +2129,7 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { "</profiles>"); updateAll(Arrays.asList("one", "two"), myProjectPom); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles(), "one", "two"); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles(), "one", "two"); final VirtualFile finalM = m; new WriteCommandAction.Simple(myProject) { @@ -2139,7 +2140,7 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { } }.execute().throwException(); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles(), "one"); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles(), "one"); m = createModulePom("m", "<groupId>test</groupId>" + @@ -2152,7 +2153,7 @@ public class MavenProjectsTreeReadingTest extends MavenProjectsTreeTestCase { " </profile>" + "</profiles>"); update(m); - assertUnorderedElementsAreEqual(myTree.getExplicitProfiles(), "one", "two"); + assertUnorderedElementsAreEqual(myTree.getExplicitProfiles().getEnabledProfiles(), "one", "two"); } public void testFindRootWithMultiLevelAggregator() throws Exception { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java index 3688a2df46dd..8d73c5f53bb1 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.maven.project; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.idea.maven.MavenImportingTestCase; +import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.utils.MavenProcessCanceledException; import java.io.IOException; @@ -33,7 +34,7 @@ public abstract class MavenProjectsTreeTestCase extends MavenImportingTestCase { } protected void updateAll(List<String> profiles, VirtualFile... files) throws MavenProcessCanceledException { - myTree.resetManagedFilesAndProfiles(asList(files), profiles); + myTree.resetManagedFilesAndProfiles(asList(files), new MavenExplicitProfiles(profiles)); myTree.updateAll(false, getMavenGeneralSettings(), EMPTY_MAVEN_PROCESS); } @@ -50,4 +51,4 @@ public abstract class MavenProjectsTreeTestCase extends MavenImportingTestCase { each.setBinaryContent(each.contentsToByteArray()); } } -}
\ No newline at end of file +} |