diff --git a/pom.xml b/pom.xml index e6d040d6..5835378c 100644 --- a/pom.xml +++ b/pom.xml @@ -161,6 +161,34 @@ + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + + + prepare-agent + + + + jacoco-check + + check + + + + jacoco-report + test + + report + + + target/jacoco-report + + + + org.apache.maven.plugins maven-failsafe-plugin diff --git a/src/main/java/net/praqma/jenkins/memorymap/MemoryMapRecorder.java b/src/main/java/net/praqma/jenkins/memorymap/MemoryMapRecorder.java index 13edd493..6cca5854 100644 --- a/src/main/java/net/praqma/jenkins/memorymap/MemoryMapRecorder.java +++ b/src/main/java/net/praqma/jenkins/memorymap/MemoryMapRecorder.java @@ -75,7 +75,7 @@ public MemoryMapRecorder(List chosenParsers) { } @Override - public void perform(@Nonnull Run build, @Nonnull FilePath workspace, @Nonnull Launcher launcher, @Nonnull TaskListener listener) throws InterruptedException, IOException { + public void perform(@Nonnull Run build, @Nonnull FilePath workspace, @Nonnull Launcher launcher, @Nonnull TaskListener listener) throws InterruptedException, IOException { PrintStream out = listener.getLogger(); HashMap config; @@ -141,14 +141,14 @@ public Integer getWordSize() { public void setWordSize(int wordSize) { this.wordSize = wordSize; } - + /** * @return the scale */ public String getScale() { return scale; } - + /** * @param scale the scale to set */ diff --git a/src/main/java/net/praqma/jenkins/memorymap/parser/gcc/GccMemoryMapParser.java b/src/main/java/net/praqma/jenkins/memorymap/parser/gcc/GccMemoryMapParser.java index 1d71f554..22a2b5bf 100644 --- a/src/main/java/net/praqma/jenkins/memorymap/parser/gcc/GccMemoryMapParser.java +++ b/src/main/java/net/praqma/jenkins/memorymap/parser/gcc/GccMemoryMapParser.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.logging.Level; diff --git a/src/main/java/net/praqma/jenkins/memorymap/parser/ti/TexasInstrumentsMemoryMapParser.java b/src/main/java/net/praqma/jenkins/memorymap/parser/ti/TexasInstrumentsMemoryMapParser.java index a7413fdf..2ac017c6 100644 --- a/src/main/java/net/praqma/jenkins/memorymap/parser/ti/TexasInstrumentsMemoryMapParser.java +++ b/src/main/java/net/praqma/jenkins/memorymap/parser/ti/TexasInstrumentsMemoryMapParser.java @@ -44,6 +44,8 @@ import java.util.regex.Pattern; import org.jenkinsci.Symbol; +import javax.annotation.Nonnull; + /** * * @author Praqma @@ -139,7 +141,7 @@ public int getDefaultWordSize() { @Extension public static final class DescriptorImpl extends MemoryMapParserDescriptor { - @Override + @Override @Nonnull public String getDisplayName() { return "Texas Instruments"; } diff --git a/src/test/java/net/praqma/jenkins/integration/TestUtils.java b/src/test/java/net/praqma/jenkins/integration/TestUtils.java index 591dd279..3b9c99a3 100644 --- a/src/test/java/net/praqma/jenkins/integration/TestUtils.java +++ b/src/test/java/net/praqma/jenkins/integration/TestUtils.java @@ -225,7 +225,7 @@ public static void unzipArchiveToProjectWorkspace(FreeStyleProject project, Stri } public static void copyFilesToProjectWorkspace(FreeStyleProject project, String... files) throws Exception { - FilePath workspace = project.getWorkspace(); + FilePath workspace = project.getSomeWorkspace(); for (String file : Arrays.asList(files)) { workspace.copyFrom(TestUtils.class.getResource(file)); } diff --git a/src/test/java/net/praqma/jenkins/usecases/BuildResultValidator.java b/src/test/java/net/praqma/jenkins/usecases/BuildResultValidator.java index c6eff4bc..662c7100 100644 --- a/src/test/java/net/praqma/jenkins/usecases/BuildResultValidator.java +++ b/src/test/java/net/praqma/jenkins/usecases/BuildResultValidator.java @@ -17,7 +17,6 @@ public class BuildResultValidator { private Run build; private ResultContainer expectedResults; - private boolean validateGraphs = true; private boolean validateValues = true; public BuildResultValidator expect(String json) { @@ -31,7 +30,6 @@ public BuildResultValidator forBuild(Run build) { } public BuildResultValidator validateGraphs(boolean validateGraphs) { - this.validateGraphs = validateGraphs; return this; } @@ -70,9 +68,6 @@ public void validate() throws Exception { } } - if (validateGraphs) { - //TODO: Implement me - } } public void printExpected(HashMap> expectedValues) {