meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

add return value to result of subtask evaluation

Browse source
This commit is contained in:
ansgarz 2022-02-21 22:47:45 +01:00
parent 29300d20ca
commit 94bb87ce0a
2 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Prov.kt
View file

@ -274,7 +274,7 @@ open class Prov protected constructor(
level++
// call the actual function
val res = if (!exit) {
val sublevelResult = if (!exit) {
progress(internalResult)
@Suppress("UNUSED_EXPRESSION") // false positive
a()
@ -291,20 +291,20 @@ open class Prov protected constructor(
// for a leaf (task with mo subtask) or tasks "cmd" resp. "repeatUntilTrue" provide also out and err of original results
// because results of cmd and leafs are not included in the reporting
// and the caller of repeatUntilTrue might need to see the complete result (incl. out and err) and not only success value
res.copy()
sublevelResult.copy()
} else {
// just pass success value, no other data of the original result
ProvResult(res.success)
ProvResult(sublevelResult.success)
}
} else if (mode == ResultMode.ALL) {
// leaf
if (internalResultIsLeaf(resultIndex)) res.copy()
if (internalResultIsLeaf(resultIndex)) sublevelResult.copy()
// evaluate subcalls' results
else ProvResult(cumulativeSuccessSublevel(resultIndex) ?: false)
else ProvResult((cumulativeSuccessSublevel(resultIndex) ?: false) && sublevelResult.success)
} else if (mode == ResultMode.NONE) {
ProvResult(true)
} else if (mode == ResultMode.FAILEXIT) {
return if (res.success) {
return if (sublevelResult.success) {
ProvResult(true)
} else {
exit = true

38
src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt
View file

@ -406,6 +406,44 @@ internal class ProvTest {
assertEquals(ProvResult(true), res)
}
@Test
fun task_with_subtask_and_failed_result_fails() {
// given
fun Prov.inner() {
addResultToEval(ProvResult(true))
}
fun Prov.outer() = task {
inner()
ProvResult(false)
}
// when
val res = testLocal().outer()
//then
assertEquals(ProvResult(false), res)
}
@Test
fun task_with_failing_subtask_and_successful_result_fails() {
// given
fun Prov.inner() = task {
ProvResult(false)
}
fun Prov.outer() = task {
inner()
ProvResult(true)
}
// when
val res = testLocal().outer()
//then
assertEquals(ProvResult(false), res)
}
@Test
fun addResultToEval_failure() {
// given