From 679276e92234952c898c38255a99a089e8ffc6ad Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Sat, 30 Dec 2023 23:15:08 +0100 Subject: [PATCH] tests: update to trunk changes #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/ --- ...unCursorFrom.filter.stepsAndAssertions..st | 4 +--- .../instance/testDoStepBack.st | 2 +- .../instance/testDoStepInto.st | 2 +- .../instance/testDoStepIntoFiltered.st | 2 +- .../instance/testDoStepOver.st | 2 +- .../instance/testDoStepOverError.st | 2 +- .../instance/testDoStepOverHandledError.st | 2 +- .../instance/testDoStepOverSignalerContext.st | 2 +- .../testDoStepOverUnhandledSignalerContext.st | 2 +- .../instance/testDoStepRestart.st | 2 +- .../instance/testDoStepThrough.st | 2 +- .../testTraceFor.contextFilter.like..st | 2 +- .../TDBCursorTest.class/methodProperties.json | 24 +++++++++---------- 13 files changed, 24 insertions(+), 26 deletions(-) diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/runCursorFrom.filter.stepsAndAssertions..st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/runCursorFrom.filter.stepsAndAssertions..st index 6bbb6a96..ebcf3f4f 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/runCursorFrom.filter.stepsAndAssertions..st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/runCursorFrom.filter.stepsAndAssertions..st @@ -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. diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepBack.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepBack.st index d01d6ae9..091c72d9 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepBack.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepBack.st @@ -14,4 +14,4 @@ testDoStepBack (doStepBack nil (willReallyStore)) (doStepOver nil (willReallySend willReturn)) (doStepBack nil (willReallySend)) - (doStepOver nil (willReturn isDead))). \ No newline at end of file + (doStepOver nil (willReturnTopFromMethod))). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepInto.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepInto.st index fddd181b..ecd39ae1 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepInto.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepInto.st @@ -15,4 +15,4 @@ testDoStepInto (wiffy (willReallySend willReturn)) (plonk (willReallySend)) (ziffy (willReallySend willReturn)) - (plonk (willReallySend willReturn isDead))). \ No newline at end of file + (plonk (willReallySend willReturnTopFromMethod))). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepIntoFiltered.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepIntoFiltered.st index c8f2c0a4..99fba9b6 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepIntoFiltered.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepIntoFiltered.st @@ -14,4 +14,4 @@ testDoStepIntoFiltered (wiffy2 (willReturn)) (plonk (willReallySend)) (ziffy (willReallySend willReturn)) - (plonk (willReallySend willReturn isDead))). \ No newline at end of file + (plonk (willReallySend willReturnTopFromMethod))). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOver.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOver.st index f8a66c70..06cfc22c 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOver.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOver.st @@ -9,4 +9,4 @@ testDoStepOver arguments: #()) step: #doStepOver assertions: - #((nil (willReallySend willReallySend willReallySend willReturn isDead))). \ No newline at end of file + #((nil (willReallySend willReallySend willReallySend willReturnTopFromMethod))). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverError.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverError.st index 9e721bff..ce7c38ee 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverError.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverError.st @@ -11,4 +11,4 @@ testDoStepOverError #((doStepOver nil (willReallySend)) (doStepOver error: (willReturn)) (doStepInto error (willReturn)) - (doStepInto signalError (willReturn isDead))). \ No newline at end of file + (doStepInto signalError (willReturnTopFromMethod))). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverHandledError.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverHandledError.st index e126fc91..97eebf25 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverHandledError.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverHandledError.st @@ -11,4 +11,4 @@ testDoStepOverHandledError #((doStepOver nil (willReallySend)) (doStepThrough handleError (willReallySend)) (doStepOver handleError (willReturn)) - (doStepThrough nil (willReturn isDead))). \ No newline at end of file + (doStepThrough nil (willReturnTopFromMethod))). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverSignalerContext.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverSignalerContext.st index 40c82f1a..67eeddd5 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverSignalerContext.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverSignalerContext.st @@ -23,4 +23,4 @@ testDoStepOverSignalerContext "back in safer waters again" {#doStepOver. #error:. #(willReturn)}. {#doStepOver. #error. #(willReturn)}. - {#doStepOver. #signalError. #(willReturn isDead)}}. \ No newline at end of file + {#doStepOver. #signalError. #(willReturnTopFromMethod)}}. \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverUnhandledSignalerContext.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverUnhandledSignalerContext.st index 964359e1..d4193d31 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverUnhandledSignalerContext.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepOverUnhandledSignalerContext.st @@ -33,4 +33,4 @@ testDoStepOverUnhandledSignalerContext } , self stepsAndAssertionsForContextResumeEvaluating , { {#doStepOver. #error:. #(willReturn)}. {#doStepOver. #error. #(willReturn)}. - {#doStepOver. #signalError. #(willReturn isDead)}}. \ No newline at end of file + {#doStepOver. #signalError. #(willReturnTopFromMethod)}}. \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepRestart.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepRestart.st index 82188dab..6be85cd1 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepRestart.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepRestart.st @@ -16,4 +16,4 @@ testDoStepRestart (doRestart nil (willReallyStore)) (doStepOver nil (willReallyStore willReallySend willReturn)) (doRestart nil (willReallyStore willReallyStore willReallyStore)) - (doStepOver nil (willReallyStore willReallySend willReturn isDead))). \ No newline at end of file + (doStepOver nil (willReallyStore willReallySend willReturnTopFromMethod))). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepThrough.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepThrough.st index 0e0285d7..1dc94b47 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepThrough.st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepThrough.st @@ -12,4 +12,4 @@ testDoStepThrough #((nil (willReallySend)) ((griffleMethodReturn isExecutingBlock) (willReallySend willReturn)) ((griffleMethodReturn isExecutingBlock) (willReallySend willReturn)) - (nil (isDead))). \ No newline at end of file + (nil ())). \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testTraceFor.contextFilter.like..st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testTraceFor.contextFilter.like..st index 1db7e464..fe6dd1e6 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testTraceFor.contextFilter.like..st +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testTraceFor.contextFilter.like..st @@ -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. \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/methodProperties.json b/packages/TraceDebuggerTests.package/TDBCursorTest.class/methodProperties.json index 7c259d52..7ccda39a 100644 --- a/packages/TraceDebuggerTests.package/TDBCursorTest.class/methodProperties.json +++ b/packages/TraceDebuggerTests.package/TDBCursorTest.class/methodProperties.json @@ -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",