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

Jump to bottom

Improvements #54

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improvements #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c5d2c7
Various clean-ups based on IntelliJ.
atombrella May 25, 2020
f14d742
Added JaCoCo report to test generation.
atombrella May 25, 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
28 changes: 28 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,34 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<goals>
<goal>check</goal>
</goals>
</execution>
<execution>
<id>jacoco-report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<outputDirectory>target/jacoco-report</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/praqma/jenkins/memorymap/MemoryMapRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public MemoryMapRecorder(List<AbstractMemoryMapParser> 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<String, MemoryMapConfigMemory> config;

Expand Down Expand Up @@ -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
*/
Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/praqma/jenkins/memorymap/parser/gcc/GccMemoryMapParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/praqma/jenkins/memorymap/parser/ti/TexasInstrumentsMemoryMapParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
import java.util.regex.Pattern;
import org.jenkinsci.Symbol;

import javax.annotation.Nonnull;

/**
*
* @author Praqma
Expand Down Expand Up @@ -139,7 +141,7 @@ public int getDefaultWordSize() {
@Extension
public static final class DescriptorImpl extends MemoryMapParserDescriptor<TexasInstrumentsMemoryMapParser> {

@Override
@Override @Nonnull
public String getDisplayName() {
return "Texas Instruments";
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/praqma/jenkins/integration/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
5 changes: 0 additions & 5 deletions src/test/java/net/praqma/jenkins/usecases/BuildResultValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -31,7 +30,6 @@ public BuildResultValidator forBuild(Run<?, ?> build) {
}

public BuildResultValidator validateGraphs(boolean validateGraphs) {
this.validateGraphs = validateGraphs;
return this;
}

Expand Down Expand Up @@ -70,9 +68,6 @@ public void validate() throws Exception {
}
}

if (validateGraphs) {
//TODO: Implement me
}
}

public void printExpected(HashMap<String, HashMap<String, String>> expectedValues) {
Expand Down