Skip to content

Commit

Permalink
tests: update to trunk changes
Browse files Browse the repository at this point in the history
#step will no longer answer nil for bottom contexts but activate #cannotReturn: instead. See: https://lists.squeakfoundation.org/archives/list/squeak-dev@lists.squeakfoundation.org/message/XGV7PM3D3DTM3YJHRHA36DFCLMZOCBV5/
  • Loading branch information
LinqLover committed Dec 30, 2023
1 parent 4dfd75f commit 679276e
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ runCursorFrom: homeContext filter: filter stepsAndAssertions: stepsAndAssertions
ifTrue: [stepBlock value: cursor value: cursor context]
ifFalse: [stepBlock value: cursor].

check = #isDead
ifFalse: [self assert:
cursor context pc > cursor context startpc].
self assert: cursor context pc > cursor context startpc.

contextChecks do: [:contextCheck |
Transcript showln: 'check context '; show: cursor context; show: ' with '; show: contextCheck.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ testDoStepBack
(doStepBack nil (willReallyStore))
(doStepOver nil (willReallySend willReturn))
(doStepBack nil (willReallySend))
(doStepOver nil (willReturn isDead))).
(doStepOver nil (willReturnTopFromMethod))).
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ testDoStepInto
(wiffy (willReallySend willReturn))
(plonk (willReallySend))
(ziffy (willReallySend willReturn))
(plonk (willReallySend willReturn isDead))).
(plonk (willReallySend willReturnTopFromMethod))).
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ testDoStepIntoFiltered
(wiffy2 (willReturn))
(plonk (willReallySend))
(ziffy (willReallySend willReturn))
(plonk (willReallySend willReturn isDead))).
(plonk (willReallySend willReturnTopFromMethod))).
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ testDoStepOver
arguments: #())
step: #doStepOver
assertions:
#((nil (willReallySend willReallySend willReallySend willReturn isDead))).
#((nil (willReallySend willReallySend willReallySend willReturnTopFromMethod))).
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ testDoStepOverError
#((doStepOver nil (willReallySend))
(doStepOver error: (willReturn))
(doStepInto error (willReturn))
(doStepInto signalError (willReturn isDead))).
(doStepInto signalError (willReturnTopFromMethod))).
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ testDoStepOverHandledError
#((doStepOver nil (willReallySend))
(doStepThrough handleError (willReallySend))
(doStepOver handleError (willReturn))
(doStepThrough nil (willReturn isDead))).
(doStepThrough nil (willReturnTopFromMethod))).
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ testDoStepOverSignalerContext
"back in safer waters again"
{#doStepOver. #error:. #(willReturn)}.
{#doStepOver. #error. #(willReturn)}.
{#doStepOver. #signalError. #(willReturn isDead)}}.
{#doStepOver. #signalError. #(willReturnTopFromMethod)}}.
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ testDoStepOverUnhandledSignalerContext
} , self stepsAndAssertionsForContextResumeEvaluating , {
{#doStepOver. #error:. #(willReturn)}.
{#doStepOver. #error. #(willReturn)}.
{#doStepOver. #signalError. #(willReturn isDead)}}.
{#doStepOver. #signalError. #(willReturnTopFromMethod)}}.
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ testDoStepRestart
(doRestart nil (willReallyStore))
(doStepOver nil (willReallyStore willReallySend willReturn))
(doRestart nil (willReallyStore willReallyStore willReallyStore))
(doStepOver nil (willReallyStore willReallySend willReturn isDead))).
(doStepOver nil (willReallyStore willReallySend willReturnTopFromMethod))).
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ testDoStepThrough
#((nil (willReallySend))
((griffleMethodReturn isExecutingBlock) (willReallySend willReturn))
((griffleMethodReturn isExecutingBlock) (willReallySend willReturn))
(nil (isDead))).
(nil ())).
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ testTraceFor: aContext contextFilter: filter like: spec
| cursor |
cursor := self classUnderTest forContext: aContext.

cursor doStepUntil: [:context | context isDead].
cursor doStepUntil: [:context | context sender isNil and: [context willReturn]].
cursor contextFilter: filter.

self assertTraceIn: cursor forContext: cursor context like: spec.
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@
"assertTraceIn:forContext:like:" : "ct 2/20/2022 19:47",
"classUnderTest" : "ct 11/18/2021 18:14",
"runCursorFrom:filter:step:assertions:" : "ct 2/21/2022 03:45",
"runCursorFrom:filter:stepsAndAssertions:" : "ct 3/17/2022 14:04",
"runCursorFrom:filter:stepsAndAssertions:" : "ct 12/30/2023 23:09",
"runCursorFrom:step:assertions:" : "ct 2/21/2022 03:46",
"runCursorFrom:stepsAndAssertions:" : "ct 2/21/2022 03:46",
"stepsAndAssertionsForContextResumeEvaluating" : "ct 12/27/2023 23:27",
"test" : "ct 11/19/2021 21:36",
"testAllContextsBelow" : "ct 3/21/2022 18:59",
"testChildren" : "ct 1/25/2022 21:39",
"testDoStepBack" : "ct 2/21/2022 03:54",
"testDoStepBack" : "ct 12/30/2023 23:11",
"testDoStepBackFiltered" : "ct 2/21/2022 04:02",
"testDoStepBackFromSender" : "ct 1/20/2022 20:53",
"testDoStepBackOverLoops" : "ct 2/21/2022 04:03",
"testDoStepInto" : "ct 12/30/2021 14:39",
"testDoStepIntoFiltered" : "ct 2/21/2022 03:44",
"testDoStepInto" : "ct 12/30/2023 23:11",
"testDoStepIntoFiltered" : "ct 12/30/2023 23:11",
"testDoStepIntoFromSender" : "ct 3/13/2022 20:35",
"testDoStepIntoFromSenderFiltered" : "ct 3/13/2022 20:37",
"testDoStepOver" : "ct 12/30/2021 14:40",
"testDoStepOverError" : "ct 2/21/2022 04:04",
"testDoStepOverHandledError" : "ct 3/21/2022 18:06",
"testDoStepOver" : "ct 12/30/2023 23:11",
"testDoStepOverError" : "ct 12/30/2023 23:11",
"testDoStepOverHandledError" : "ct 12/30/2023 23:11",
"testDoStepOverPrimitive" : "ct 3/10/2022 13:08",
"testDoStepOverSignalerContext" : "ct 12/27/2023 23:20",
"testDoStepOverUnhandledSignalerContext" : "ct 12/27/2023 23:27",
"testDoStepRestart" : "ct 2/21/2022 04:06",
"testDoStepOverSignalerContext" : "ct 12/30/2023 23:11",
"testDoStepOverUnhandledSignalerContext" : "ct 12/30/2023 23:12",
"testDoStepRestart" : "ct 12/30/2023 23:12",
"testDoStepRestartFromSender" : "ct 1/20/2022 20:50",
"testDoStepThrough" : "ct 12/30/2021 14:40",
"testDoStepThrough" : "ct 12/30/2023 22:30",
"testDoStepThroughUntil" : "ct 2/17/2022 19:09",
"testDoStepThroughUntilFromSender" : "ct 3/13/2022 14:54",
"testReturnValue" : "ct 3/17/2022 00:55",
"testSpaceUsed" : "ct 7/24/2022 20:05",
"testTraceContextFilter" : "ct 2/20/2022 19:39",
"testTraceFor:contextFilter:like:" : "ct 3/15/2022 23:59",
"testTraceFor:contextFilter:like:" : "ct 12/30/2023 23:01",
"testTraceFor:like:" : "ct 2/20/2022 19:39",
"testTraceForBlock" : "ct 5/25/2022 22:03",
"testTraceNonLocalReturn" : "ct 2/20/2022 19:36",
Expand Down

1 comment on commit 679276e

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed Screenshots/Help

This push caused a change of 1 artifact against the default branch:

Please sign in to comment.