Skip to content

Commit

Permalink
Fixed delete label on campaign definition #2360
Browse files Browse the repository at this point in the history
Refactor of execution engine for a code easier to read.
Remove some documentation build warning messages
  • Loading branch information
vertigo17 committed Feb 14, 2022
1 parent edb2531 commit f597ce6
Show file tree
Hide file tree
Showing 8 changed files with 194 additions and 191 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -794,20 +794,20 @@ public List<TestCaseStepExecution> getTestCaseStepExecutionList() {
return testCaseStepExecutionList;
}

public void setTestCaseStepExecutionList(List<TestCaseStepExecution> testCaseStepExecutionList) {
this.testCaseStepExecutionList = testCaseStepExecutionList;
public void setTestCaseStepExecutionList(List<TestCaseStepExecution> stepExecutionList) {
this.testCaseStepExecutionList = stepExecutionList;
}

public void addTestCaseStepExecutionList(TestCaseStepExecution testCaseStepExecution) {
if (testCaseStepExecution != null) {
this.testCaseStepExecutionList.add(testCaseStepExecution);
public void addStepExecutionList(TestCaseStepExecution stepExecution) {
if (stepExecution != null) {
this.testCaseStepExecutionList.add(stepExecution);
}
}

public void addTestCaseStepExecutionList(List<TestCaseStepExecution> testCaseStepExecutionList) {
if (testCaseStepExecutionList != null) {
for (TestCaseStepExecution testCaseStepExecution : testCaseStepExecutionList) {
this.testCaseStepExecutionList.add(testCaseStepExecution);
public void addStepExecutionList(List<TestCaseStepExecution> stepExecutionList) {
if (stepExecutionList != null) {
for (TestCaseStepExecution stepExecution : stepExecutionList) {
this.testCaseStepExecutionList.add(stepExecution);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,16 +383,16 @@ public void setTestCaseStepActionExecutionList(List<TestCaseStepActionExecution>
this.testCaseStepActionExecutionList = testCaseStepActionExecutionList;
}

public void addTestCaseStepActionExecutionList(TestCaseStepActionExecution testCaseStepActionExecution) {
if (testCaseStepActionExecution != null) {
this.testCaseStepActionExecutionList.add(testCaseStepActionExecution);
public void addActionExecutionList(TestCaseStepActionExecution actionExecution) {
if (actionExecution != null) {
this.testCaseStepActionExecutionList.add(actionExecution);
}
}

public void addTestCaseStepActionExecutionList(List<TestCaseStepActionExecution> testCaseStepActionExecutionList) {
if (testCaseStepActionExecutionList != null) {
for (TestCaseStepActionExecution testCaseStepActionExecution : testCaseStepActionExecutionList) {
this.testCaseStepActionExecutionList.add(testCaseStepActionExecution);
public void addActionExecutionList(List<TestCaseStepActionExecution> actionExecutionList) {
if (actionExecutionList != null) {
for (TestCaseStepActionExecution actionExecution : actionExecutionList) {
this.testCaseStepActionExecutionList.add(actionExecution);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,10 @@ public AnswerItem<TestCaseExecution> readByKeyWithDependency(long executionId) {
testCaseExecution.setTestCaseStepExecutionList(preTestCaseSteps.getDataList());
// Then we add the steps from the main testcase.
AnswerList<TestCaseStepExecution> steps = testCaseStepExecutionService.readByVarious1WithDependency(executionId, testCaseExecution.getTest(), testCaseExecution.getTestCase());
testCaseExecution.addTestCaseStepExecutionList(steps.getDataList());
testCaseExecution.addStepExecutionList(steps.getDataList());
// Then we add the Post steps .
AnswerList<TestCaseStepExecution> postTestCaseSteps = testCaseStepExecutionService.readByVarious1WithDependency(executionId, Test.TEST_POSTTESTING, null);
testCaseExecution.addTestCaseStepExecutionList(postTestCaseSteps.getDataList());
testCaseExecution.addStepExecutionList(postTestCaseSteps.getDataList());

// Get Execution Files.
AnswerList<TestCaseExecutionFile> files = testCaseExecutionFileService.readByVarious(executionId, "");
Expand Down

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions source/src/main/resources/documentation/D2/documentation_en.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -130,138 +130,138 @@ link:{repo-url}/{file-to-include}[image:edit-doc.png[FR,20,20]^] _{contribution-
---
= ChangeLog

= 1.1.13
== 1.1.13
:file-to-include: changelog_1.1.13_en.adoc
include::include/en/{file-to-include}[]

= 1.1.14
== 1.1.14
:file-to-include: changelog_1.1.14_en.adoc
include::include/en/{file-to-include}[]

= 2.0
== 2.0
:file-to-include: changelog_2.0_en.adoc
include::include/en/{file-to-include}[]

= 3.0
== 3.0
:file-to-include: changelog_3.0_en.adoc
include::include/en/{file-to-include}[]

= 3.1
== 3.1
:file-to-include: changelog_3.1_en.adoc
include::include/en/{file-to-include}[]

= 3.2
== 3.2
:file-to-include: changelog_3.2_en.adoc
include::include/en/{file-to-include}[]

= 3.3
== 3.3
:file-to-include: changelog_3.3_en.adoc
include::include/en/{file-to-include}[]

= 3.4
== 3.4
:file-to-include: changelog_3.4_en.adoc
include::include/en/{file-to-include}[]

= 3.5
== 3.5
:file-to-include: changelog_3.5_en.adoc
include::include/en/{file-to-include}[]

= 3.6
== 3.6
:file-to-include: changelog_3.6_en.adoc
include::include/en/{file-to-include}[]

= 3.7
== 3.7
:file-to-include: changelog_3.7_en.adoc
include::include/en/{file-to-include}[]

= 3.7.1
== 3.7.1
:file-to-include: changelog_3.7.1_en.adoc
include::include/en/{file-to-include}[]

= 3.8
== 3.8
:file-to-include: changelog_3.8_en.adoc
include::include/en/{file-to-include}[]

= 3.9
== 3.9
:file-to-include: changelog_3.9_en.adoc
include::include/en/{file-to-include}[]

= 3.10
== 3.10
:file-to-include: changelog_3.10_en.adoc
include::include/en/{file-to-include}[]

= 3.11
== 3.11
:file-to-include: changelog_3.11_en.adoc
include::include/en/{file-to-include}[]

= 4.0
== 4.0
:file-to-include: changelog_4.0_en.adoc
include::include/en/{file-to-include}[]

= 4.1
== 4.1
:file-to-include: changelog_4.1_en.adoc
include::include/en/{file-to-include}[]

= 4.2
== 4.2
:file-to-include: changelog_4.2_en.adoc
include::include/en/{file-to-include}[]

= 4.3
== 4.3
:file-to-include: changelog_4.3_en.adoc
include::include/en/{file-to-include}[]

= 4.4
== 4.4
:file-to-include: changelog_4.4_en.adoc
include::include/en/{file-to-include}[]

= 4.5
== 4.5
:file-to-include: changelog_4.5_en.adoc
include::include/en/{file-to-include}[]

= 4.6
== 4.6
:file-to-include: changelog_4.6_en.adoc
include::include/en/{file-to-include}[]

= 4.7
== 4.7
:file-to-include: changelog_4.7_en.adoc
include::include/en/{file-to-include}[]

= 4.8
== 4.8
:file-to-include: changelog_4.8_en.adoc
include::include/en/{file-to-include}[]

= 4.9
== 4.9
:file-to-include: changelog_4.9_en.adoc
include::include/en/{file-to-include}[]

= 4.10
== 4.10
:file-to-include: changelog_4.10_en.adoc
include::include/en/{file-to-include}[]

= 4.11
== 4.11
:file-to-include: changelog_4.11_en.adoc
include::include/en/{file-to-include}[]

= 4.11.1
== 4.11.1
:file-to-include: changelog_4.11.1_en.adoc
include::include/en/{file-to-include}[]

= 4.11.2
== 4.11.2
:file-to-include: changelog_4.11.2_en.adoc
include::include/en/{file-to-include}[]

= 4.12
== 4.12
:file-to-include: changelog_4.12_en.adoc
include::include/en/{file-to-include}[]

= 4.13
== 4.13
:file-to-include: changelog_4.13_en.adoc
include::include/en/{file-to-include}[]

= 4.13.1
== 4.13.1
:file-to-include: changelog_4.13.1_en.adoc
include::include/en/{file-to-include}[]

= 4.14
== 4.14
:file-to-include: changelog_4.14_en.adoc
include::include/en/{file-to-include}[]
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* Page source were not correctly displayed on execution screen.
* Manage correctly user name with spaces.
* Fixed issue when updating application object value from Test Case Script page.
* Fixed display of elapsed duration on testcase execution detail page in websocket mode #2359
* Fixed display of elapsed duration on testcase execution detail page in websocket mode (autorefresh during execution) #2359
* Fixed delete label on campaign definition #2360

*Improvements / New features*
[square]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
=== Introduction

Cerberus has integrated a hook mecanism management.
That allow to react on some event in order to trigger asynchroniously some external notification or synchronize external systems (for reporting or test referencial).
On top of the public API available, that feature allow a better, easier and faster integration of Cerberus with external tools.
Expand Down
6 changes: 3 additions & 3 deletions source/src/main/webapp/js/transversalobject/Campaign.js
Original file line number Diff line number Diff line change
Expand Up @@ -760,10 +760,10 @@ function addLabelEntryClick(tableId) {

function removeLabelEntryClick(tableId, key) {
$('#' + tableId + '_wrapper #removeLabel').filter(function (i, e) {
return $(e).attr("key") === key;
return $(e).attr("key") == key;
}).off().prop("disabled", true);
$("#" + tableId).DataTable().rows(function (i, d, n) {
return d[2] === key;
return d[2] == key;
}).remove().draw();
updateSelectLabel(tableId);
}
Expand Down Expand Up @@ -875,7 +875,7 @@ function findValueTableDataByCol(tableId, colIndex, value) {
var result = false;
//Iterate all td's in second column
$.each($("#" + tableId).DataTable().rows().data(), function (i, v) {
if (v[colIndex] === value) {
if (v[colIndex] == value) {
result = true;
}
});
Expand Down

0 comments on commit f597ce6

Please sign in to comment.