Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions src/main/java/com/mathworks/ci/BuildArtifactAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@

public class BuildArtifactAction implements Action {
private Run<?, ?> build;
private FilePath workspace;
private int totalCount;
private int skipCount;
private int failCount;
private static final String ROOT_ELEMENT = "taskDetails";
private static final String BUILD_ARTIFACT_FILE = "buildArtifact.json";

public BuildArtifactAction(Run<?, ?> build, FilePath workspace) {
public BuildArtifactAction(Run<?, ?> build) {
this.build = build;
this.workspace = workspace;

// Setting the counts of task when Action is created.
try{
Expand Down Expand Up @@ -130,9 +128,6 @@ public void setOwner(Run owner) {
this.build = owner;
}

public FilePath getWorkspace() {
return this.workspace;
}

private void setCounts() throws InterruptedException, ParseException {
List<BuildArtifactData> artifactData = new ArrayList<BuildArtifactData>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
+ "buildArtifact.json"));
jsonFile.copyTo(rootLocation);
jsonFile.delete();
build.addAction(new BuildArtifactAction(build, this.params.getWorkspace()));
build.addAction(new BuildArtifactAction(build));
}
}
}
20 changes: 10 additions & 10 deletions src/test/java/integ/com/mathworks/ci/BuildArtifactActionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private URL getResource(String resource) {
@Test
public void verifyBuildArtifactsReturned() throws ExecutionException, InterruptedException, URISyntaxException, IOException, ParseException {
FreeStyleBuild build = getFreestyleBuild();
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts/t1/buildArtifact.json","buildArtifact.json",artifactRoot);
List<BuildArtifactData> ba = ac.getBuildArtifact();
Expand All @@ -87,7 +87,7 @@ public void verifyBuildArtifactsReturned() throws ExecutionException, Interrupte
@Test
public void verifyFailedCount() throws ExecutionException, InterruptedException, URISyntaxException, IOException, ParseException {
FreeStyleBuild build = getFreestyleBuild();
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts/t1/buildArtifact.json","buildArtifact.json",artifactRoot);
List<BuildArtifactData> ba = ac.getBuildArtifact();
Expand All @@ -103,7 +103,7 @@ public void verifyFailedCount() throws ExecutionException, InterruptedException,
@Test
public void verifySkipCount() throws ExecutionException, InterruptedException, URISyntaxException, IOException, ParseException {
FreeStyleBuild build = getFreestyleBuild();
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts.t2/buildArtifact.json","buildArtifact.json",artifactRoot);
List<BuildArtifactData> ba = ac.getBuildArtifact();
Expand All @@ -118,7 +118,7 @@ public void verifySkipCount() throws ExecutionException, InterruptedException, U
@Test
public void verifyDurationIsAccurate() throws ExecutionException, InterruptedException, URISyntaxException, IOException, ParseException {
FreeStyleBuild build = getFreestyleBuild();
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts.t2/buildArtifact.json","buildArtifact.json",artifactRoot);
List<BuildArtifactData> ba = ac.getBuildArtifact();
Expand All @@ -133,7 +133,7 @@ public void verifyDurationIsAccurate() throws ExecutionException, InterruptedExc
@Test
public void verifyTaskDescriptionIsAccurate() throws ExecutionException, InterruptedException, URISyntaxException, IOException, ParseException {
FreeStyleBuild build = getFreestyleBuild();
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts.t2/buildArtifact.json","buildArtifact.json",artifactRoot);
List<BuildArtifactData> ba = ac.getBuildArtifact();
Expand All @@ -148,7 +148,7 @@ public void verifyTaskDescriptionIsAccurate() throws ExecutionException, Interru
@Test
public void verifyTaskNameIsAccurate() throws ExecutionException, InterruptedException, URISyntaxException, IOException, ParseException {
FreeStyleBuild build = getFreestyleBuild();
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts.t2/buildArtifact.json","buildArtifact.json",artifactRoot);
List<BuildArtifactData> ba = ac.getBuildArtifact();
Expand All @@ -165,7 +165,7 @@ public void verifyTotalTaskCountIsAccurate() throws ExecutionException, Interrup
FreeStyleBuild build = getFreestyleBuild();
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts.t2/buildArtifact.json","buildArtifact.json",artifactRoot);
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
Assert.assertEquals("Total task count is not correct",1,ac.getTotalCount());
}

Expand All @@ -179,7 +179,7 @@ public void verifyTotalTaskCountIsAccurate2() throws ExecutionException, Interru
FreeStyleBuild build = getFreestyleBuild();
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts/t1/buildArtifact.json","buildArtifact.json",artifactRoot);
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
Assert.assertEquals("Total task count is not correct",3,ac.getTotalCount());
}

Expand All @@ -193,7 +193,7 @@ public void verifyTotalFailedTaskCountIsAccurate() throws ExecutionException, In
FreeStyleBuild build = getFreestyleBuild();
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts/t1/buildArtifact.json","buildArtifact.json",artifactRoot);
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
Assert.assertEquals("Total task count is not correct",3,ac.getTotalCount());
Assert.assertEquals("Total task failed count is not correct",1,ac.getFailCount());
}
Expand All @@ -207,7 +207,7 @@ public void verifyTotalSkipTaskCountIsAccurate() throws ExecutionException, Inte
FreeStyleBuild build = getFreestyleBuild();
FilePath artifactRoot = new FilePath(build.getRootDir());
copyFileInWorkspace("buildArtifacts/t1/buildArtifact.json","buildArtifact.json",artifactRoot);
BuildArtifactAction ac = new BuildArtifactAction(build,build.getWorkspace());
BuildArtifactAction ac = new BuildArtifactAction(build);
Assert.assertEquals("Total task count is not correct",3,ac.getTotalCount());
Assert.assertEquals("Total task skip count is not correct",1,ac.getSkipCount());
}
Expand Down