Skip to content

Commit cb0951e

Browse files
jeciscjecisc
authored
Merge pull request #756 from moosetechnology/clean-smalltalk-importers
Simplify Pharo code importing infrastructure
2 parents 3c2efde + 319e1c0 commit cb0951e

File tree

36 files changed

+434
-655
lines changed

36 files changed

+434
-655
lines changed

‎src/Famix-Deprecated/MoosePharoImporterTask.class.st

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Class {
2+
#name : #MoosePharoImporterTask,
3+
#superclass : #FamixStPharoImporterTask,
4+
#category : #'Famix-Deprecated'
5+
}
6+
7+
{ #category : #testing }
8+
MoosePharoImporterTask class >> isDeprecated [
9+
10+
^ true
11+
]

‎src/Famix-PharoSmalltalk-Tests/KGBForMetricsTestResource.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Class {
99

1010
{ #category : #setup }
1111
KGBForMetricsTestResource >> importModel [
12-
MoosePharoImporterTask new
13-
importerClass: SmalltalkImporter;
12+
13+
FamixStPharoImporterTask new
1414
model: model;
1515
addFromPackageNamed: #'Moose-TestResources-KGB-P1FullReferencer';
1616
addFromPackageNamed: #'Moose-TestResources-KGB-P2InteractedReferencerReferee';

‎src/Famix-PharoSmalltalk-Tests/LCOMTestResource.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Class {
99

1010
{ #category : #setup }
1111
LCOMTestResource >> importModel [
12-
MoosePharoImporterTask new
13-
importerClass: SmalltalkImporter;
12+
13+
FamixStPharoImporterTask new
1414
model: model;
1515
addFromPackageNamed: #'Moose-TestResources-LCOM';
1616
run

‎src/Famix-PharoSmalltalk-Tests/PackageBlueprintTestResource.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Class {
99

1010
{ #category : #setup }
1111
PackageBlueprintTestResource >> importModel [
12-
MoosePharoImporterTask new
13-
importerClass: SmalltalkImporter;
12+
13+
FamixStPharoImporterTask new
1414
model: model;
1515
addFromPackageNamed: #'Moose-TestResources-PackageBlueprint-P1';
1616
addFromPackageNamed: #'Moose-TestResources-PackageBlueprint-P2';

‎src/Moose-Importers/MooseAbstractImporter.class.st

-104
This file was deleted.

‎src/Moose-Importers/MooseFileStructureImporter.class.st

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
"
2+
I am an importer taking a model as parameter and creating a model of folders and files from a file reference given to me as parameter in this model.
3+
"
14
Class {
25
#name : #MooseFileStructureImporter,
3-
#superclass : #MooseAbstractImporter,
6+
#superclass : #Object,
47
#instVars : [
58
'mooseModel',
69
'factory'

‎src/Moose-SmalltalkImporter-Core-Tests/ClassesExtensionTestResource.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ Class {
77
{ #category : #hook }
88
ClassesExtensionTestResource >> importModel [
99

10-
SmalltalkImporter new model: model; addPackageNamed: 'ReferenceModel' ; run.
10+
FamixStImporter new model: model; addPackageNamed: 'ReferenceModel' ; run.
1111
]

‎src/Moose-SmalltalkImporter-Core-Tests/FamixReferenceModelNamespaceMergingClassAndMetaclassTestResource.class.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ Class {
88
FamixReferenceModelNamespaceMergingClassAndMetaclassTestResource >> importModel [
99

1010
| importer |
11-
importer := MoosePharoImporterTask new.
11+
importer := FamixStPharoImporterTask new.
1212
importer importingContext mergeClassAndMetaclass.
13-
importer importerClass: SmalltalkImporter.
14-
importer doNotRunCandidateOperator.
1513
importer
14+
doNotRunCandidateOperator;
1615
model: model;
1716
addFromPackageNamed: #'Moose-TestResources-Reference-Core';
1817
run

‎src/Moose-SmalltalkImporter-Core-Tests/FamixReferenceModelNamespaceTestResource.class.st

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@ Class {
77
{ #category : #setup }
88
FamixReferenceModelNamespaceTestResource >> importModel [
99

10-
MoosePharoImporterTask new
11-
importerClass: SmalltalkImporter;
10+
FamixStPharoImporterTask new
1211
model: model;
1312
doNotRunCandidateOperator;
1413
addFromPackageNamed: #'Moose-TestResources-Reference-Core';
1514
addFromPackageNamed: #'Moose-TestResources-Reference-PackageOne';
1615
addFromPackageNamed: #'Moose-TestResources-Reference-PackageTwo';
17-
run;
18-
yourself
16+
run
1917
]

‎src/Moose-SmalltalkImporter-Core-Tests/MoosePharoImporterTaskTest.class.st

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@ Class {
44
#category : #'Moose-SmalltalkImporter-Core-Tests'
55
}
66

7-
{ #category : #tests }
8-
MoosePharoImporterTaskTest >> testDefaultImporterClass [
9-
self assert: MoosePharoImporterTask new importerClass equals: SmalltalkImporter
10-
]
11-
127
{ #category : #tests }
138
MoosePharoImporterTaskTest >> testDefaultModel [
14-
self assert: (MoosePharoImporterTask new model isKindOf: MooseModel)
9+
self assert: (FamixStPharoImporterTask new model isKindOf: MooseModel)
1510
]
1611

1712
{ #category : #tests }
1813
MoosePharoImporterTaskTest >> testImportedModelHasSmalltalkMetamodel [
1914
| model |
20-
model := MoosePharoImporterTask new
15+
model := FamixStPharoImporterTask new
2116
model: FamixStModel new;
2217
addFromPackageNamed: 'Moose-SmalltalkImporter-Core-Tests';
2318
basicRun.

‎src/Moose-SmalltalkImporter-Core-Tests/MooseScripts.class.st

+14-15
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MooseScripts class >> createLightModelForLAN [
1515
| model |
1616
model := FamixStModel new.
1717
model name: 'lightLAN'.
18-
MoosePharoImporterTask new
18+
FamixStPharoImporterTask new
1919
importingContext: (MooseImportingContext new
2020
importClass;
2121
importMethod;
@@ -43,7 +43,7 @@ MooseScripts class >> createLightModelForMorphic [
4343
| model |
4444
model := FamixStModel new.
4545
model name: 'lightMorphic'.
46-
MoosePharoImporterTask new
46+
FamixStPharoImporterTask new
4747
importingContext: (MooseImportingContext new
4848
importClass;
4949
importMethod;
@@ -73,7 +73,7 @@ MooseScripts class >> createLightModelForNetwork [
7373
| model |
7474
model := FamixStModel new.
7575
model name: 'lightNetwork'.
76-
MoosePharoImporterTask new
76+
FamixStPharoImporterTask new
7777
importingContext: (MooseImportingContext new
7878
importClass;
7979
importMethod;
@@ -102,7 +102,7 @@ MooseScripts class >> createLightModelForPharo [
102102
| model |
103103
model := FamixStModel new.
104104
model name: 'lightPharo'.
105-
MoosePharoImporterTask new
105+
FamixStPharoImporterTask new
106106
importingContext: (MooseImportingContext new
107107
importClass;
108108
importMethod;
@@ -128,7 +128,7 @@ MooseScripts class >> createMediumModelForNetwork [
128128
| model importer |
129129
model := FamixStModel new.
130130
model name: 'mediumNetwork'.
131-
importer := MoosePharoImporterTask new.
131+
importer := FamixStPharoImporterTask new.
132132
importer importingContext mergeClassAndMetaclass.
133133
importer doNotRunCandidateOperator.
134134
importer model: model; addFromPackagesNamed: (self packageNamesFor: 'Network*'); runWithProgress.
@@ -148,7 +148,7 @@ MooseScripts class >> createModelForMorphic [
148148
| model importer |
149149
model := FamixStModel new.
150150
model name: 'Morphic'.
151-
importer := MoosePharoImporterTask new.
151+
importer := FamixStPharoImporterTask new.
152152
importer importingContext mergeClassAndMetaclass.
153153
importer runCandidateOperator.
154154
importer model: model; addFromPackagesNamed: (self packageNamesFor: 'Morphic*'); runWithProgress.
@@ -171,7 +171,7 @@ MooseScripts class >> createModelForNetwork [
171171
| model importer |
172172
model := FamixStModel new.
173173
model name: 'Network'.
174-
importer := MoosePharoImporterTask new.
174+
importer := FamixStPharoImporterTask new.
175175
importer importingContext mergeClassAndMetaclass.
176176
importer runCandidateOperator.
177177
importer model: model; addFromPackagesNamed: (self packageNamesFor: 'Network*') ; runWithProgress.
@@ -185,7 +185,7 @@ MooseScripts class >> createModelForPharo [
185185
| model importer |
186186
model := FamixStModel new.
187187
model name: 'Pharo'.
188-
importer := MoosePharoImporterTask new.
188+
importer := FamixStPharoImporterTask new.
189189
importer importingContext mergeClassAndMetaclass.
190190
importer runCandidateOperator.
191191
importer model: model; addFromPackagesNamed: self pharoPackageNames; runWithProgress.
@@ -198,7 +198,7 @@ MooseScripts class >> createModelNamed: modelName with: aCollectionOfPackageName
198198
| model importer |
199199
model := FamixStModel new.
200200
model name: modelName.
201-
importer := MoosePharoImporterTask new.
201+
importer := FamixStPharoImporterTask new.
202202
importer importingContext mergeClassAndMetaclass.
203203
importer runCandidateOperator.
204204
importer model: model; addFromPackagesNamed: aCollectionOfPackageNames; runWithProgress.
@@ -254,14 +254,13 @@ MooseScripts class >> packageNamesFor: aPrefixString withTestPackages: aBoolean
254254
self packageNamesFor: 'Network*' withTestPackages: false.
255255
self packageNamesFor: 'Network*' withTestPackages: true
256256
"
257-
257+
258258
| packages packageNames aTestPrefixString |
259-
self packageOrganizer unregisterPackageNamed: aPrefixString.
260-
packages := self packageOrganizer packages select: [:each | aPrefixString match: each name ].
261-
packageNames := packages collect: [:pak | pak name].
259+
packages := self packageOrganizer packages select: [ :each | aPrefixString match: each name ].
260+
packageNames := packages collect: [ :pak | pak name ].
262261
aBoolean ifFalse: [
263-
aTestPrefixString := aPrefixString, 'Tests*'.
264-
packageNames := packageNames reject: [ :pakName | aTestPrefixString match: pakName] ].
262+
aTestPrefixString := aPrefixString , 'Tests*'.
263+
packageNames := packageNames reject: [ :pakName | aTestPrefixString match: pakName ] ].
265264
^ packageNames
266265
]
267266

‎src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterFamixClassTest.class.st

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ Class {
66

77
{ #category : #tests }
88
MooseSmalltalkImporterFamixClassTest >> testIsTestCase [
9+
910
| mooseModel |
1011
mooseModel := FamixStModel new.
11-
MoosePharoImporterTask new
12-
importerClass: SmalltalkImporter;
12+
FamixStPharoImporterTask new
1313
model: mooseModel;
1414
addClasses: (OrderedCollection with: self class);
15-
run;
16-
yourself.
15+
run.
1716
self assert: (mooseModel allModelClasses select: #isInstanceSide) first isTestCase
1817
]

‎src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterRoelTyperTest.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MooseSmalltalkImporterRoelTyperTest >> testASTCore [
99
| model importer |
1010
model := FamixStModel new.
1111
self timeLimit: 60 seconds.
12-
importer := MoosePharoImporterTask new.
12+
importer := FamixStPharoImporterTask new.
1313
importer importingContext mergeClassAndMetaclass. ";
1414
computeTypeOfAttributes"
1515
importer runCandidateOperator.

‎src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterSubclassesTest.class.st

+10-9
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,18 @@ MooseSmalltalkImporterSubclassesTest >> pharoImporterTask: anObject [
3030

3131
{ #category : #running }
3232
MooseSmalltalkImporterSubclassesTest >> setUp [
33+
3334
super setUp.
34-
model := FamixStModel new.
35+
model := FamixStModel new.
3536
model name: 'Test'.
36-
pharoImporterTask := MoosePharoImporterTask new
37-
importerClass: SmalltalkImporter;
38-
doNotRunCandidateOperator;
39-
importingContext: (MooseImportingContext new
40-
importPackage;
41-
importInheritance;
42-
importAccess;
43-
mergeClassAndMetaclass ; yourself).
37+
pharoImporterTask := FamixStPharoImporterTask new
38+
doNotRunCandidateOperator;
39+
importingContext: (MooseImportingContext new
40+
importPackage;
41+
importInheritance;
42+
importAccess;
43+
mergeClassAndMetaclass;
44+
yourself)
4445
]
4546

4647
{ #category : #tests }

0 commit comments

Comments
 (0)