[JENKINS-65757] only use pluginFirst classloader when you have no other option (and never for guice!) #151
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| package hudson.plugins.jacoco.e2e; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.hamcrest.Description; | ||
| import org.hamcrest.TypeSafeDiagnosingMatcher; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.jvnet.hudson.test.RealJenkinsRule; | ||
|
|
||
| import hudson.Functions; | ||
| import hudson.model.Descriptor; | ||
| import hudson.model.FreeStyleBuild; | ||
| import hudson.model.FreeStyleProject; | ||
| import hudson.plugins.jacoco.JacocoBuildAction; | ||
| import hudson.plugins.jacoco.JacocoPublisher; | ||
| import hudson.plugins.jacoco.model.Coverage; | ||
| import hudson.tasks.BatchFile; | ||
| import hudson.tasks.Builder; | ||
| import hudson.tasks.Publisher; | ||
| import hudson.tasks.Shell; | ||
| import hudson.util.DescribableList; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.*; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
|
|
||
| import static hudson.plugins.jacoco.e2e.E2ETest.CoverageMatcher.withCoverage; | ||
|
|
||
| public class E2ETest { | ||
|
|
||
| @Rule | ||
| public RealJenkinsRule rjr = new RealJenkinsRule(); | ||
|
There was a problem hiding this comment. |
||
|
|
||
| @Test | ||
| public void simpleTest() throws Throwable { | ||
| rjr.then(r -> { | ||
| FreeStyleProject project = r.createFreeStyleProject(); | ||
| project.getBuildersList().addAll(createJacocoProjectBuilders()); | ||
| project.getPublishersList().add(new JacocoPublisher()); | ||
|
|
||
| FreeStyleBuild build = r.buildAndAssertSuccess(project); | ||
|
|
||
| assertThat("plugin collected data", build.getLog(), containsString("Collecting JaCoCo coverage data")); | ||
|
|
||
| JacocoBuildAction action = build.getAction(JacocoBuildAction.class); | ||
| assertThat("Build has the Jacoco Action", action, notNullValue()); | ||
|
|
||
| assertThat("incorrect branch coverage reported", action.getBranchCoverage(), withCoverage(0, 621, 621)); | ||
| assertThat("incorrect class coverage reported", action.getClassCoverage(), withCoverage(7, 59, 66)); | ||
| assertThat("incorrect complexity coverage reported", action.getComplexityScore(), withCoverage(19, 835, 854)); | ||
| assertThat("incorrect instruction coverage reported", action.getInstructionCoverage(), withCoverage(229, 9013, 9242)); | ||
| assertThat("incorrect line coverage reported", action.getLineCoverage(), withCoverage(53, 1860, 1913)); | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| private static List<Builder> createJacocoProjectBuilders() { | ||
| String[] commands = { "git clone --branch jacoco-3.2.0 https://github.com/jenkinsci/jacoco-plugin.git .", | ||
|
There was a problem hiding this comment. whilst running maven inside a test is not the best, we are using this project as the test (and a tag) so we at least have most of the dependencies already local. It will diverge over time, so we may want to try and keep this somewhat in sync There was a problem hiding this comment. So binaries "git" and "mvn" need to be available on the CI node for this to work, right? There was a problem hiding this comment. yes, but maven already is as it is what runs the build that runs this test :) as for There was a problem hiding this comment. For a more reproducible environment:
but still use the Java in path I guess. |
||
| "mvn -P enable-jacoco -B -Dtest=ClassReportTest test" }; | ||
| List<Builder> builders = new ArrayList<>(); | ||
| if (Functions.isWindows()) { | ||
| for (String command : commands) { | ||
| builders.add(new BatchFile(command)); | ||
| } | ||
| } else { | ||
| for (String command : commands) { | ||
| builders.add(new Shell(command)); | ||
| } | ||
| } | ||
| return builders; | ||
| } | ||
|
|
||
| public static class CoverageMatcher extends TypeSafeDiagnosingMatcher<Coverage> { | ||
|
|
||
| private final int covered; | ||
| private final int missed; | ||
| private final int total; | ||
|
|
||
| private CoverageMatcher(int covered, int missed, int total) { | ||
| this.covered = covered; | ||
| this.missed = missed; | ||
| this.total = total; | ||
| } | ||
| @Override | ||
| public void describeTo(Description description) { | ||
| description.appendText(" with covered="+ covered); | ||
| description.appendText(" and missed="+ missed); | ||
| description.appendText(" and total="+ total); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected boolean matchesSafely(Coverage coverage, Description mismatchDescription) { | ||
| mismatchDescription.appendText(" with covered="+ coverage.getCovered()); | ||
| mismatchDescription.appendText(" and missed="+ coverage.getMissed()); | ||
| mismatchDescription.appendText(" and total="+ coverage.getTotal()); | ||
|
|
||
| return coverage.getCovered() == covered && | ||
| coverage.getMissed() == missed && | ||
| coverage.getTotal() == total; | ||
| } | ||
|
|
||
| public static CoverageMatcher withCoverage(int covered, int missed, int total) { | ||
| return new CoverageMatcher(covered, missed, total); | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/jenkinsci/jenkins-test-harness/releases/tag/1589.vc23fca066d5c OK