Skip to content

Commit 873e314

Browse files
ClotildeToullecClotildeToullec
committed
Do not set methods as receiver of an invocation
1 parent 829624b commit 873e314

14 files changed

+193
-183
lines changed

‎Moose-Blueprint-Models-Tests/CBAbstractClassBlueprintTest.class.st‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,37 @@
22
A MBClassBlueprintTest is a test class for testing the behavior of MBClassBlueprint
33
"
44
Class {
5-
#name : #CBAbstractClassBlueprintTest,
6-
#superclass : #TestCase,
5+
#name : 'CBAbstractClassBlueprintTest',
6+
#superclass : 'TestCase',
77
#instVars : [
88
'model',
99
'classBlueprint',
1010
'externalClass',
1111
'mainClass'
1212
],
13-
#category : #'Moose-Blueprint-Models-Tests'
13+
#category : 'Moose-Blueprint-Models-Tests',
14+
#package : 'Moose-Blueprint-Models-Tests'
1415
}
1516

16-
{ #category : #testing }
17+
{ #category : 'testing' }
1718
CBAbstractClassBlueprintTest class >> isAbstract [
1819

1920
^ self = CBAbstractClassBlueprintTest
2021
]
2122

22-
{ #category : #accessing }
23+
{ #category : 'accessing' }
2324
CBAbstractClassBlueprintTest >> accessorName [
2425

2526
^ 'accessor'
2627
]
2728

28-
{ #category : #accessing }
29+
{ #category : 'accessing' }
2930
CBAbstractClassBlueprintTest >> attributeName [
3031

3132
^ 'attribute'
3233
]
3334

34-
{ #category : #entities }
35+
{ #category : 'entities' }
3536
CBAbstractClassBlueprintTest >> configureExternalClass [
3637

3738
| externalMethodInMainClass methodFromExternalClass |
@@ -49,7 +50,7 @@ CBAbstractClassBlueprintTest >> configureExternalClass [
4950
addCandidate: externalMethodInMainClass
5051
]
5152

52-
{ #category : #entities }
53+
{ #category : 'entities' }
5354
CBAbstractClassBlueprintTest >> createAccesses [
5455

5556
(mainClass methods select: [ :method |
@@ -64,67 +65,67 @@ CBAbstractClassBlueprintTest >> createAccesses [
6465
variable: (mainClass attributes detect: #isClassSide)
6566
]
6667

67-
{ #category : #entities }
68+
{ #category : 'entities' }
6869
CBAbstractClassBlueprintTest >> createAccessors [
6970

7071
self subclassResponsibility
7172
]
7273

73-
{ #category : #entities }
74+
{ #category : 'entities' }
7475
CBAbstractClassBlueprintTest >> createAttribute [
7576

7677
(model newAttributeNamed: self attributeName) parentType: mainClass
7778
]
7879

79-
{ #category : #running }
80+
{ #category : 'running' }
8081
CBAbstractClassBlueprintTest >> createClassBlueprint [
8182

8283
classBlueprint := CBClassBlueprint newFrom: mainClass
8384
]
8485

85-
{ #category : #entities }
86+
{ #category : 'entities' }
8687
CBAbstractClassBlueprintTest >> createClassMethod [
8788

8889
(model newMethodNamed: 'classMethod')
8990
isClassSide: true;
9091
parentType: mainClass
9192
]
9293

93-
{ #category : #entities }
94+
{ #category : 'entities' }
9495
CBAbstractClassBlueprintTest >> createClassVariables [
9596

9697
(model newAttributeNamed: 'classVar')
9798
isClassSide: true;
9899
parentType: mainClass
99100
]
100101

101-
{ #category : #entities }
102+
{ #category : 'entities' }
102103
CBAbstractClassBlueprintTest >> createDeadChildren [
103104

104105
self subclassResponsibility
105106
]
106107

107-
{ #category : #entities }
108+
{ #category : 'entities' }
108109
CBAbstractClassBlueprintTest >> createExternalMethod [
109110

110111
^ (model newMethodNamed: self externalMethodName)
111112
parentType: mainClass;
112113
yourself
113114
]
114115

115-
{ #category : #entities }
116+
{ #category : 'entities' }
116117
CBAbstractClassBlueprintTest >> createInitializers [
117118

118119
self subclassResponsibility
119120
]
120121

121-
{ #category : #entities }
122+
{ #category : 'entities' }
122123
CBAbstractClassBlueprintTest >> createInternalMethod [
123124

124125
(model newMethodNamed: self internalMethodName) parentType: mainClass
125126
]
126127

127-
{ #category : #running }
128+
{ #category : 'running' }
128129
CBAbstractClassBlueprintTest >> createModel [
129130

130131
model := self modelClass new.
@@ -143,31 +144,31 @@ CBAbstractClassBlueprintTest >> createModel [
143144
self configureExternalClass
144145
]
145146

146-
{ #category : #accessing }
147+
{ #category : 'accessing' }
147148
CBAbstractClassBlueprintTest >> externalMethodName [
148149

149150
^ 'external'
150151
]
151152

152-
{ #category : #accessing }
153+
{ #category : 'accessing' }
153154
CBAbstractClassBlueprintTest >> initializerMethodNames [
154155

155156
^ self subclassResponsibility
156157
]
157158

158-
{ #category : #accessing }
159+
{ #category : 'accessing' }
159160
CBAbstractClassBlueprintTest >> internalMethodName [
160161

161162
^ 'internalMethod'
162163
]
163164

164-
{ #category : #entities }
165+
{ #category : 'entities' }
165166
CBAbstractClassBlueprintTest >> modelClass [
166167

167168
self subclassResponsibility
168169
]
169170

170-
{ #category : #running }
171+
{ #category : 'running' }
171172
CBAbstractClassBlueprintTest >> setUp [
172173

173174
super setUp.
@@ -176,7 +177,7 @@ CBAbstractClassBlueprintTest >> setUp [
176177
classBlueprint := CBClassBlueprint newFrom: mainClass
177178
]
178179

179-
{ #category : #tests }
180+
{ #category : 'tests' }
180181
CBAbstractClassBlueprintTest >> testAccessOnClassVar [
181182

182183
| mbVarClass |
@@ -194,7 +195,7 @@ CBAbstractClassBlueprintTest >> testAccessOnClassVar [
194195
equals: (mainClass attributes detect: #isClassSide)
195196
]
196197

197-
{ #category : #tests }
198+
{ #category : 'tests' }
198199
CBAbstractClassBlueprintTest >> testAttributes [
199200
" the asSet because an attribute can belong to the class side and be dead, which makes it in two different categorizations from which we extract all the attributes"
200201

@@ -203,15 +204,15 @@ CBAbstractClassBlueprintTest >> testAttributes [
203204
equals: mainClass attributes size
204205
]
205206

206-
{ #category : #tests }
207+
{ #category : 'tests' }
207208
CBAbstractClassBlueprintTest >> testClassVar [
208209

209210
self
210211
assertCollection: (classBlueprint classVars collect: #entity)
211212
hasSameElements: (mainClass attributes select: #isClassSide)
212213
]
213214

214-
{ #category : #tests }
215+
{ #category : 'tests' }
215216
CBAbstractClassBlueprintTest >> testDeadAttributes [
216217

217218
self
@@ -220,22 +221,22 @@ CBAbstractClassBlueprintTest >> testDeadAttributes [
220221
(mainClass attributes select: #isCBDead thenCollect: #name)
221222
]
222223

223-
{ #category : #tests }
224+
{ #category : 'tests' }
224225
CBAbstractClassBlueprintTest >> testInitializers [
225226

226227
self
227228
assertCollection: (classBlueprint initializers collect: #name)
228229
hasSameElements: self initializerMethodNames
229230
]
230231

231-
{ #category : #tests }
232+
{ #category : 'tests' }
232233
CBAbstractClassBlueprintTest >> testIsInitializerMethod [
233234

234235
self assert: (classBlueprint models detect: [ :each |
235236
each name includesSubstring: 'initialize' ]) entity isInitializer
236237
]
237238

238-
{ #category : #tests }
239+
{ #category : 'tests' }
239240
CBAbstractClassBlueprintTest >> testModels [
240241

241242
self

‎Moose-Blueprint-Models-Tests/CBClassBlueprintForJavaModelTest.class.st‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Class {
2-
#name : #CBClassBlueprintForJavaModelTest,
3-
#superclass : #CBAbstractClassBlueprintTest,
4-
#category : #'Moose-Blueprint-Models-Tests'
2+
#name : 'CBClassBlueprintForJavaModelTest',
3+
#superclass : 'CBAbstractClassBlueprintTest',
4+
#category : 'Moose-Blueprint-Models-Tests',
5+
#package : 'Moose-Blueprint-Models-Tests'
56
}
67

7-
{ #category : #entities }
8+
{ #category : 'entities' }
89
CBClassBlueprintForJavaModelTest >> createAccessors [
910

1011
| setter otherMethod |
@@ -26,23 +27,23 @@ CBClassBlueprintForJavaModelTest >> createAccessors [
2627
addCandidate: setter
2728
]
2829

29-
{ #category : #entities }
30+
{ #category : 'entities' }
3031
CBClassBlueprintForJavaModelTest >> createDeadChildren [
3132

3233
(model newMethodNamed: 'hibernerMethod1()') parentType: mainClass.
3334

3435
(model newAttributeNamed: 'deadAttribute') parentType: mainClass
3536
]
3637

37-
{ #category : #entities }
38+
{ #category : 'entities' }
3839
CBClassBlueprintForJavaModelTest >> createExternalMethod [
3940

4041
^ super createExternalMethod
4142
bePublic;
4243
yourself
4344
]
4445

45-
{ #category : #entities }
46+
{ #category : 'entities' }
4647
CBClassBlueprintForJavaModelTest >> createInitializers [
4748

4849
(model newMethodNamed: 'initializer1()')
@@ -54,19 +55,19 @@ CBClassBlueprintForJavaModelTest >> createInitializers [
5455
parentType: mainClass
5556
]
5657

57-
{ #category : #accessing }
58+
{ #category : 'accessing' }
5859
CBClassBlueprintForJavaModelTest >> initializerMethodNames [
5960

6061
^ { 'initializer1()'. 'initializer2()' }
6162
]
6263

63-
{ #category : #entities }
64+
{ #category : 'entities' }
6465
CBClassBlueprintForJavaModelTest >> modelClass [
6566

6667
^ FamixJavaModel
6768
]
6869

69-
{ #category : #tests }
70+
{ #category : 'tests' }
7071
CBClassBlueprintForJavaModelTest >> testAccessOnInstVar [
7172

7273
| mbInstVar |
@@ -84,7 +85,7 @@ CBClassBlueprintForJavaModelTest >> testAccessOnInstVar [
8485
attribute name beginsWith: self attributeName ]) ]
8586
]
8687

87-
{ #category : #tests }
88+
{ #category : 'tests' }
8889
CBClassBlueprintForJavaModelTest >> testDeadAccessor [
8990

9091
self assert:

‎Moose-Blueprint-Models-Tests/CBClassBlueprintForStModelTest.class.st‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Class {
2-
#name : #CBClassBlueprintForStModelTest,
3-
#superclass : #CBAbstractClassBlueprintTest,
2+
#name : 'CBClassBlueprintForStModelTest',
3+
#superclass : 'CBAbstractClassBlueprintTest',
44
#instVars : [
55
'deadBranchMethod'
66
],
7-
#category : #'Moose-Blueprint-Models-Tests'
7+
#category : 'Moose-Blueprint-Models-Tests',
8+
#package : 'Moose-Blueprint-Models-Tests'
89
}
910

10-
{ #category : #entities }
11+
{ #category : 'entities' }
1112
CBClassBlueprintForStModelTest >> configureExternalClass [
1213

1314
super configureExternalClass.
@@ -16,7 +17,7 @@ CBClassBlueprintForStModelTest >> configureExternalClass [
1617
(model newPackageNamed: 'ExternalPackage')
1718
]
1819

19-
{ #category : #entities }
20+
{ #category : 'entities' }
2021
CBClassBlueprintForStModelTest >> createAccessors [
2122

2223
(model newMethodNamed: self accessorName)
@@ -30,7 +31,7 @@ CBClassBlueprintForStModelTest >> createAccessors [
3031
parentType: mainClass
3132
]
3233

33-
{ #category : #entities }
34+
{ #category : 'entities' }
3435
CBClassBlueprintForStModelTest >> createDeadChildren [
3536

3637
| stub deadMethod |
@@ -59,7 +60,7 @@ CBClassBlueprintForStModelTest >> createDeadChildren [
5960
(model newAttributeNamed: 'deadAttribute') parentType: mainClass
6061
]
6162

62-
{ #category : #entities }
63+
{ #category : 'entities' }
6364
CBClassBlueprintForStModelTest >> createInitializers [
6465

6566
(model newMethodNamed: #initialize) parentType: mainClass.
@@ -69,26 +70,26 @@ CBClassBlueprintForStModelTest >> createInitializers [
6970
parentType: mainClass
7071
]
7172

72-
{ #category : #accessing }
73+
{ #category : 'accessing' }
7374
CBClassBlueprintForStModelTest >> initializerMethodNames [
7475

7576
^ { #initialize. #randomName }
7677
]
7778

78-
{ #category : #entities }
79+
{ #category : 'entities' }
7980
CBClassBlueprintForStModelTest >> modelClass [
8081

8182
^ FamixStModel
8283
]
8384

84-
{ #category : #tests }
85+
{ #category : 'tests' }
8586
CBClassBlueprintForStModelTest >> testCheckDead [
8687

8788
self flag: 'The next sentence does not sound right.'.
8889
self deny: deadBranchMethod belongsToDeadBranch
8990
]
9091

91-
{ #category : #tests }
92+
{ #category : 'tests' }
9293
CBClassBlueprintForStModelTest >> testIsExternal [
9394

9495
self assert: (classBlueprint methodModels detect: [ :each |

0 commit comments

Comments
 (0)