Skip to content

Commit d865860

Browse files
Flanker-MSFTFlanker-MSFT
authored andcommitted
Skip tests for webapp getting start courses
1 parent 73e767e commit d865860

File tree

3 files changed

+19
-8
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij

3 files changed

+19
-8
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/task/DeployWebAppTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected RunnerAndConfigurationSettings getRunConfigurationSettings(@Nonnull Co
4545
final AzureArtifact azureArtifact = allSupportedAzureArtifacts.get(0);
4646
((WebAppConfiguration) runConfiguration).saveArtifact(azureArtifact);
4747
final List<BeforeRunTask> beforeRunTasks = new ArrayList<>();
48-
beforeRunTasks.add(BuildArtifactBeforeRunTaskUtils.createBuildTask(azureArtifact, runConfiguration));
48+
beforeRunTasks.add(BuildArtifactBeforeRunTaskUtils.createBuildTask(azureArtifact, runConfiguration, true));
4949
beforeRunTasks.addAll(runConfiguration.getBeforeRunTasks());
5050
manager.setBeforeRunTasks(runConfiguration, beforeRunTasks);
5151
((WebAppConfiguration) runConfiguration).setOpenBrowserAfterDeployment(false);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-guidance/src/main/java/com/microsoft/azure/toolkit/ide/guidance/Context.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.Map;
2121
import java.util.Objects;
2222
import java.util.Optional;
23+
import java.util.concurrent.ConcurrentHashMap;
24+
import java.util.concurrent.CopyOnWriteArrayList;
2325
import java.util.function.Consumer;
2426

2527
@Getter
@@ -31,8 +33,8 @@ public class Context {
3133
private final Project project;
3234
private final Map<String, Object> parameters = new HashMap<>();
3335

34-
private final Map<String, List<Consumer<Object>>> propertyChangeListenerMap = new HashMap<>();
35-
private final List<Consumer<Context>> contextListenerList = new ArrayList<>();
36+
private final Map<String, List<Consumer<Object>>> propertyChangeListenerMap = new ConcurrentHashMap<>();
37+
private final List<Consumer<Context>> contextListenerList = new CopyOnWriteArrayList<>();
3638

3739
public Context(@Nonnull final Course course, @Nullable Map<String, Object> context) {
3840
this.course = course;

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/java/com/microsoft/intellij/util/BuildArtifactBeforeRunTaskUtils.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040

4141
public class BuildArtifactBeforeRunTaskUtils {
4242
private static final String GRADLE_TASK_ASSEMBLE = "assemble";
43+
private static final String GRADLE_TASL_SKIP_TESTS = "-x test";
4344
private static final String MAVEN_TASK_PACKAGE = "package";
45+
private static final String MAVEN_TASK_PACKAGE_SKIP_TESTS = "package -DskipTests";
4446

4547
public static void addBeforeRunTask(
4648
@Nonnull ConfigurationSettingsEditorWrapper editor,
@@ -84,11 +86,15 @@ public static List<? extends BeforeRunTask<?>> getBuildTasks(@Nonnull Configurat
8486
}
8587

8688
public static @Nullable BeforeRunTask<?> createBuildTask(@Nonnull AzureArtifact artifact, @Nonnull RunConfiguration config) {
89+
return createBuildTask(artifact, config, false);
90+
}
91+
92+
public static @Nullable BeforeRunTask<?> createBuildTask(@Nonnull AzureArtifact artifact, @Nonnull RunConfiguration config, boolean skipTests) {
8793
switch (artifact.getType()) {
8894
case Maven:
89-
return createMavenPackageTask((MavenProject) artifact.getReferencedObject(), config);
95+
return createMavenPackageTask((MavenProject) artifact.getReferencedObject(), config, skipTests);
9096
case Gradle:
91-
return createGradleAssembleTask((ExternalProjectPojo) artifact.getReferencedObject(), config);
97+
return createGradleAssembleTask((ExternalProjectPojo) artifact.getReferencedObject(), config, skipTests);
9298
case Artifact:
9399
return createIntellijBuildTask((Artifact) artifact.getReferencedObject(), config);
94100
case File:
@@ -136,22 +142,25 @@ public static BeforeRunTask<?> createIntellijBuildTask(@Nonnull Artifact artifac
136142
}
137143

138144
@Nonnull
139-
public static BeforeRunTask<?> createMavenPackageTask(@Nonnull MavenProject project, @Nonnull RunConfiguration config) {
145+
public static BeforeRunTask<?> createMavenPackageTask(@Nonnull MavenProject project, @Nonnull RunConfiguration config, boolean skipTests) {
140146
final String pomXmlPath = MavenUtils.getMavenModulePath(project);
141147
final MavenBeforeRunTask task = new MavenBeforeRunTask();
142148
task.setEnabled(true);
143149
task.setProjectPath(pomXmlPath);
144-
task.setGoal(MAVEN_TASK_PACKAGE);
150+
task.setGoal(skipTests ? MAVEN_TASK_PACKAGE_SKIP_TESTS : MAVEN_TASK_PACKAGE);
145151
return task;
146152
}
147153

148154
@Nonnull
149-
public static BeforeRunTask<?> createGradleAssembleTask(@Nonnull ExternalProjectPojo project, @Nonnull RunConfiguration config) {
155+
public static BeforeRunTask<?> createGradleAssembleTask(@Nonnull ExternalProjectPojo project, @Nonnull RunConfiguration config, boolean skipTests) {
150156
final GradleBeforeRunTaskProvider provider = new GradleBeforeRunTaskProvider(config.getProject());
151157
final ExternalSystemBeforeRunTask task = provider.createTask(config);
152158
task.getTaskExecutionSettings().setExternalSystemIdString(GradleConstants.SYSTEM_ID.toString());
153159
task.getTaskExecutionSettings().setExternalProjectPath(project.getPath());
154160
task.getTaskExecutionSettings().setTaskNames(Collections.singletonList(GRADLE_TASK_ASSEMBLE));
161+
if (skipTests) {
162+
task.getTaskExecutionSettings().setScriptParameters(GRADLE_TASL_SKIP_TESTS);
163+
}
155164
return task;
156165
}
157166

0 commit comments

Comments
 (0)