From 7d7b92e2bb18922a0baf135968a26198142f17be Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Wed, 27 Dec 2023 18:05:28 +0100 Subject: [PATCH] tests: make #testDebugForks safe for test coverage cherry-picked from 3ead61722cc25e15979e120218dc8c24423d3dcb & 137e6bd3f637c80ad9e0f7255ed8279cb0b29283 --- .../instance/stepContextIgnoringCoverage..st | 13 +++++++++++++ .../methodProperties.json | 1 + .../instance/testDebugForks.st | 9 ++++++--- .../methodProperties.json | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/instance/stepContextIgnoringCoverage..st diff --git a/packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/instance/stepContextIgnoringCoverage..st b/packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/instance/stepContextIgnoringCoverage..st new file mode 100644 index 00000000..ecd1fa03 --- /dev/null +++ b/packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/instance/stepContextIgnoringCoverage..st @@ -0,0 +1,13 @@ +private +stepContextIgnoringCoverage: aContext + + | context | + context := aContext step. + + [context selector == #run:with:in:] whileTrue: + [| contextAndError | + contextAndError := context runUntilErrorOrReturnFrom: context. + self assert: contextAndError second isNil. + context := contextAndError first]. + + ^ context \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/methodProperties.json b/packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/methodProperties.json index 0b2c8e7c..92e03753 100644 --- a/packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/methodProperties.json +++ b/packages/TraceDebuggerTests.package/TDBMemorySimulatorTest.class/methodProperties.json @@ -6,6 +6,7 @@ "memoryClass" : "ct 5/10/2022 21:50", "newSimulator" : "ct 5/10/2022 21:54", "setUp" : "ct 5/26/2022 15:38", + "stepContextIgnoringCoverage:" : "ct 11/26/2022 19:27", "testConsArray" : "ct 5/28/2022 19:43", "testContextPrimitives" : "ct 7/3/2022 01:53", "testExecuteQuickMethod" : "ct 7/1/2022 18:49", diff --git a/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/instance/testDebugForks.st b/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/instance/testDebugForks.st index 469e902c..65244773 100644 --- a/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/instance/testDebugForks.st +++ b/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/instance/testDebugForks.st @@ -3,11 +3,14 @@ testDebugForks | context | context := simulator customize: - [(thisContext tdbRetracingTimeIndex + 1 // 2) even ifFalse: [thisContext tdbRetracingTimeIndex]] asContext. - [context willJumpIfFalse] whileFalse: [context := context step]. + [(thisContext tdbRetracingTimeIndex + 1 // 2) even + ifFalse: [thisContext tdbRetracingTimeIndex]] asContext. + [context willJumpIfFalse] whileFalse: + [context := self stepContextIgnoringCoverage: context]. [context := context step] valueSupplyingAnswer: #('*fork*' 2). - [context willReturn] whileFalse: [context := context step]. + [context willReturn] whileFalse: + [context := self stepContextIgnoringCoverage: context]. self assertSlice: context top times: {1 to: 1. 2 to: 2} values: {1. 2}. \ No newline at end of file diff --git a/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/methodProperties.json b/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/methodProperties.json index 3d22e2bc..3c0396b2 100644 --- a/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/methodProperties.json +++ b/packages/TraceDebuggerTests.package/TDBRangeRetracingSimulatorTest.class/methodProperties.json @@ -24,7 +24,7 @@ "testCombineArgumentsCollect" : "ct 6/2/2022 10:28", "testContextPrimitives" : "ct 9/14/2022 12:11", "testCutVectorFromSideEffect" : "ct 7/7/2022 16:44", - "testDebugForks" : "ct 6/2/2022 10:27", + "testDebugForks" : "ct 11/26/2022 19:10", "testError" : "ct 6/2/2022 10:41", "testIsolateState" : "ct 5/26/2022 15:45", "testIsolatedForks" : "ct 5/26/2022 20:04",