summaryrefslogtreecommitdiff
path: root/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-08-19 22:27:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-19 21:25:05 +0000
commit4ca751c002784c4bfd349cc5240b045b62277c80 (patch)
treedfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java
parent890d9a2952301682ffecaed4495f5f65c84c3642 (diff)
parent060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff)
downloadidea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java')
-rw-r--r--plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTestCase.java5
1 files changed, 3 insertions, 2 deletions
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
+}