MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-313767 refactoring: MavenProjectsManagerStateTest updateSuspendable

Browse Source 
GitOrigin-RevId: 8b2599a1a828086117cd4e5ad38858e9b7f461d7
This commit is contained in:
Dmitry Kichinsky
2023-06-05 22:53:30 +02:00
committed by intellij-monorepo-bot
parent c597db167e
commit 35b284a783
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/model/MavenExplicitProfiles.java
View File

@@ -53,4 +53,12 @@ public class MavenExplicitProfiles implements Serializable {
result = 31 * result + myDisabledProfiles.hashCode();
return result;
}
@Override
public String toString() {
return "MavenExplicitProfiles{" +
"myEnabledProfiles=" + myEnabledProfiles +
", myDisabledProfiles=" + myDisabledProfiles +
'}';
}
}

14
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java
View File

@@ -15,6 +15,7 @@ import com.intellij.util.xmlb.annotations.Transient;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.idea.maven.config.MavenConfig;
import org.jetbrains.idea.maven.config.MavenConfigParser;
import org.jetbrains.idea.maven.execution.MavenExecutionOptions;
@@ -158,6 +159,15 @@ public class MavenGeneralSettings implements Cloneable {
}
public void setMavenHome(@NotNull final String mavenHome) {
setMavenHome(mavenHome, true);
}
@TestOnly
public void setMavenHomeNoFire(@NotNull final String mavenHome) {
setMavenHome(mavenHome, false);
}
private void setMavenHome(@NotNull final String mavenHome, boolean fireChanged) {
final File mavenHomeDirectory = MavenUtil.resolveMavenHomeDirectory(mavenHome);
final File bundledMavenHomeDirectory = MavenUtil.resolveMavenHomeDirectory(MavenServerManager.BUNDLED_MAVEN_3);
@@ -168,7 +178,9 @@ public class MavenGeneralSettings implements Cloneable {
if (!Objects.equals(this.mavenHome, mavenHomeToSet)) {
this.mavenHome = mavenHomeToSet;
myDefaultPluginsCache = null;
changed();
if (fireChanged) {
changed();
}
}
}

15
plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsManagerStateTest.java
View File

@@ -16,7 +16,7 @@ import java.util.Collections;
public class MavenProjectsManagerStateTest extends MavenMultiVersionImportingTestCase {
@Override
protected void setUp() throws Exception {
MavenUtil.setNoBackgroundMode();
MavenUtil.setUpdateSuspendable();
super.setUp();
initProjectsManager(true);
Assume.assumeFalse(MavenUtil.isLinearImportEnabled());
@@ -24,7 +24,7 @@ public class MavenProjectsManagerStateTest extends MavenMultiVersionImportingTes
@Override
protected void tearDown() throws Exception {
MavenUtil.resetNoBackgroundMode();
MavenUtil.resetUpdateSuspendable();
super.tearDown();
}
@@ -41,6 +41,17 @@ public class MavenProjectsManagerStateTest extends MavenMultiVersionImportingTes
<groupId>test</groupId>
<artifactId>project1</artifactId>
<version>1</version>
<profiles>
<profile>
<id>one</id>
</profile>
<profile>
<id>two</id>
</profile>
<profile>
<id>three</id>
</profile>
</profiles>
""");
VirtualFile p2 = createModulePom("project2",

2
plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenWrapperTestFixture.java
View File

@@ -104,6 +104,6 @@ public class MavenWrapperTestFixture {
}
public void tearDown() throws Exception {
MavenWorkspaceSettingsComponent.getInstance(myProject).getSettings().generalSettings.setMavenHome(MavenServerManager.BUNDLED_MAVEN_3);
MavenWorkspaceSettingsComponent.getInstance(myProject).getSettings().generalSettings.setMavenHomeNoFire(MavenServerManager.BUNDLED_MAVEN_3);
}
}