Skip to content

check junit dependencies task can be skipped #1427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 23, 2020
Merged

check junit dependencies task can be skipped #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d49c35
check junit dependencies task can be skipped
j-baker Jun 23, 2020
493bcd7
Add generated changelog entries
j-baker Jun 23, 2020
2b0e4a5
fix compile
j-baker Jun 23, 2020
40372c7
spotless
j-baker Jun 23, 2020
9880605
Use a constant
j-baker Jun 23, 2020
3db2197
probably test source sets
j-baker Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-1427.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: improvement
improvement:
description: check junit dependencies task can be skipped
links:
- https://github.com/palantir/gradle-baseline/pull/1427
50 changes: 31 additions & 19 deletions gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/CheckJUnitDependencies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,25 @@

package com.palantir.baseline.tasks;

import static java.util.stream.Collectors.toList;

import com.google.common.base.Preconditions;
import com.palantir.baseline.plugins.BaselineTesting;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Stream;
import org.gradle.api.DefaultTask;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.ModuleVersionIdentifier;
import org.gradle.api.artifacts.result.ResolvedComponentResult;
import org.gradle.api.plugins.JavaPluginConvention;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Classpath;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.testing.Test;
Expand All @@ -38,29 +44,35 @@ public class CheckJUnitDependencies extends DefaultTask {
public CheckJUnitDependencies() {
setGroup("Verification");
setDescription("Ensures the correct JUnit4/5 dependencies are present, otherwise tests may silently not run");
getOutputs().upToDateWhen(_task -> true);
}

@TaskAction
public final void validateDependencies() {
getProject()
.getConvention()
.getPlugin(JavaPluginConvention.class)
.getSourceSets()
.forEach(ss -> {
if (ss.getName().equals("main")) {
return;
}

Optional<Test> maybeTestTask = BaselineTesting.getTestTaskForSourceSet(getProject(), ss);
if (!maybeTestTask.isPresent()) {
// source set doesn't have a test task, e.g. 'schema'
return;
}
Test task = maybeTestTask.get();

getProject().getLogger().info("Analyzing source set {} with task {}", ss.getName(), task.getName());
validateSourceSet(ss, task);
});
getProbablyTestSourceSets().forEach(ss -> {
Optional<Test> maybeTestTask = BaselineTesting.getTestTaskForSourceSet(getProject(), ss);
if (!maybeTestTask.isPresent()) {
// source set doesn't have a test task, e.g. 'schema'
return;
}
Test task = maybeTestTask.get();

getProject().getLogger().info("Analyzing source set {} with task {}", ss.getName(), task.getName());
validateSourceSet(ss, task);
});
}

@Classpath
public final Provider<List<Configuration>> getConfigurations() {
Copy link
Contributor

@robert3005 robert3005 Jun 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think gradle will get angry at you for using Provider<List<>> instead of ListProperty. If you want to have dynamic set of inputs you have to do it via getInputs() similarly to how you handle outputs

Copy link
Contributor Author

@j-baker j-baker Jun 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is using the same pattern as check unused dependencies. Propeties are differnet to providers, right?

Copy link
Contributor

@CRogers CRogers Jun 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be fine, right? There was a bug in Gradle 6.something that tried to cast Providers to CollectionPropertyInternal at some point, forcing you to use Propertys, but this was fixed?

return getProject().provider(() -> getProbablyTestSourceSets()
.map(SourceSet::getRuntimeClasspathConfigurationName)
.map(getProject().getConfigurations()::getByName)
.collect(toList()));
}

private Stream<SourceSet> getProbablyTestSourceSets() {
return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().stream()
.filter(ss -> !ss.getName().equals(SourceSet.MAIN_SOURCE_SET_NAME));
}

private void validateSourceSet(SourceSet ss, Test task) {
Expand Down