From 790fde8b7dc974de90ea6930b3c547675fead397 Mon Sep 17 00:00:00 2001 From: dblouin <dominique.blouin@telecom-paristech.fr> Date: Fri, 21 Sep 2018 16:44:04 +0200 Subject: [PATCH] Update test references for changes in TTool code --- .../diagram2avatar/expected/CoffeeMachine.txt | 64 +++++++++---------- .../ui/diagram2avatar/expected/Wallet.txt | 8 +-- ...eMachine_Disable_CompoInOutTransitions.txt | 64 +++++++++---------- .../CoffeeMachine_Disable_ComponentBranch.txt | 52 +++++++-------- .../CoffeeMachine_Disable_CompositeState.txt | 40 ++++++------ ...chine_Disable_TransitionInfoComputeFor.txt | 64 +++++++++---------- ...BoardCommunication_Disable_ExpireTimer.txt | 8 +-- ...nBoardCommunication_Disable_ResetTimer.txt | 8 +-- .../OnBoardCommunication_Disable_SetTimer.txt | 8 +-- .../PageLoader_Disable_Random.txt | 8 +-- .../Wallet_Disable_ReceiveSignal.txt | 8 +-- .../Wallet_Disable_SendSignal.txt | 8 +-- .../Wallet_Disable_State.txt | 8 +-- ...let_Disable_TransitionInfoAfterActions.txt | 8 +-- 14 files changed, 178 insertions(+), 178 deletions(-) diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/CoffeeMachine.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/CoffeeMachine.txt index 0343a9d383..419d68a373 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/CoffeeMachine.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/CoffeeMachine.txt @@ -1,106 +1,106 @@ State machine Id=15 -start ID=71 / top level operator +start ID=72 / top level operator nexts= 0:avatar transition/ ID=116 -WaitingForFirstCoin ID=72 / top level operator +WaitingForFirstCoin ID=73 / top level operator nexts= 0:avatar transition/ ID=115 -action_on_signal:getCoin ID=73 / top level operator +action_on_signal:getCoin ID=74 / top level operator nexts= 0:avatar transition/ ID=109 -WaitingForSecondCoin ID=74 / top level operator +WaitingForSecondCoin ID=75 / top level operator nexts= 0:avatar transition/ ID=106 1:avatar transition/ ID=108 -ejectState ID=75 / top level operator - nexts= 0:avatar transition/ ID=84 -action_on_signal:ejectCoin ID=76 / top level operator +ejectState ID=76 / top level operator + nexts= 0:avatar transition/ ID=85 +action_on_signal:ejectCoin ID=77 / top level operator nexts= 0:avatar transition/ ID=103 -action_on_signal:getCoin ID=77 / top level operator +action_on_signal:getCoin ID=78 / top level operator nexts= 0:avatar transition/ ID=107 -Beverage ID=78 / top level operator +Beverage ID=79 / top level operator nexts= -start ID=79 / in state Beverage ID=78 +start ID=80 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=102 -WaitingForSelection ID=80 / in state Beverage ID=78 +WaitingForSelection ID=81 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=89 1:avatar transition/ ID=95 2:avatar transition/ ID=101 -action_on_signal:ejectCoin ID=81 / in state Beverage ID=78 - nexts= 0:avatar transition/ ID=85 -action_on_signal:pushCoffeeButton ID=82 / in state Beverage ID=78 +action_on_signal:ejectCoin ID=82 / in state Beverage ID=79 + nexts= 0:avatar transition/ ID=86 +action_on_signal:pushCoffeeButton ID=83 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=96 -action_on_signal:pushTeaButton ID=83 / in state Beverage ID=78 +action_on_signal:pushTeaButton ID=84 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=90 -avatar transition ID=84 / top level operator +avatar transition ID=85 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=76 + nexts= 0:action_on_signal/ ID=77 weight=1.0 -avatar transition ID=85 / top level operator +avatar transition ID=86 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=89 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:action_on_signal/ ID=81 + nexts= 0:action_on_signal/ ID=82 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=90 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 minCompute=teaMinDelay maxcompute=teaMaxDelay weight=1.0 nbOfCoins = 0 / beverageReady () / avatar transition ID=95 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=83 + nexts= 0:action_on_signal/ ID=84 weight=1.0 avatar transition ID=96 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 minCompute=coffeeMinDelay maxcompute=coffeeMaxDelay weight=1.0 nbOfCoins = 0 / beverageReady () / avatar transition ID=101 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=82 + nexts= 0:action_on_signal/ ID=83 weight=1.0 avatar transition ID=102 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForSelection/ ID=80 + nexts= 0:WaitingForSelection/ ID=81 weight=1.0 avatar transition ID=103 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=106 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:ejectState/ ID=75 + nexts= 0:ejectState/ ID=76 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=107 / top level operator value:Empty transition weight:1.0 - nexts= 0:Beverage/ ID=78 + nexts= 0:Beverage/ ID=79 weight=1.0 avatar transition ID=108 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=77 + nexts= 0:action_on_signal/ ID=78 weight=1.0 avatar transition ID=109 / top level operator value:Transition (nbOfCoins = nbOfCoins+x, ...) weight:1.0 - nexts= 0:WaitingForSecondCoin/ ID=74 + nexts= 0:WaitingForSecondCoin/ ID=75 weight=1.0 nbOfCoins = nbOfCoins+x / avatar transition ID=115 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=73 + nexts= 0:action_on_signal/ ID=74 weight=1.0 avatar transition ID=116 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/Wallet.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/Wallet.txt index 71869bf807..f4a4a2b998 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/Wallet.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/Wallet.txt @@ -1,6 +1,6 @@ State machine Id=3 start ID=41 / top level operator - nexts= 0:avatar transition/ ID=67 + nexts= 0:avatar transition/ ID=68 main ID=42 / top level operator nexts= 0:avatar transition/ ID=54 1:avatar transition/ ID=64 action_on_signal:putCoin ID=43 / top level operator @@ -24,11 +24,11 @@ minDelay=minUserDelay maxDelay=maxUserDelay weight=1.0 nbOfCoins = nbOfCoins-x / contentOfWallet (nbOfCoins) / avatar transition ID=64 / top level operator - value:Transition (guard=nbOfCoins>0, ...) weight:1.0 + value:Transition (guard=nbOfCoins > 0, ...) weight:1.0 nexts= 0:action_on_signal/ ID=43 weight=1.0 -guard nbOfCoins>0 / -avatar transition ID=67 / top level operator +guard nbOfCoins > 0 / +avatar transition ID=68 / top level operator value:Transition (contentOfWallet (nbOfCoins), ...) weight:1.0 nexts= 0:main/ ID=42 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompoInOutTransitions.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompoInOutTransitions.txt index 7f5731ab06..6febe971b4 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompoInOutTransitions.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompoInOutTransitions.txt @@ -1,98 +1,98 @@ State machine Id=15 -start ID=71 / top level operator +start ID=72 / top level operator nexts= 0:avatar transition/ ID=112 -WaitingForFirstCoin ID=72 / top level operator +WaitingForFirstCoin ID=73 / top level operator nexts= 0:avatar transition/ ID=111 -action_on_signal:getCoin ID=73 / top level operator +action_on_signal:getCoin ID=74 / top level operator nexts= 0:avatar transition/ ID=105 -WaitingForSecondCoin ID=74 / top level operator +WaitingForSecondCoin ID=75 / top level operator nexts= 0:avatar transition/ ID=102 1:avatar transition/ ID=104 -ejectState ID=75 / top level operator - nexts= 0:avatar transition/ ID=83 -action_on_signal:ejectCoin ID=76 / top level operator +ejectState ID=76 / top level operator + nexts= 0:avatar transition/ ID=84 +action_on_signal:ejectCoin ID=77 / top level operator nexts= 0:avatar transition/ ID=99 -action_on_signal:getCoin ID=77 / top level operator +action_on_signal:getCoin ID=78 / top level operator nexts= 0:avatar transition/ ID=103 -Beverage ID=78 / top level operator +Beverage ID=79 / top level operator nexts= -start ID=79 / in state Beverage ID=78 +start ID=80 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=98 -WaitingForSelection ID=80 / in state Beverage ID=78 - nexts= 0:avatar transition/ ID=84 1:avatar transition/ ID=91 2:avatar transition/ ID=97 -action_on_signal:pushCoffeeButton ID=81 / in state Beverage ID=78 +WaitingForSelection ID=81 / in state Beverage ID=79 + nexts= 0:avatar transition/ ID=85 1:avatar transition/ ID=91 2:avatar transition/ ID=97 +action_on_signal:pushCoffeeButton ID=82 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=92 -action_on_signal:pushTeaButton ID=82 / in state Beverage ID=78 - nexts= 0:avatar transition/ ID=85 -avatar transition ID=83 / top level operator +action_on_signal:pushTeaButton ID=83 / in state Beverage ID=79 + nexts= 0:avatar transition/ ID=86 +avatar transition ID=84 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=76 + nexts= 0:action_on_signal/ ID=77 weight=1.0 -avatar transition ID=84 / top level operator +avatar transition ID=85 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 -avatar transition ID=85 / top level operator +avatar transition ID=86 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 minCompute=teaMinDelay maxcompute=teaMaxDelay weight=1.0 nbOfCoins = 0 / beverageReady () / avatar transition ID=91 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=82 + nexts= 0:action_on_signal/ ID=83 weight=1.0 avatar transition ID=92 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 minCompute=coffeeMinDelay maxcompute=coffeeMaxDelay weight=1.0 nbOfCoins = 0 / beverageReady () / avatar transition ID=97 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=81 + nexts= 0:action_on_signal/ ID=82 weight=1.0 avatar transition ID=98 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForSelection/ ID=80 + nexts= 0:WaitingForSelection/ ID=81 weight=1.0 avatar transition ID=99 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=102 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:ejectState/ ID=75 + nexts= 0:ejectState/ ID=76 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=103 / top level operator value:Empty transition weight:1.0 - nexts= 0:Beverage/ ID=78 + nexts= 0:Beverage/ ID=79 weight=1.0 avatar transition ID=104 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=77 + nexts= 0:action_on_signal/ ID=78 weight=1.0 avatar transition ID=105 / top level operator value:Transition (nbOfCoins = nbOfCoins+x, ...) weight:1.0 - nexts= 0:WaitingForSecondCoin/ ID=74 + nexts= 0:WaitingForSecondCoin/ ID=75 weight=1.0 nbOfCoins = nbOfCoins+x / avatar transition ID=111 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=73 + nexts= 0:action_on_signal/ ID=74 weight=1.0 avatar transition ID=112 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_ComponentBranch.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_ComponentBranch.txt index 027c26caae..c0f4410782 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_ComponentBranch.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_ComponentBranch.txt @@ -1,92 +1,92 @@ State machine Id=15 -start ID=71 / top level operator +start ID=72 / top level operator nexts= 0:avatar transition/ ID=112 -WaitingForFirstCoin ID=72 / top level operator +WaitingForFirstCoin ID=73 / top level operator nexts= 0:avatar transition/ ID=106 -WaitingForSecondCoin_converted_to_dummy_state ID=73 / top level operator +WaitingForSecondCoin_converted_to_dummy_state ID=74 / top level operator nexts= 0:avatar transition/ ID=103 1:avatar transition/ ID=105 -action_on_signal:ejectCoin_converted_to_dummy_state ID=74 / top level operator +action_on_signal:ejectCoin_converted_to_dummy_state ID=75 / top level operator nexts= 0:avatar transition/ ID=100 -action_on_signal:getCoin ID=75 / top level operator +action_on_signal:getCoin ID=76 / top level operator nexts= 0:avatar transition/ ID=104 -Beverage ID=76 / top level operator +Beverage ID=77 / top level operator nexts= -start ID=77 / in state Beverage ID=76 +start ID=78 / in state Beverage ID=77 nexts= 0:avatar transition/ ID=99 -WaitingForSelection ID=78 / in state Beverage ID=76 +WaitingForSelection ID=79 / in state Beverage ID=77 nexts= 0:avatar transition/ ID=86 1:avatar transition/ ID=92 2:avatar transition/ ID=98 -action_on_signal:ejectCoin ID=79 / in state Beverage ID=76 - nexts= 0:avatar transition/ ID=82 -action_on_signal:pushCoffeeButton ID=80 / in state Beverage ID=76 +action_on_signal:ejectCoin ID=80 / in state Beverage ID=77 + nexts= 0:avatar transition/ ID=83 +action_on_signal:pushCoffeeButton ID=81 / in state Beverage ID=77 nexts= 0:avatar transition/ ID=93 -action_on_signal:pushTeaButton ID=81 / in state Beverage ID=76 +action_on_signal:pushTeaButton ID=82 / in state Beverage ID=77 nexts= 0:avatar transition/ ID=87 -avatar transition ID=82 / top level operator +avatar transition ID=83 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=86 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:action_on_signal/ ID=79 + nexts= 0:action_on_signal/ ID=80 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=87 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 minCompute=teaMinDelay maxcompute=teaMaxDelay weight=1.0 nbOfCoins = 0 / beverageReady () / avatar transition ID=92 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=81 + nexts= 0:action_on_signal/ ID=82 weight=1.0 avatar transition ID=93 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 minCompute=coffeeMinDelay maxcompute=coffeeMaxDelay weight=1.0 nbOfCoins = 0 / beverageReady () / avatar transition ID=98 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=80 + nexts= 0:action_on_signal/ ID=81 weight=1.0 avatar transition ID=99 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForSelection/ ID=78 + nexts= 0:WaitingForSelection/ ID=79 weight=1.0 avatar transition ID=100 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=103 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:action_on_signal:ejectCoin_converted_to_dummy_state/ ID=74 + nexts= 0:action_on_signal:ejectCoin_converted_to_dummy_state/ ID=75 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=104 / top level operator value:Empty transition weight:1.0 - nexts= 0:Beverage/ ID=76 + nexts= 0:Beverage/ ID=77 weight=1.0 avatar transition ID=105 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=75 + nexts= 0:action_on_signal/ ID=76 weight=1.0 avatar transition ID=106 / top level operator value:Transition (nbOfCoins = nbOfCoins+x, ...) weight:1.0 - nexts= 0:WaitingForSecondCoin_converted_to_dummy_state/ ID=73 + nexts= 0:WaitingForSecondCoin_converted_to_dummy_state/ ID=74 weight=1.0 nbOfCoins = nbOfCoins+x / avatar transition ID=112 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompositeState.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompositeState.txt index fc34247a55..da243b563f 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompositeState.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_CompositeState.txt @@ -1,56 +1,56 @@ State machine Id=15 -start ID=71 / top level operator +start ID=72 / top level operator nexts= 0:avatar transition/ ID=93 -WaitingForFirstCoin ID=72 / top level operator +WaitingForFirstCoin ID=73 / top level operator nexts= 0:avatar transition/ ID=92 -action_on_signal:getCoin ID=73 / top level operator +action_on_signal:getCoin ID=74 / top level operator nexts= 0:avatar transition/ ID=86 -WaitingForSecondCoin ID=74 / top level operator +WaitingForSecondCoin ID=75 / top level operator nexts= 0:avatar transition/ ID=84 1:avatar transition/ ID=85 -ejectState ID=75 / top level operator - nexts= 0:avatar transition/ ID=78 -action_on_signal:ejectCoin ID=76 / top level operator - nexts= 0:avatar transition/ ID=80 -action_on_signal:getCoin ID=77 / top level operator +ejectState ID=76 / top level operator nexts= 0:avatar transition/ ID=79 -avatar transition ID=78 / top level operator +action_on_signal:ejectCoin ID=77 / top level operator + nexts= 0:avatar transition/ ID=81 +action_on_signal:getCoin ID=78 / top level operator + nexts= 0:avatar transition/ ID=80 +avatar transition ID=79 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=76 + nexts= 0:action_on_signal/ ID=77 weight=1.0 -avatar transition ID=79 / top level operator +avatar transition ID=80 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 -avatar transition ID=80 / top level operator +avatar transition ID=81 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=84 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:ejectState/ ID=75 + nexts= 0:ejectState/ ID=76 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=85 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=77 + nexts= 0:action_on_signal/ ID=78 weight=1.0 avatar transition ID=86 / top level operator value:Transition (nbOfCoins = nbOfCoins+x, ...) weight:1.0 - nexts= 0:WaitingForSecondCoin/ ID=74 + nexts= 0:WaitingForSecondCoin/ ID=75 weight=1.0 nbOfCoins = nbOfCoins+x / avatar transition ID=92 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=73 + nexts= 0:action_on_signal/ ID=74 weight=1.0 avatar transition ID=93 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_TransitionInfoComputeFor.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_TransitionInfoComputeFor.txt index 4d3373cbe1..57554dc102 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_TransitionInfoComputeFor.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/CoffeeMachine_Disable_TransitionInfoComputeFor.txt @@ -1,105 +1,105 @@ State machine Id=15 -start ID=71 / top level operator +start ID=72 / top level operator nexts= 0:avatar transition/ ID=112 -WaitingForFirstCoin ID=72 / top level operator +WaitingForFirstCoin ID=73 / top level operator nexts= 0:avatar transition/ ID=111 -action_on_signal:getCoin ID=73 / top level operator +action_on_signal:getCoin ID=74 / top level operator nexts= 0:avatar transition/ ID=105 -WaitingForSecondCoin ID=74 / top level operator +WaitingForSecondCoin ID=75 / top level operator nexts= 0:avatar transition/ ID=102 1:avatar transition/ ID=104 -ejectState ID=75 / top level operator - nexts= 0:avatar transition/ ID=84 -action_on_signal:ejectCoin ID=76 / top level operator +ejectState ID=76 / top level operator + nexts= 0:avatar transition/ ID=85 +action_on_signal:ejectCoin ID=77 / top level operator nexts= 0:avatar transition/ ID=99 -action_on_signal:getCoin ID=77 / top level operator +action_on_signal:getCoin ID=78 / top level operator nexts= 0:avatar transition/ ID=103 -Beverage ID=78 / top level operator +Beverage ID=79 / top level operator nexts= -start ID=79 / in state Beverage ID=78 +start ID=80 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=98 -WaitingForSelection ID=80 / in state Beverage ID=78 +WaitingForSelection ID=81 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=89 1:avatar transition/ ID=95 2:avatar transition/ ID=97 -action_on_signal:ejectCoin ID=81 / in state Beverage ID=78 - nexts= 0:avatar transition/ ID=85 -action_on_signal:pushCoffeeButton ID=82 / in state Beverage ID=78 +action_on_signal:ejectCoin ID=82 / in state Beverage ID=79 + nexts= 0:avatar transition/ ID=86 +action_on_signal:pushCoffeeButton ID=83 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=96 -action_on_signal:pushTeaButton ID=83 / in state Beverage ID=78 +action_on_signal:pushTeaButton ID=84 / in state Beverage ID=79 nexts= 0:avatar transition/ ID=90 -avatar transition ID=84 / top level operator +avatar transition ID=85 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=76 + nexts= 0:action_on_signal/ ID=77 weight=1.0 -avatar transition ID=85 / top level operator +avatar transition ID=86 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=89 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:action_on_signal/ ID=81 + nexts= 0:action_on_signal/ ID=82 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=90 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 minCompute=teaMinDelay maxcompute=teaMaxDelay weight=1.0 nbOfCoins = 0 / beverageReady () / avatar transition ID=95 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=83 + nexts= 0:action_on_signal/ ID=84 weight=1.0 avatar transition ID=96 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 avatar transition ID=97 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=82 + nexts= 0:action_on_signal/ ID=83 weight=1.0 avatar transition ID=98 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForSelection/ ID=80 + nexts= 0:WaitingForSelection/ ID=81 weight=1.0 avatar transition ID=99 / top level operator value:Transition (nbOfCoins = 0, ...) weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 nbOfCoins = 0 / avatar transition ID=102 / top level operator value:Transition (delay=(coinDelay, ), ...) weight:1.0 - nexts= 0:ejectState/ ID=75 + nexts= 0:ejectState/ ID=76 minDelay=coinDelay maxDelay=coinDelay weight=1.0 avatar transition ID=103 / top level operator value:Empty transition weight:1.0 - nexts= 0:Beverage/ ID=78 + nexts= 0:Beverage/ ID=79 weight=1.0 avatar transition ID=104 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=77 + nexts= 0:action_on_signal/ ID=78 weight=1.0 avatar transition ID=105 / top level operator value:Transition (nbOfCoins = nbOfCoins+x, ...) weight:1.0 - nexts= 0:WaitingForSecondCoin/ ID=74 + nexts= 0:WaitingForSecondCoin/ ID=75 weight=1.0 nbOfCoins = nbOfCoins+x / avatar transition ID=111 / top level operator value:Empty transition weight:1.0 - nexts= 0:action_on_signal/ ID=73 + nexts= 0:action_on_signal/ ID=74 weight=1.0 avatar transition ID=112 / top level operator value:Empty transition weight:1.0 - nexts= 0:WaitingForFirstCoin/ ID=72 + nexts= 0:WaitingForFirstCoin/ ID=73 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ExpireTimer.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ExpireTimer.txt index 8dbb0391aa..9ce6081999 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ExpireTimer.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ExpireTimer.txt @@ -32,10 +32,10 @@ action_on_signal:INconconf ID=48 / top level operator CONNECTED ID=49 / top level operator nexts= avatar transition ID=50 / top level operator - value:Transition (guard=not(retransmissionCounter<maxRetransmissions), ...) weight:1.0 + value:Transition (guard=not(retransmissionCounter < maxRetransmissions), ...) weight:1.0 nexts= 0:action_on_signal/ ID=43 weight=1.0 -guard not(retransmissionCounter<maxRetransmissions) / +guard not(retransmissionCounter < maxRetransmissions) / avatar transition ID=51 / top level operator value:Empty transition weight:1.0 nexts= 0:choice__0/ ID=42 @@ -92,10 +92,10 @@ avatar transition ID=64 / top level operator weight=1.0 avatar transition ID=65 / top level operator - value:Transition (guard=retransmissionCounter<maxRetransmissions, ...) weight:1.0 + value:Transition (guard=retransmissionCounter < maxRetransmissions, ...) weight:1.0 nexts= 0:SEND/ ID=38 weight=1.0 -retransmissionCounter = retransmissionCounter+1 / guard retransmissionCounter<maxRetransmissions / +retransmissionCounter = retransmissionCounter+1 / guard retransmissionCounter < maxRetransmissions / avatar transition ID=74 / top level operator value:Empty transition weight:1.0 nexts= 0:action_on_signal/ ID=44 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ResetTimer.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ResetTimer.txt index 2e83968444..4c7064c9b5 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ResetTimer.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_ResetTimer.txt @@ -32,10 +32,10 @@ action_on_signal:INconconf ID=48 / top level operator CONNECTED ID=49 / top level operator nexts= avatar transition ID=50 / top level operator - value:Transition (guard=not(retransmissionCounter<maxRetransmissions), ...) weight:1.0 + value:Transition (guard=not(retransmissionCounter < maxRetransmissions), ...) weight:1.0 nexts= 0:action_on_signal/ ID=44 weight=1.0 -guard not(retransmissionCounter<maxRetransmissions) / +guard not(retransmissionCounter < maxRetransmissions) / avatar transition ID=51 / top level operator value:Empty transition weight:1.0 nexts= 0:choice__0/ ID=43 @@ -92,10 +92,10 @@ avatar transition ID=64 / top level operator weight=1.0 avatar transition ID=65 / top level operator - value:Transition (guard=retransmissionCounter<maxRetransmissions, ...) weight:1.0 + value:Transition (guard=retransmissionCounter < maxRetransmissions, ...) weight:1.0 nexts= 0:SEND/ ID=38 weight=1.0 -retransmissionCounter = retransmissionCounter+1 / guard retransmissionCounter<maxRetransmissions / +retransmissionCounter = retransmissionCounter+1 / guard retransmissionCounter < maxRetransmissions / avatar transition ID=74 / top level operator value:Empty transition weight:1.0 nexts= 0:action_on_signal/ ID=45 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_SetTimer.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_SetTimer.txt index 28e8d7fc16..a15f253327 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_SetTimer.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/OnBoardCommunication_Disable_SetTimer.txt @@ -32,10 +32,10 @@ action_on_signal:INconconf ID=48 / top level operator CONNECTED ID=49 / top level operator nexts= avatar transition ID=50 / top level operator - value:Transition (guard=not(retransmissionCounter<maxRetransmissions), ...) weight:1.0 + value:Transition (guard=not(retransmissionCounter < maxRetransmissions), ...) weight:1.0 nexts= 0:action_on_signal/ ID=43 weight=1.0 -guard not(retransmissionCounter<maxRetransmissions) / +guard not(retransmissionCounter < maxRetransmissions) / avatar transition ID=51 / top level operator value:Empty transition weight:1.0 nexts= 0:choice__0/ ID=42 @@ -92,10 +92,10 @@ avatar transition ID=64 / top level operator weight=1.0 avatar transition ID=65 / top level operator - value:Transition (guard=retransmissionCounter<maxRetransmissions, ...) weight:1.0 + value:Transition (guard=retransmissionCounter < maxRetransmissions, ...) weight:1.0 nexts= 0:SEND/ ID=38 weight=1.0 -retransmissionCounter = retransmissionCounter+1 / guard retransmissionCounter<maxRetransmissions / +retransmissionCounter = retransmissionCounter+1 / guard retransmissionCounter < maxRetransmissions / avatar transition ID=74 / top level operator value:Empty transition weight:1.0 nexts= 0:action_on_signal/ ID=44 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/PageLoader_Disable_Random.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/PageLoader_Disable_Random.txt index 6c8a09190b..b2fd9111a0 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/PageLoader_Disable_Random.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/PageLoader_Disable_Random.txt @@ -48,10 +48,10 @@ action_on_signal:loadPage ID=102 / top level operator Interrupted ID=103 / top level operator nexts= 0:avatar transition/ ID=130 avatar transition ID=104 / top level operator - value:Transition (guard=not((pageid<doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid))), ...) weight:1.0 + value:Transition (guard=not((pageid < doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid))), ...) weight:1.0 nexts= 0:WaitingForPageToLoad/ ID=81 weight=1.0 -guard not((pageid<doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid))) / +guard not((pageid < doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid))) / avatar transition ID=105 / top level operator value:Empty transition weight:1.0 nexts= 0:WaitingForPageToLoad/ ID=81 @@ -186,7 +186,7 @@ avatar transition ID=174 / top level operator weight=1.0 avatar transition ID=175 / top level operator - value:Transition (guard=(pageid<doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid)), ...) weight:1.0 + value:Transition (guard=(pageid < doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid)), ...) weight:1.0 nexts= 0:Prefetching/ ID=89 weight=1.0 -guard (pageid<doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid)) / +guard (pageid < doc__nbOfPages)and(not(memory__index1 == pageid))and(not(memory__index2 == pageid))and(not(memory__index3 == pageid)) / diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_ReceiveSignal.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_ReceiveSignal.txt index 31fcddea18..350af08688 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_ReceiveSignal.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_ReceiveSignal.txt @@ -1,6 +1,6 @@ State machine Id=3 start ID=41 / top level operator - nexts= 0:avatar transition/ ID=65 + nexts= 0:avatar transition/ ID=66 main ID=42 / top level operator nexts= 0:avatar transition/ ID=44 1:avatar transition/ ID=62 action_on_signal:putCoin ID=43 / top level operator @@ -17,11 +17,11 @@ minDelay=minUserDelay maxDelay=maxUserDelay weight=1.0 nbOfCoins = nbOfCoins-x / contentOfWallet (nbOfCoins) / avatar transition ID=62 / top level operator - value:Transition (guard=nbOfCoins>0, ...) weight:1.0 + value:Transition (guard=nbOfCoins > 0, ...) weight:1.0 nexts= 0:action_on_signal/ ID=43 weight=1.0 -guard nbOfCoins>0 / -avatar transition ID=65 / top level operator +guard nbOfCoins > 0 / +avatar transition ID=66 / top level operator value:Transition (contentOfWallet (nbOfCoins), ...) weight:1.0 nexts= 0:main/ ID=42 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_SendSignal.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_SendSignal.txt index fc9ca86c0c..4e4853ded6 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_SendSignal.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_SendSignal.txt @@ -1,6 +1,6 @@ State machine Id=3 start ID=41 / top level operator - nexts= 0:avatar transition/ ID=67 + nexts= 0:avatar transition/ ID=68 main ID=42 / top level operator nexts= 0:avatar transition/ ID=54 1:avatar transition/ ID=64 action_on_signal:putCoin_converted_to_dummy_state ID=43 / top level operator @@ -24,11 +24,11 @@ minDelay=minUserDelay maxDelay=maxUserDelay weight=1.0 nbOfCoins = nbOfCoins-x / contentOfWallet (nbOfCoins) / avatar transition ID=64 / top level operator - value:Transition (guard=nbOfCoins>0, ...) weight:1.0 + value:Transition (guard=nbOfCoins > 0, ...) weight:1.0 nexts= 0:action_on_signal:putCoin_converted_to_dummy_state/ ID=43 weight=1.0 -guard nbOfCoins>0 / -avatar transition ID=67 / top level operator +guard nbOfCoins > 0 / +avatar transition ID=68 / top level operator value:Transition (contentOfWallet (nbOfCoins), ...) weight:1.0 nexts= 0:main/ ID=42 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_State.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_State.txt index 43c9e450f9..a6749794cb 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_State.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_State.txt @@ -1,6 +1,6 @@ State machine Id=3 start ID=41 / top level operator - nexts= 0:avatar transition/ ID=69 + nexts= 0:avatar transition/ ID=70 main_converted_to_dummy_state ID=42 / top level operator nexts= 0:avatar transition/ ID=56 1:avatar transition/ ID=66 action_on_signal:putCoin ID=43 / top level operator @@ -28,11 +28,11 @@ minDelay=minUserDelay maxDelay=maxUserDelay weight=1.0 nbOfCoins = nbOfCoins-x / contentOfWallet (nbOfCoins) / avatar transition ID=66 / top level operator - value:Transition (guard=nbOfCoins>0, ...) weight:1.0 + value:Transition (guard=nbOfCoins > 0, ...) weight:1.0 nexts= 0:action_on_signal/ ID=43 weight=1.0 -guard nbOfCoins>0 / -avatar transition ID=69 / top level operator +guard nbOfCoins > 0 / +avatar transition ID=70 / top level operator value:Transition (contentOfWallet (nbOfCoins), ...) weight:1.0 nexts= 0:main_converted_to_dummy_state/ ID=42 weight=1.0 diff --git a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_TransitionInfoAfterActions.txt b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_TransitionInfoAfterActions.txt index 92880c5e8c..1ba5ae302d 100644 --- a/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_TransitionInfoAfterActions.txt +++ b/ttool/src/test/resources/ui/diagram2avatar/expected/components_disabling/Wallet_Disable_TransitionInfoAfterActions.txt @@ -1,6 +1,6 @@ State machine Id=3 start ID=41 / top level operator - nexts= 0:avatar transition/ ID=59 + nexts= 0:avatar transition/ ID=60 main ID=42 / top level operator nexts= 0:avatar transition/ ID=54 1:avatar transition/ ID=56 action_on_signal:putCoin ID=43 / top level operator @@ -23,11 +23,11 @@ avatar transition ID=55 / top level operator weight=1.0 avatar transition ID=56 / top level operator - value:Transition (guard=nbOfCoins>0, ...) weight:1.0 + value:Transition (guard=nbOfCoins > 0, ...) weight:1.0 nexts= 0:action_on_signal/ ID=43 weight=1.0 -guard nbOfCoins>0 / -avatar transition ID=59 / top level operator +guard nbOfCoins > 0 / +avatar transition ID=60 / top level operator value:Transition (contentOfWallet (nbOfCoins), ...) weight:1.0 nexts= 0:main/ ID=42 weight=1.0 -- GitLab