Skip to content

Commit 0044608

Browse files
dalehenrichdalehenrich
committed
Issue #953: checkpoint ... update expected failures and address another batch of regressions ... final work is resolving spec_0068 issues
1 parent eebcee4 commit 0044608

File tree

3 files changed

+1535
-35
lines changed

3 files changed

+1535
-35
lines changed

‎rowan/src/Rowan-TestsV3/RwRowanSample9V3Test.class.st

+22-22
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ RwRowanSample9V3Test >> testSpec_0085_01 [
29082908
_standard_validateLoadedProjects: loadedProjects
29092909
expectedProjectNames: projectNames.
29102910

2911-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
2911+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
29122912
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
29132913

29142914
self assert: ((System myUserProfile symbolList dictionaryAndSymbolOf: trait1) at: 1) name equals: #'RowanSample9_1'
@@ -2944,7 +2944,7 @@ RwRowanSample9V3Test >> testSpec_0085_01_to_02 [
29442944
_standard_validateLoadedProjects: loadedProjects
29452945
expectedProjectNames: projectNames.
29462946

2947-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
2947+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
29482948
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
29492949

29502950
"resolve project"
@@ -2992,7 +2992,7 @@ RwRowanSample9V3Test >> testSpec_0085_01_to_03 [
29922992
_standard_validateLoadedProjects: loadedProjects
29932993
expectedProjectNames: projectNames.
29942994

2995-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
2995+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
29962996
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
29972997

29982998
"resolve project"
@@ -3040,7 +3040,7 @@ RwRowanSample9V3Test >> testSpec_0085_02 [
30403040
_standard_validateLoadedProjects: loadedProjects
30413041
expectedProjectNames: projectNames.
30423042

3043-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3043+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
30443044
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
30453045
]
30463046

@@ -3074,7 +3074,7 @@ RwRowanSample9V3Test >> testSpec_0085_02_to_01 [
30743074
_standard_validateLoadedProjects: loadedProjects
30753075
expectedProjectNames: projectNames.
30763076

3077-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3077+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
30783078
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
30793079

30803080
"resolve project"
@@ -3122,7 +3122,7 @@ RwRowanSample9V3Test >> testSpec_0085_02_to_03 [
31223122
_standard_validateLoadedProjects: loadedProjects
31233123
expectedProjectNames: projectNames.
31243124

3125-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3125+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
31263126
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
31273127

31283128
"resolve project"
@@ -3170,7 +3170,7 @@ RwRowanSample9V3Test >> testSpec_0085_03 [
31703170
_standard_validateLoadedProjects: loadedProjects
31713171
expectedProjectNames: projectNames.
31723172

3173-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3173+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
31743174
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
31753175
]
31763176

@@ -3204,7 +3204,7 @@ RwRowanSample9V3Test >> testSpec_0085_03_to_01 [
32043204
_standard_validateLoadedProjects: loadedProjects
32053205
expectedProjectNames: projectNames.
32063206

3207-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3207+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
32083208
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
32093209

32103210
"resolve project"
@@ -3252,7 +3252,7 @@ RwRowanSample9V3Test >> testSpec_0085_03_to_02 [
32523252
_standard_validateLoadedProjects: loadedProjects
32533253
expectedProjectNames: projectNames.
32543254

3255-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3255+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
32563256
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
32573257

32583258
"resolve project"
@@ -3300,7 +3300,7 @@ RwRowanSample9V3Test >> testSpec_0085_03_to_04 [
33003300
_standard_validateLoadedProjects: loadedProjects
33013301
expectedProjectNames: projectNames.
33023302

3303-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3303+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
33043304
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
33053305
self assert: ((System myUserProfile symbolList dictionaryAndSymbolOf: trait1) at: 1) name equals: #'RowanSample9_1'.
33063306

@@ -3318,7 +3318,7 @@ RwRowanSample9V3Test >> testSpec_0085_03_to_04 [
33183318
_standard_validateLoadedProjects: loadedProjects
33193319
expectedProjectNames: projectNames.
33203320

3321-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3321+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
33223322
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
33233323
self assert: ((System myUserProfile symbolList dictionaryAndSymbolOf: trait1) at: 1) name equals: #'RowanSample9_2'
33243324
]
@@ -3469,7 +3469,7 @@ RwRowanSample9V3Test >> testSpec_0085_04 [
34693469
_standard_validateLoadedProjects: loadedProjects
34703470
expectedProjectNames: projectNames.
34713471

3472-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3472+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
34733473
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
34743474
self assert: ((System myUserProfile symbolList dictionaryAndSymbolOf: trait1) at: 1) name equals: #'RowanSample9_2'
34753475
]
@@ -3504,7 +3504,7 @@ RwRowanSample9V3Test >> testSpec_0085_05 [
35043504
_standard_validateLoadedProjects: loadedProjects
35053505
expectedProjectNames: projectNames.
35063506

3507-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3507+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
35083508
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
35093509

35103510
self assert: ((System myUserProfile symbolList dictionaryAndSymbolOf: trait1) at: 1) name equals: #'RowanSample9_1'
@@ -3598,7 +3598,7 @@ RwRowanSample9V3Test >> testSpec_0085_export [
35983598
_standard_validateLoadedProjects: loadedProjects
35993599
expectedProjectNames: projectNames.
36003600

3601-
trait1 := Rowan globalNamed: 'RowanSample9V3Trait1'.
3601+
trait1 := Rowan globalNamed: self _rowanSampleProjectBaseName, 'Trait1'.
36023602
self assert: ((ClassOrganizer new traits) includes: trait1) description: 'trait1 is unexpectedly not present'.
36033603

36043604
self assert: ((System myUserProfile symbolList dictionaryAndSymbolOf: trait1) at: 1) name equals: #'RowanSample9_1'.
@@ -3639,13 +3639,13 @@ RwRowanSample9V3Test >> testSpec_0085_move_trait_to_package [
36393639
expectedProjectNames: projectNames.
36403640
packageName := projectName, '-Tr01'.
36413641
(Rowan image loadedPackageNamed: packageName)
3642-
loadedTraitNamed: 'RowanSample9V3Trait1'
3642+
loadedTraitNamed: self _rowanSampleProjectBaseName, 'Trait1'
36433643
ifAbsent: [ self assert: false description: 'Loaded trait RowanSample9V3Trait1 not present'].
36443644

36453645
"move a trait from Tr01 to C01"
36463646
definedProject := project defined.
36473647
traitDef := (definedProject packageNamed: projectName, '-Tr01')
3648-
removeTraitNamed: 'RowanSample9V3Trait1'.
3648+
removeTraitNamed: self _rowanSampleProjectBaseName, 'Trait1'.
36493649
packageName := projectName, '-C01'.
36503650
traitDef packageName: packageName.
36513651
(definedProject packageNamed: packageName) addTraitDefinition: traitDef.
@@ -3693,15 +3693,15 @@ RwRowanSample9V3Test >> testSpec_0085_trait_shape_change_01 [
36933693
expectedProjectNames: projectNames.
36943694
packageName := projectName, '-Tr02'.
36953695
(Rowan image loadedPackageNamed: packageName)
3696-
loadedTraitNamed: 'RowanSample9V3Trait1'
3696+
loadedTraitNamed: self _rowanSampleProjectBaseName, 'Trait1'
36973697
ifAbsent: [ self assert: false description: 'Loaded trait RowanSample9V3Trait1 not present'].
36983698

36993699
"remove iv from trait and class"
37003700
definedProject := project defined.
37013701
classDef := (definedProject packageNamed: projectName, '-C02')
3702-
classDefinitionNamed:'RowanSample9V3Class1'.
3702+
classDefinitionNamed:self _rowanSampleProjectBaseName, 'Class1'.
37033703
traitDef := (definedProject packageNamed: projectName, '-Tr02')
3704-
traitDefinitionNamed: 'RowanSample9V3Trait1'.
3704+
traitDefinitionNamed: self _rowanSampleProjectBaseName, 'Trait1'.
37053705
traitIvNames := traitDef instVarNames copy.
37063706
classIvNames := classDef instVarNames copy.
37073707
self assert: traitIvNames equals: classIvNames.
@@ -3713,10 +3713,10 @@ RwRowanSample9V3Test >> testSpec_0085_trait_shape_change_01 [
37133713
classDef removeInstanceMethod: #'iv2'.
37143714
classDef instVarNames: traitIvNames.
37153715
testClassDef := (definedProject packageNamed: projectName, '-C-T02')
3716-
classExtensionDefinitionNamed:'RowanSample9V3TestCase'.
3716+
classExtensionDefinitionNamed:self _rowanSampleProjectBaseName, 'TestCase'.
37173717
testClassDef removeInstanceMethod: #'testIv2'.
37183718
testClassDef := (definedProject packageNamed: projectName, '-Tr-T02')
3719-
classExtensionDefinitionNamed:'RowanSample9V3TestCase'.
3719+
classExtensionDefinitionNamed:self _rowanSampleProjectBaseName, 'TestCase'.
37203720
testClassDef removeInstanceMethod: #'testIv2_t'.
37213721

37223722
"load project"
@@ -3730,7 +3730,7 @@ RwRowanSample9V3Test >> testSpec_0085_trait_shape_change_01 [
37303730
expectedProjectNames: projectNames.
37313731
Rowan image
37323732
loadedTraitMethod: #'iv1_t'
3733-
inTraitNamed: 'RowanSample9V3Trait1'
3733+
inTraitNamed: self _rowanSampleProjectBaseName, 'Trait1'
37343734
isMeta: false
37353735
ifFound: [:loadedTraitMethod | ]
37363736
ifAbsent: [self assert: false description: 'missing loaded trait method ''iv1''' ]

‎tests/expectedV30TestResults_sample9V3.json

+12-6
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"branch" : "",
33
"commitSha" : "",
44
"deprecationWarnings" : [ ],
5-
"gsVersion" : "3.7.2",
5+
"gsVersion" : "3.7.3.1",
66
"notes" : "",
77
"properties" : { },
88
"resultsSummary" : {
99
"errors" : 0,
1010
"failures" : 1,
11-
"passed" : 248,
12-
"summary" : "249 Tests with 1 Failures, 0 Errors and 0 DeprecationWarnings in 524.14s",
13-
"tests" : 249,
14-
"time" : 524.145
11+
"passed" : 249,
12+
"summary" : "250 Tests with 1 Failures, 0 Errors and 0 DeprecationWarnings in 469.53s",
13+
"tests" : 250,
14+
"time" : 469.527
1515
},
1616
"suiteName" : "Rowan projects Test Suite",
1717
"testCases" : [
@@ -1473,6 +1473,12 @@
14731473
"selector" : "testSpec_0085_trait_upgrade_simulation",
14741474
"time" : "0"
14751475
},
1476+
{
1477+
"className" : "RwRowanSample9V3Test",
1478+
"status" : "passed",
1479+
"selector" : "testSpec_0089",
1480+
"time" : "0"
1481+
},
14761482
{
14771483
"className" : "RwRowanSample9V3Test",
14781484
"status" : "passed",
@@ -1510,5 +1516,5 @@
15101516
"time" : "0"
15111517
}
15121518
],
1513-
"timeStamp" : "2024-08-16T14:24:22.515828-07:00"
1519+
"timeStamp" : "2025-03-10T16:41:33.609417-07:00"
15141520
}

0 commit comments

Comments
 (0)