Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 33ea7c9

Browse files
mw-kapilgmw-kapilg
committed
update method accesses and fix decimal addition issue
1 parent caa10cb commit 33ea7c9

File tree

8 files changed

+44
-37
lines changed

8 files changed

+44
-37
lines changed

‎pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@
5353
<tag>HEAD</tag>
5454
</scm>
5555

56-
<properties>
57-
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
58-
<jenkins.baseline>2.387</jenkins.baseline>
59-
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
60-
</properties>
56+
<properties>
57+
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
58+
<jenkins.baseline>2.387</jenkins.baseline>
59+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
60+
<maven.compiler.source>11</maven.compiler.source>
61+
<maven.compiler.target>11</maven.compiler.target>
62+
</properties>
6163

6264
<dependencyManagement>
6365
<dependencies>

‎src/main/java/com/mathworks/ci/MatlabTestCase.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
import java.util.List;
11+
import java.math.BigDecimal;
1112
import java.util.ArrayList;
1213

1314
import org.apache.commons.lang.RandomStringUtils;
@@ -18,14 +19,14 @@ public class MatlabTestCase {
1819
private String name;
1920
private List<MatlabTestDiagnostics> diagnostics;
2021
private TestStatus status;
21-
private Double duration;
22+
private BigDecimal duration;
2223
private String id;
2324

2425
public MatlabTestCase(String name) {
2526
this.name = name;
2627
this.diagnostics = new ArrayList<MatlabTestDiagnostics>();
2728
this.status = TestStatus.NOT_RUN;
28-
this.duration = 0.0;
29+
this.duration = new BigDecimal("0.0");
2930
this.id = RandomStringUtils.randomAlphanumeric(8);
3031
}
3132

@@ -53,11 +54,11 @@ public void setStatus(TestStatus status) {
5354
this.status = status;
5455
}
5556

56-
public Double getDuration() {
57+
public BigDecimal getDuration() {
5758
return this.duration;
5859
}
5960

60-
public void setDuration(Double duration) {
61+
public void setDuration(BigDecimal duration) {
6162
this.duration = duration;
6263
}
6364

‎src/main/java/com/mathworks/ci/MatlabTestFile.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
import java.util.List;
11+
import java.math.BigDecimal;
1112
import java.util.ArrayList;
1213

1314
import org.apache.commons.lang.RandomStringUtils;
@@ -17,25 +18,25 @@
1718
public class MatlabTestFile {
1819
private String path;
1920
private String name;
20-
private Double duration;
21+
private BigDecimal duration;
2122
private TestStatus status;
2223
private List<MatlabTestCase> matlabTestCases;
2324
private String id;
2425

2526
public MatlabTestFile(String name) {
2627
this.name = name;
2728
this.path = "";
28-
this.duration = 0.0;
29+
this.duration = new BigDecimal("0.0");
2930
this.status = TestStatus.NOT_RUN;
3031
this.matlabTestCases = new ArrayList<MatlabTestCase>();
3132
this.id = RandomStringUtils.randomAlphanumeric(8);
3233
}
3334

34-
public void incrementDuration(Double matlabTestCaseDuration) {
35-
this.duration += matlabTestCaseDuration;
35+
private void incrementDuration(BigDecimal matlabTestCaseDuration) {
36+
this.duration = this.duration.add(matlabTestCaseDuration);
3637
}
3738

38-
public void updateStatus(MatlabTestCase matlabTestCase) {
39+
private void updateStatus(MatlabTestCase matlabTestCase) {
3940
if (!this.status.equals(TestStatus.FAILED)) {
4041
if (matlabTestCase.getStatus().equals(TestStatus.FAILED)){
4142
this.status = TestStatus.FAILED;
@@ -73,11 +74,11 @@ public void setName(String name) {
7374
this.name = name;
7475
}
7576

76-
public Double getDuration() {
77+
public BigDecimal getDuration() {
7778
return this.duration;
7879
}
7980

80-
public void setDuration(Double duration) {
81+
public void setDuration(BigDecimal duration) {
8182
this.duration = duration;
8283
}
8384

‎src/main/java/com/mathworks/ci/TestResultsViewAction.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.io.File;
99
import java.io.IOException;
1010
import java.io.InputStreamReader;
11+
import java.math.BigDecimal;
1112
import java.nio.charset.StandardCharsets;
1213
import java.nio.file.Files;
1314
import java.nio.file.Path;
@@ -136,11 +137,11 @@ private void getTestSessionResults(List<MatlabTestFile> testSessionResults, JSON
136137
matlabTestFile.setPath(this.workspace.getName() + File.separator + relPath.toString());
137138

138139
MatlabTestCase matlabTestCase = new MatlabTestCase(matlabTestCaseName);
139-
if (matlabTestCaseResult.get("Duration") instanceof Long) {
140-
matlabTestCase.setDuration(((Long) matlabTestCaseResult.get("Duration")).doubleValue());
141-
} else if (matlabTestCaseResult.get("Duration") instanceof Double) {
142-
matlabTestCase.setDuration(((Double) matlabTestCaseResult.get("Duration")));
143-
}
140+
// if (matlabTestCaseResult.get("Duration") instanceof Long) {
141+
matlabTestCase.setDuration(new BigDecimal(matlabTestCaseResult.get("Duration").toString()));
142+
// } else if (matlabTestCaseResult.get("Duration") instanceof Double) {
143+
// matlabTestCase.setDuration(((Double) matlabTestCaseResult.get("Duration")));
144+
// }
144145

145146
if ((boolean) matlabTestCaseResult.get("Failed")){
146147
matlabTestCase.setStatus(TestStatus.FAILED);

‎src/test/java/integ/com/mathworks/ci/TestResultsViewActionTest.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.io.File;
99
import java.io.IOException;
1010
import java.io.InputStream;
11+
import java.math.BigDecimal;
1112
import java.net.URISyntaxException;
1213
import java.net.URL;
1314
import java.util.List;
@@ -26,6 +27,7 @@
2627
import com.mathworks.ci.MatlabBuilderConstants;
2728
import com.mathworks.ci.MatlabTestDiagnostics;
2829
import com.mathworks.ci.MatlabTestFile;
30+
import com.mathworks.ci.TestResultsViewAction;
2931
import com.mathworks.ci.TestResultsViewAction.*;
3032
import com.mathworks.ci.UseMatlabVersionBuildWrapper;
3133
import com.mathworks.ci.freestyle.RunMatlabBuildBuilder;
@@ -268,10 +270,10 @@ public void verifyMatlabTestFileDuration() throws ExecutionException, Interrupte
268270
copyFileInWorkspace("testArtifacts/t1/windows/" + MatlabBuilderConstants.TEST_RESULTS_VIEW_ARTIFACT + ".json",targetFile,artifactRoot);
269271
TestResultsViewAction ac = new TestResultsViewAction(build, workspace, actionID);
270272
List<List<MatlabTestFile>> ta = ac.getTestResults();
271-
Double actualDuration1 = ta.get(0).get(0).getDuration();
272-
Assert.assertEquals("Incorrect test file duration",(Double) 1.7,actualDuration1);
273-
Double actualDuration2 = ta.get(1).get(0).getDuration();
274-
Assert.assertEquals("Incorrect test file duration",(Double) 0.1,actualDuration2);
273+
BigDecimal actualDuration1 = ta.get(0).get(0).getDuration();
274+
Assert.assertEquals("Incorrect test file duration",new BigDecimal("1.7"),actualDuration1);
275+
BigDecimal actualDuration2 = ta.get(1).get(0).getDuration();
276+
Assert.assertEquals("Incorrect test file duration",new BigDecimal("0.1"),actualDuration2);
275277
}
276278

277279
/**
@@ -315,7 +317,7 @@ public void verifyMatlabTestCaseName() throws ExecutionException, InterruptedExc
315317
String actualName1_5 = ta.get(0).get(0).getMatlabTestCases().get(4).getName();
316318
Assert.assertEquals("Incorrect test case name","testLeapYear",actualName1_5);
317319
String actualName1_8 = ta.get(0).get(0).getMatlabTestCases().get(7).getName();
318-
Assert.assertEquals("Incorrect test case name","testInvalidDateFormat",actualName1_8);
320+
Assert.assertEquals("Incorrect test case name","testValidDateFormat",actualName1_8);
319321
String actualName1_9 = ta.get(0).get(0).getMatlabTestCases().get(8).getName();
320322
Assert.assertEquals("Incorrect test case name","testInvalidDateFormat",actualName1_9);
321323
String actualName2 = ta.get(1).get(0).getMatlabTestCases().get(0).getName();
@@ -362,14 +364,14 @@ public void verifyMatlabTestCaseDuration() throws ExecutionException, Interrupte
362364
copyFileInWorkspace("testArtifacts/t1/windows/" + MatlabBuilderConstants.TEST_RESULTS_VIEW_ARTIFACT + ".json",targetFile,artifactRoot);
363365
TestResultsViewAction ac = new TestResultsViewAction(build, workspace, actionID);
364366
List<List<MatlabTestFile>> ta = ac.getTestResults();
365-
Double actualDuration1_1 = ta.get(0).get(0).getMatlabTestCases().get(0).getDuration();
366-
Assert.assertEquals("Incorrect test case duration",(Double) 0.1,actualDuration1_1);
367-
Double actualDuration1_5 = ta.get(0).get(0).getMatlabTestCases().get(1).getDuration();
368-
Assert.assertEquals("Incorrect test case duration",(Double) 0.4,actualDuration1_5);
369-
Double actualDuration1_9 = ta.get(0).get(0).getMatlabTestCases().get(2).getDuration();
370-
Assert.assertEquals("Incorrect test case duration",(Double) 0.0,actualDuration1_9);
371-
Double actualDuration2 = ta.get(1).get(0).getMatlabTestCases().get(0).getDuration();
372-
Assert.assertEquals("Incorrect test case duration",(Double) 0.1,actualDuration2);
367+
BigDecimal actualDuration1_1 = ta.get(0).get(0).getMatlabTestCases().get(0).getDuration();
368+
Assert.assertEquals("Incorrect test case duration",new BigDecimal("0.1"),actualDuration1_1);
369+
BigDecimal actualDuration1_5 = ta.get(0).get(0).getMatlabTestCases().get(4).getDuration();
370+
Assert.assertEquals("Incorrect test case duration",new BigDecimal("0.4"),actualDuration1_5);
371+
BigDecimal actualDuration1_9 = ta.get(0).get(0).getMatlabTestCases().get(8).getDuration();
372+
Assert.assertEquals("Incorrect test case duration",new BigDecimal("0"),actualDuration1_9);
373+
BigDecimal actualDuration2 = ta.get(1).get(0).getMatlabTestCases().get(0).getDuration();
374+
Assert.assertEquals("Incorrect test case duration",new BigDecimal("0.1"),actualDuration2);
373375
}
374376

375377
/**

‎src/test/resources/testArtifacts/t1/linux/matlabTestResults.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
},
175175
{
176176
"TestResult": {
177-
"Duration": 0.0,
177+
"Duration": 0,
178178
"Details": {
179179
"SimulinkTestManagerResults": []
180180
},

‎src/test/resources/testArtifacts/t1/mac/matlabTestResults.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
},
175175
{
176176
"TestResult": {
177-
"Duration": 0.0,
177+
"Duration": 0,
178178
"Details": {
179179
"SimulinkTestManagerResults": []
180180
},

‎src/test/resources/testArtifacts/t1/windows/matlabTestResults.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
},
175175
{
176176
"TestResult": {
177-
"Duration": 0.0,
177+
"Duration": 0,
178178
"Details": {
179179
"SimulinkTestManagerResults": []
180180
},

0 commit comments

Comments
 (0)