Skip to content
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

Bump echarts-api from 4.9.0-2 to 4.9.0-3 #138

Merged
merged 12 commits into from
Feb 11, 2021
Merged

Bump echarts-api from 4.9.0-2 to 4.9.0-3 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
48541b3
Bump echarts-api from 4.9.0-2 to 4.9.0-3
dependabot[bot] Jan 20, 2021
a6d50d5
Bump autograding-model from 0.9.0 to 1.1.0
dependabot[bot] Jan 25, 2021
b8d6a9f
Bump warnings-ng from 8.4.4 to 8.7.0
dependabot[bot] Jan 25, 2021
65a9c85
Update checks API Call.
uhafner Jan 31, 2021
a021796
Bump version of plugin-util-api to 1.6.1.
uhafner Jan 31, 2021
27dfbfc
Merge remote-tracking branch 'origin/dependabot/maven/io.jenkins.plug…
uhafner Jan 31, 2021
032030b
Add exclusion for analysis-model.
uhafner Jan 31, 2021
51a7f43
Merge remote-tracking branch 'origin/master' into dependabot/maven/io…
uhafner Jan 31, 2021
a6d28f6
Merge remote-tracking branch 'origin/master' into dependabot/maven/io…
uhafner Jan 31, 2021
b1fb447
Merge branch 'dependabot/maven/edu.hm.hafner-autograding-model-1.1.0'…
uhafner Jan 31, 2021
6433235
Fix UI tests.
uhafner Feb 10, 2021
239fb87
Merge remote-tracking branch 'origin/master' into dependabot/maven/io…
uhafner Feb 11, 2021
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
16 changes: 13 additions & 3 deletions plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
<changelist>-SNAPSHOT</changelist>
<module.name>${project.groupId}.autograding</module.name>

<autograding-model.version>0.9.0</autograding-model.version>
<autograding-model.version>1.1.0</autograding-model.version>

<commons.lang.version>3.11</commons.lang.version>

<font-awesome-api.version>5.15.2-1</font-awesome-api.version>
<jquery3-api.version>3.5.1-2</jquery3-api.version>
<bootstrap4-api.version>4.6.0-1</bootstrap4-api.version>
<data-tables-api.version>1.10.23-2</data-tables-api.version>
<echarts-api.version>4.9.0-2</echarts-api.version>
<echarts-api.version>4.9.0-3</echarts-api.version>
<echarts-build-trends.version>2.0.0</echarts-build-trends.version>
<plugin-util-api.version>1.7.0</plugin-util-api.version>
<codingstyle.library.version>1.6.0</codingstyle.library.version>

<code-coverage-api-plugin.version>1.2.1</code-coverage-api-plugin.version>
<pitmutation-plugin.version>1.0-18</pitmutation-plugin.version>
<junit-plugin.version>1.37</junit-plugin.version>
<warnings-ng-plugin.version>8.4.4</warnings-ng-plugin.version>
<warnings-ng-plugin.version>8.7.0</warnings-ng-plugin.version>

<pipeline-stage-step.version>2.5</pipeline-stage-step.version>
<workflow-support.version>3.3</workflow-support.version>
Expand Down Expand Up @@ -75,6 +75,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
<version>4.5.13-1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand All @@ -97,6 +103,10 @@
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>edu.hm.hafner</groupId>
<artifactId>analysis-model</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions plugin/src/main/java/io/jenkins/plugins/grading/AutoGrader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ public void perform(@NonNull final Run<?, ?> run, @NonNull final FilePath worksp
JacksonFacade jackson = new JacksonFacade();
AggregatedScore score = new AggregatedScore(configuration, log);

log.logInfo("Test Configuration: " + jackson.toJson(score.getTestConfiguration()));
log.logInfo("Test Configuration: %s", jackson.toJson(score.getTestConfiguration()));
score.addTestScores(new JenkinsTestSupplier(run));
log.logInfo("Code Coverage Configuration: " + jackson.toJson(score.getCoverageConfiguration()));
log.logInfo("Code Coverage Configuration: %s", jackson.toJson(score.getCoverageConfiguration()));
score.addCoverageScores(new JenkinsCoverageSupplier(run));
log.logInfo("PIT Mutation Coverage Configuration: " + jackson.toJson(score.getPitConfiguration()));
log.logInfo("PIT Mutation Coverage Configuration: %s", jackson.toJson(score.getPitConfiguration()));
score.addPitScores(new JenkinsPitSupplier(run));
log.logInfo("Static Analysis Configuration: " + jackson.toJson(score.getAnalysisConfiguration()));
log.logInfo("Static Analysis Configuration: %s", jackson.toJson(score.getAnalysisConfiguration()));
JenkinsAnalysisSupplier analysisScores = new JenkinsAnalysisSupplier(run);
score.addAnalysisScores(analysisScores);

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/io/jenkins/plugins/grading/AutoGradingChecksPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void publishChecks(final Run<?, ?> run, final TaskListener listener,
.withOutput(new ChecksOutputBuilder()
.withTitle(report.getHeader())
.withSummary(report.getSummary(score))
.withText(report.getDetails(score, Collections.emptyList(), warnings))
.withText(report.getDetails(score, Collections.emptyList())) // FIXME: we need to show the failures here as well
.withAnnotations(createAnnotations(warnings))
.build())
.withDetailsURL(getAbsoluteUrl(run))
Expand Down
64 changes: 19 additions & 45 deletions ui-tests/src/test/java/io/jenkins/plugins/grading/AutoGradingPluginUiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@WithPlugins({"autograding", "warnings-ng", "junit", "pitmutation", "code-coverage-api", "pipeline-stage-step", "workflow-durable-task-step", "workflow-basic-steps"})
public class AutoGradingPluginUiTest extends AbstractJUnitTest {
private static final String AUTOGRADING_PLUGIN_PREFIX = "/autograding_test/";
private static final String CONFIGURATION = "{\"analysis\":{\"maxScore\":100,\"errorImpact\":-5,\"highImpact\":-3,\"normalImpact\":-2,\"lowImpact\":-1}, \"coverage\":{\"maxScore\":200,\"coveredPercentageImpact\":1,\"missedPercentageImpact\":0}, \"tests\":{\"maxScore\":100,\"passedImpact\":1,\"failureImpact\":-10,\"skippedImpact\":-1}, \"pit\":{\"maxScore\":100,\"detectedImpact\":1,\"undetectedImpact\":-10,\"ratioImpact\":0}}";

/**
* Test all cards with all tools.
Expand All @@ -32,69 +33,42 @@ public void testWithAllCards() {
WorkflowJob job = jenkins.jobs.create(WorkflowJob.class);
job.sandbox.check();

String conf = "{\"analysis\":{\"maxScore\":100,\"errorImpact\":-5,\"highImpact\":-3,\"normalImpact\":-2,\"lowImpact\":-1}, \"coverage\":{\"maxScore\":100,\"coveredImpact\":1,\"missedImpact\":-10}, \"tests\":{\"maxScore\":100,\"passedImpact\":1,\"failureImpact\":-10,\"skippedImpact\":-1}, \"pit\":{\"maxScore\":100,\"detectedImpact\":1,\"undetectedImpact\":-10,\"ratioImpact\":0}}";
configurePipeline(job, conf, "checkstyle-result.xml", "pmd.xml", "cpd.xml", "Main.java", "jacoco.xml", "mutations.xml", "TEST-TestScore.xml");
configurePipeline(job, CONFIGURATION, "checkstyle-result.xml", "pmd.xml", "cpd.xml", "Main.java", "jacoco.xml", "mutations.xml", "TEST-TestScore.xml");

job.save();
Build build = shouldBuildJobUnstable(job); // unstable due to failing tests

AutoGradePageObject pageObject = new AutoGradePageObject(build, buildAutoGradeURLFromJob(job));

assertThat(pageObject.getTotalScoreInPercent()).isEqualTo("75%");
assertThat(pageObject.getTotalScores()).containsExactly("92%", "100%", "91%", "18%");
assertThat(pageObject.getTotalScoreInPercent()).isEqualTo("73%");
assertThat(pageObject.getTotalScores()).containsExactly("92%", "83%", "91%", "18%");

verifyTests(pageObject);
verifyCoverage(pageObject);
verifyMutationCoverage(pageObject);
verifyAnalysis(pageObject);
}

private void verifyTests(final AutoGradePageObject pageObject) {
assertThatTestResultsHeaderIsCorrect(pageObject.getTestHeaders());
assertThat(pageObject.getTestBody().get("tests")).containsExactly(3, 1, 1, 5, -8);
assertThat(pageObject.getTestFooter()).containsExactly("1", "-10", "-1", "n/a", "n/a");
}

assertThatCodeCoverageHeaderIsCorrect(pageObject.getCoverageHeaders());
assertThat(pageObject.getCoverageBody().get("Line Coverage")).containsExactly(83, 17, 0);
assertThat(pageObject.getCoverageBody().get("Conditional Coverage")).containsExactly(83, 17, 0);
assertThat(pageObject.getCoverageFooter()).containsExactly("0", "0", "n/a");

private void verifyMutationCoverage(final AutoGradePageObject pageObject) {
assertThatPITMutationsHeaderIsCorrect(pageObject.getPitHeaders());
assertThat(pageObject.getPitBody().get("pit")).containsExactly(1, 1, 50, 50, -9);
assertThat(pageObject.getPitFooter()).containsExactly("1", "-10", "0", "0", "n/a");

assertThatStaticAnalysisHeaderIsCorrect(pageObject.getAnalysisHeaders());
assertThat(pageObject.getAnalysisBody().get("CheckStyle")).containsExactly(6, 0, 2, 3, 11, -37);
assertThat(pageObject.getAnalysisBody().get("PMD")).containsExactly(0, 0, 3, 0, 3, -6);
assertThat(pageObject.getAnalysisBody().get("CPD")).containsExactly(0, 5, 9, 6, 20, -39);
assertThat(pageObject.getAnalysisBody().get("FindBugs")).containsExactly(0, 0, 0, 0, 0, 0);
assertThat(pageObject.getAnalysisFooter()).containsExactly("-5", "-3", "-2", "-1", "n/a", "n/a");
}

/**
* Test all Cards except Test Results (Tests not present).
*/
@Test
public void testWithAllCardsExceptTestResults() {
WorkflowJob job = jenkins.jobs.create(WorkflowJob.class);
job.sandbox.check();

String conf = "{\"analysis\":{\"maxScore\":100,\"errorImpact\":-5,\"highImpact\":-3,\"normalImpact\":-2,\"lowImpact\":-1}, \"coverage\":{\"maxScore\":100,\"coveredImpact\":1,\"missedImpact\":-10}, \"pit\":{\"maxScore\":100,\"detectedImpact\":1,\"undetectedImpact\":-10,\"ratioImpact\":0}}";
configurePipelineWithoutJUnitTests(job, conf, "checkstyle-result.xml", "pmd.xml", "cpd.xml", "Main.java", "jacoco.xml", "mutations.xml");

job.save();
Build build = shouldBuildJobSuccessfully(job);

AutoGradePageObject pageObject = new AutoGradePageObject(build, buildAutoGradeURLFromJob(job));

assertThat(pageObject.getTotalScoreInPercent()).isEqualTo("69%");
assertThat(pageObject.getTotalScores()).containsExactly("100%", "100%", "91%", "18%");

assertThatTestResultsHeaderIsCorrect(pageObject.getTestHeaders());
assertThat(pageObject.getTestBody().size()).isZero();

private void verifyCoverage(final AutoGradePageObject pageObject) {
assertThatCodeCoverageHeaderIsCorrect(pageObject.getCoverageHeaders());
assertThat(pageObject.getCoverageBody().get("Line Coverage")).containsExactly(83, 17, 0);
assertThat(pageObject.getCoverageBody().get("Conditional Coverage")).containsExactly(83, 17, 0);
assertThat(pageObject.getCoverageFooter()).containsExactly("0", "0", "n/a");

assertThatPITMutationsHeaderIsCorrect(pageObject.getPitHeaders());
assertThat(pageObject.getPitBody().get("pit")).containsExactly(1, 1, 50, 50, -9);
assertThat(pageObject.getPitFooter()).containsExactly("1", "-10", "0", "0", "n/a");
assertThat(pageObject.getCoverageBody().get("Line Coverage")).containsExactly(83, 17, 83);
assertThat(pageObject.getCoverageBody().get("Conditional Coverage")).containsExactly(83, 17, 83);
assertThat(pageObject.getCoverageFooter()).containsExactly("1", "0", "n/a");
}

private void verifyAnalysis(final AutoGradePageObject pageObject) {
assertThatStaticAnalysisHeaderIsCorrect(pageObject.getAnalysisHeaders());
assertThat(pageObject.getAnalysisBody().get("CheckStyle")).containsExactly(6, 0, 2, 3, 11, -37);
assertThat(pageObject.getAnalysisBody().get("PMD")).containsExactly(0, 0, 3, 0, 3, -6);
Expand Down