|
40 | 40 |
|
41 | 41 | public class BuildArtifactBeforeRunTaskUtils { |
42 | 42 | private static final String GRADLE_TASK_ASSEMBLE = "assemble"; |
| 43 | + private static final String GRADLE_TASL_SKIP_TESTS = "-x test"; |
43 | 44 | private static final String MAVEN_TASK_PACKAGE = "package"; |
| 45 | + private static final String MAVEN_TASK_PACKAGE_SKIP_TESTS = "package -DskipTests"; |
44 | 46 |
|
45 | 47 | public static void addBeforeRunTask( |
46 | 48 | @Nonnull ConfigurationSettingsEditorWrapper editor, |
@@ -84,11 +86,15 @@ public static List<? extends BeforeRunTask<?>> getBuildTasks(@Nonnull Configurat |
84 | 86 | } |
85 | 87 |
|
86 | 88 | 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) { |
87 | 93 | switch (artifact.getType()) { |
88 | 94 | case Maven: |
89 | | - return createMavenPackageTask((MavenProject) artifact.getReferencedObject(), config); |
| 95 | + return createMavenPackageTask((MavenProject) artifact.getReferencedObject(), config, skipTests); |
90 | 96 | case Gradle: |
91 | | - return createGradleAssembleTask((ExternalProjectPojo) artifact.getReferencedObject(), config); |
| 97 | + return createGradleAssembleTask((ExternalProjectPojo) artifact.getReferencedObject(), config, skipTests); |
92 | 98 | case Artifact: |
93 | 99 | return createIntellijBuildTask((Artifact) artifact.getReferencedObject(), config); |
94 | 100 | case File: |
@@ -136,22 +142,25 @@ public static BeforeRunTask<?> createIntellijBuildTask(@Nonnull Artifact artifac |
136 | 142 | } |
137 | 143 |
|
138 | 144 | @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) { |
140 | 146 | final String pomXmlPath = MavenUtils.getMavenModulePath(project); |
141 | 147 | final MavenBeforeRunTask task = new MavenBeforeRunTask(); |
142 | 148 | task.setEnabled(true); |
143 | 149 | task.setProjectPath(pomXmlPath); |
144 | | - task.setGoal(MAVEN_TASK_PACKAGE); |
| 150 | + task.setGoal(skipTests ? MAVEN_TASK_PACKAGE_SKIP_TESTS : MAVEN_TASK_PACKAGE); |
145 | 151 | return task; |
146 | 152 | } |
147 | 153 |
|
148 | 154 | @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) { |
150 | 156 | final GradleBeforeRunTaskProvider provider = new GradleBeforeRunTaskProvider(config.getProject()); |
151 | 157 | final ExternalSystemBeforeRunTask task = provider.createTask(config); |
152 | 158 | task.getTaskExecutionSettings().setExternalSystemIdString(GradleConstants.SYSTEM_ID.toString()); |
153 | 159 | task.getTaskExecutionSettings().setExternalProjectPath(project.getPath()); |
154 | 160 | task.getTaskExecutionSettings().setTaskNames(Collections.singletonList(GRADLE_TASK_ASSEMBLE)); |
| 161 | + if (skipTests) { |
| 162 | + task.getTaskExecutionSettings().setScriptParameters(GRADLE_TASL_SKIP_TESTS); |
| 163 | + } |
155 | 164 | return task; |
156 | 165 | } |
157 | 166 |
|
|
0 commit comments