From 99b7c32f6316fba38a8ec270f8c1edd553f18c69 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Thu, 29 Feb 2024 23:22:29 +0000 Subject: [PATCH] Fix VectorTest>>#testFirst Signed-off-by: Stefan Marr --- Examples/Benchmarks/TestSuite/TestCommon.som | 8 ++-- Examples/Benchmarks/TestSuite/VectorTest.som | 40 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Examples/Benchmarks/TestSuite/TestCommon.som b/Examples/Benchmarks/TestSuite/TestCommon.som index a1d4ff0f..546be348 100644 --- a/Examples/Benchmarks/TestSuite/TestCommon.som +++ b/Examples/Benchmarks/TestSuite/TestCommon.som @@ -33,7 +33,7 @@ TestCommon = Benchmark ( numExecs = ( self error: 'Implement in subclass and return the number of times a test is executed' ) - + oneTimeSetup = ( "Load all Tests. We don't really want to benchmark the parser." self tests @@ -77,17 +77,17 @@ TestCommon = Benchmark ( runner run. runner hasFailures ifTrue: [system exit: 1] ) - + benchmark = ( failOnUnsupportedOptionals := false. ^ self runAllSuites ) - + verifyResult: result = ( "result do: [:e | e println ]." ^ (result at: 1) = (190 * self numExecs) and: [ (result at: 2) = (0 * self numExecs) and: [ - (result at: 3) = (189 * self numExecs) and: [ + (result at: 3) = (190 * self numExecs) and: [ (result at: 4) = (992 * self numExecs) ] ] ] ) diff --git a/Examples/Benchmarks/TestSuite/VectorTest.som b/Examples/Benchmarks/TestSuite/VectorTest.som index 495f6a22..286d3a5b 100644 --- a/Examples/Benchmarks/TestSuite/VectorTest.som +++ b/Examples/Benchmarks/TestSuite/VectorTest.som @@ -54,7 +54,7 @@ VectorTest = TestCase ( self assert: 1 equals: v first ]. 1 to: 10 do: [:i | - self assert: 1 equals: v first. + self assert: i equals: v first. v removeFirst ] ) @@ -148,7 +148,7 @@ VectorTest = TestCase ( self assert: 1 equals: (arr at: 1). self assert: 2 equals: (arr at: 2). ) - + testAsSet = ( | v set | v := Vector new. @@ -157,38 +157,38 @@ VectorTest = TestCase ( v append: 3. v append: 4. self assert: 4 equals: v size. - + set := v asSet. self assert: 4 equals: set size. - + v append: 1. v append: 1. v append: 1. - + self assert: 4 + 3 equals: v size. - + set := v asSet. self assert: 4 equals: set size. ) - + testIsEmpty = ( | v | v := Vector new. self assert: v isEmpty. - + v append: 1. self deny: v isEmpty. - + v removeFirst. self assert: v isEmpty. - + v append: #ee. self deny: v isEmpty. - + v removeFirst. - self assert: v isEmpty. + self assert: v isEmpty. ) - + testRemoveObj = ( | v | v := Vector new. @@ -200,31 +200,31 @@ VectorTest = TestCase ( v append: #f. v append: #g. v append: #h. - + self assert: 8 equals: v size. - + self deny: (v remove: #aa). self assert: (v remove: #e). self assert: 7 equals: v size. ) - + testAppendComma = ( | v | v := Vector new. v, #a. v, #b. - + self assert: 2 equals: v size. self assert: (v contains: #a). self assert: (v contains: #b). ) - + testDoIndexes = ( | i v | v := Vector new. v doIndexes: [:j | self assert: false ]. - + v appendAll: #(1 2 3 4 5). i := 1. v doIndexes: [:j | @@ -233,7 +233,7 @@ VectorTest = TestCase ( ]. self assert: 6 equals: i. ) - + testDo = ( | i v | v := Vector new.