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

Commit b240139

Browse files
committed
updated per review
1 parent 2aa3ffc commit b240139

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

src/main/java/com/mathworks/ci/RunMatlabTestsBuilder.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class RunMatlabTestsBuilder extends Builder implements SimpleBuildStep, M
5858
private Artifact pdfReportArtifact = new NullArtifact();
5959

6060
private SourceFolder sourceFolder;
61-
private SelectByFolder selectbyFolder;
61+
private SelectByFolder selectByFolder;
6262
private SelectByTag selectByTag;
6363

6464

@@ -110,8 +110,8 @@ public void setSourceFolder(SourceFolder sourceFolder) {
110110
}
111111

112112
@DataBoundSetter
113-
public void setSelectbyFolder(SelectByFolder selectbyFolder) {
114-
this.selectbyFolder = selectbyFolder;
113+
public void setSelectByFolder(SelectByFolder selectByFolder) {
114+
this.selectByFolder = selectByFolder;
115115
}
116116

117117

@@ -169,8 +169,8 @@ public SourceFolder getSourceFolder() {
169169
return this.sourceFolder;
170170
}
171171

172-
public SelectByFolder getSelectbyFolder(){
173-
return this.selectbyFolder;
172+
public SelectByFolder getSelectByFolder(){
173+
return this.selectByFolder;
174174
}
175175

176176
private Artifact getArtifactObject(boolean isChecked, Artifact returnVal) {
@@ -336,9 +336,9 @@ private String getInputArguments() {
336336
}
337337

338338
// Add Test folders
339-
if (getSelectbyFolder() != null && !getSelectbyFolder().getTestFolderPaths().isEmpty()) {
340-
getSelectbyFolder().addSourceToInputArgs(inputArgsList,
341-
Utilities.getCellArrayFrmList(getSelectbyFolder().getTestFolderPaths().stream()
339+
if (getSelectByFolder() != null && !getSelectByFolder().getTestFolderPaths().isEmpty()) {
340+
getSelectByFolder().addSourceToInputArgs(inputArgsList,
341+
Utilities.getCellArrayFrmList(getSelectByFolder().getTestFolderPaths().stream()
342342
.map(TestFolders::getTestFolders).collect(Collectors.toList())));
343343
}
344344

@@ -515,7 +515,6 @@ public String getTestTag() {
515515
}
516516

517517
public void addTagToInputArgs(List<String> inputArgsList) {
518-
// Concatenate all source folders to MATLAB cell array string.
519518
inputArgsList.add("'" + SELECT_BY_TAG + "'" + "," + "'"
520519
+ getTestTag().replaceAll("'", "''") + "'");
521520
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
3-
<f:entry field="testTag" title="Tag Name: ">
3+
<f:entry field="testTag" title="Tag name: ">
44
<f:textbox/>
55
</f:entry>
66
</j:jelly>

src/main/resources/com/mathworks/ci/RunMatlabTestsBuilder/config.jelly

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
<f:block>
55
<br></br>
6-
<f:optionalProperty field="sourceFolder" title="Source Folder" />
6+
<f:optionalProperty field="sourceFolder" title="Source folder" />
77
</f:block>
88

99
<f:block>
1010
<br></br>
1111
<b>Filter Tests</b>
12-
<f:optionalProperty field="selectbyFolder" title="By Folder Name" />
12+
<f:optionalProperty field="selectByFolder" title="By folder name" />
1313
<br></br>
14-
<f:optionalProperty field="selectByTag" title="By Tag" />
14+
<f:optionalProperty field="selectByTag" title="By tag" />
1515
</f:block>
1616

1717
<f:block>

src/main/resources/com/mathworks/ci/SelectByFolder/config.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
33
<f:entry title="">
4-
<f:repeatable minimum="1" name="testFolderPaths" field="testFolderPaths" add="Add Test folder">
4+
<f:repeatable minimum="1" name="testFolderPaths" field="testFolderPaths" add="Add folder">
55
<table width="100%">
66
<f:textbox field="testFolders"/>
77
<input type="button" value="Delete" class="repeatable-delete show-if-not-only" style="margin-left: 0px; margin-top: 0px; padding-top: 0px"/>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
3-
<f:entry field="testTag" title="Tag Name: ">
3+
<f:entry field="testTag" title="Tag name: ">
44
<f:textbox/>
55
</f:entry>
66
</j:jelly>

0 commit comments

Comments
 (0)