Merge pull request #756 from moosetechnology/clean-smalltalk-importers

Simplify Pharo code importing infrastructure
moosetechnology · Apr 16, 2024 · cb0951e · cb0951e
2 parents 3c2efde + 319e1c0
commit cb0951e
Show file tree

Hide file tree

Showing 36 changed files with 434 additions and 655 deletions.
diff --git a/src/Famix-Deprecated/MoosePharoImporterTask.class.st b/src/Famix-Deprecated/MoosePharoImporterTask.class.st
@@ -0,0 +1,11 @@
+Class {
+	#name : #MoosePharoImporterTask,
+	#superclass : #FamixStPharoImporterTask,
+	#category : #'Famix-Deprecated'
+}
+
+{ #category : #testing }
+MoosePharoImporterTask class >> isDeprecated [
+
+	^ true
+]
diff --git a/src/Famix-PharoSmalltalk-Tests/KGBForMetricsTestResource.class.st b/src/Famix-PharoSmalltalk-Tests/KGBForMetricsTestResource.class.st
@@ -9,8 +9,8 @@ Class {
 
 { #category : #setup }
 KGBForMetricsTestResource >> importModel [
-	MoosePharoImporterTask new
-		importerClass: SmalltalkImporter;
+
+	FamixStPharoImporterTask new
 		model: model;
 		addFromPackageNamed: #'Moose-TestResources-KGB-P1FullReferencer';
 		addFromPackageNamed: #'Moose-TestResources-KGB-P2InteractedReferencerReferee';

diff --git a/src/Famix-PharoSmalltalk-Tests/LCOMTestResource.class.st b/src/Famix-PharoSmalltalk-Tests/LCOMTestResource.class.st
@@ -9,8 +9,8 @@ Class {
 
 { #category : #setup }
 LCOMTestResource >> importModel [
-	MoosePharoImporterTask new
-		importerClass: SmalltalkImporter;
+
+	FamixStPharoImporterTask new
 		model: model;
 		addFromPackageNamed: #'Moose-TestResources-LCOM';
 		run

diff --git a/src/Famix-PharoSmalltalk-Tests/PackageBlueprintTestResource.class.st b/src/Famix-PharoSmalltalk-Tests/PackageBlueprintTestResource.class.st
@@ -9,8 +9,8 @@ Class {
 
 { #category : #setup }
 PackageBlueprintTestResource >> importModel [
-	MoosePharoImporterTask new
-		importerClass: SmalltalkImporter;
+
+	FamixStPharoImporterTask new
 		model: model;
 		addFromPackageNamed: #'Moose-TestResources-PackageBlueprint-P1';
 		addFromPackageNamed: #'Moose-TestResources-PackageBlueprint-P2';

diff --git a/src/Moose-Importers/MooseAbstractImporter.class.st b/src/Moose-Importers/MooseAbstractImporter.class.st
diff --git a/src/Moose-Importers/MooseFileStructureImporter.class.st b/src/Moose-Importers/MooseFileStructureImporter.class.st
@@ -1,6 +1,9 @@
+"
+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.
+"
 Class {
 	#name : #MooseFileStructureImporter,
-	#superclass : #MooseAbstractImporter,
+	#superclass : #Object,
 	#instVars : [
 		'mooseModel',
 		'factory'

diff --git a/src/Moose-SmalltalkImporter-Core-Tests/ClassesExtensionTestResource.class.st b/src/Moose-SmalltalkImporter-Core-Tests/ClassesExtensionTestResource.class.st
@@ -7,5 +7,5 @@ Class {
 { #category : #hook }
 ClassesExtensionTestResource >> importModel [
 
-	SmalltalkImporter new model: model; addPackageNamed: 'ReferenceModel' ; run.
+	FamixStImporter new model: model; addPackageNamed: 'ReferenceModel' ; run.
 ]
diff --git a/...rter-Core-Tests/FamixReferenceModelNamespaceMergingClassAndMetaclassTestResource.class.st b/...rter-Core-Tests/FamixReferenceModelNamespaceMergingClassAndMetaclassTestResource.class.st
@@ -8,11 +8,10 @@ Class {
 FamixReferenceModelNamespaceMergingClassAndMetaclassTestResource >> importModel [
 
 	| importer |
-	importer := MoosePharoImporterTask new.
+	importer := FamixStPharoImporterTask new.
 	importer importingContext mergeClassAndMetaclass.
-	importer importerClass: SmalltalkImporter.
-	importer doNotRunCandidateOperator.
 	importer
+		doNotRunCandidateOperator;
 		model: model;
 		addFromPackageNamed: #'Moose-TestResources-Reference-Core';
 		run

diff --git a/src/Moose-SmalltalkImporter-Core-Tests/FamixReferenceModelNamespaceTestResource.class.st b/src/Moose-SmalltalkImporter-Core-Tests/FamixReferenceModelNamespaceTestResource.class.st
@@ -7,13 +7,11 @@ Class {
 { #category : #setup }
 FamixReferenceModelNamespaceTestResource >> importModel [
 
-	MoosePharoImporterTask new
-		importerClass: SmalltalkImporter;
+	FamixStPharoImporterTask new
 		model: model;
 		doNotRunCandidateOperator;
 		addFromPackageNamed: #'Moose-TestResources-Reference-Core';
 		addFromPackageNamed: #'Moose-TestResources-Reference-PackageOne';
 		addFromPackageNamed: #'Moose-TestResources-Reference-PackageTwo';
-		run;
-		yourself
+		run
 ]
diff --git a/src/Moose-SmalltalkImporter-Core-Tests/MoosePharoImporterTaskTest.class.st b/src/Moose-SmalltalkImporter-Core-Tests/MoosePharoImporterTaskTest.class.st
@@ -4,20 +4,15 @@ Class {
 	#category : #'Moose-SmalltalkImporter-Core-Tests'
 }
 
-{ #category : #tests }
-MoosePharoImporterTaskTest >> testDefaultImporterClass [
-	self assert: MoosePharoImporterTask new importerClass equals: SmalltalkImporter
-]
-
 { #category : #tests }
 MoosePharoImporterTaskTest >> testDefaultModel [
-	self assert: (MoosePharoImporterTask new model isKindOf: MooseModel)
+	self assert: (FamixStPharoImporterTask new model isKindOf: MooseModel)
 ]
 
 { #category : #tests }
 MoosePharoImporterTaskTest >> testImportedModelHasSmalltalkMetamodel [
 	| model |
-	model := MoosePharoImporterTask new
+	model := FamixStPharoImporterTask new
 		model: FamixStModel new;
 		addFromPackageNamed: 'Moose-SmalltalkImporter-Core-Tests';
 		basicRun.

diff --git a/src/Moose-SmalltalkImporter-Core-Tests/MooseScripts.class.st b/src/Moose-SmalltalkImporter-Core-Tests/MooseScripts.class.st
@@ -15,7 +15,7 @@ MooseScripts class >> createLightModelForLAN [
 	| model |
 	model := FamixStModel new.
 	model name: 'lightLAN'.
-	MoosePharoImporterTask new
+	FamixStPharoImporterTask new
 		importingContext: (MooseImportingContext new
 				 importClass;
 				 importMethod;
@@ -43,7 +43,7 @@ MooseScripts class >> createLightModelForMorphic [
 	| model |
 	model := FamixStModel new.
 	model name: 'lightMorphic'.
-	MoosePharoImporterTask new
+	FamixStPharoImporterTask new
 		importingContext: (MooseImportingContext new
 				 importClass;
 				 importMethod;
@@ -73,7 +73,7 @@ MooseScripts class >> createLightModelForNetwork [
 	| model |
 	model := FamixStModel new.
 	model name: 'lightNetwork'.
-	MoosePharoImporterTask new
+	FamixStPharoImporterTask new
 		importingContext: (MooseImportingContext new
 				 importClass;
 				 importMethod;
@@ -102,7 +102,7 @@ MooseScripts class >> createLightModelForPharo [
 	| model |
 	model := FamixStModel new.
 	model name: 'lightPharo'.
-	MoosePharoImporterTask new
+	FamixStPharoImporterTask new
 		importingContext: (MooseImportingContext new
 				 importClass;
 				 importMethod;
@@ -128,7 +128,7 @@ MooseScripts class >> createMediumModelForNetwork [
 	| model importer |
 	model := FamixStModel new.
 	model name: 'mediumNetwork'.
-	importer := MoosePharoImporterTask new.
+	importer := FamixStPharoImporterTask new.
 	importer importingContext mergeClassAndMetaclass.
 	importer doNotRunCandidateOperator.
 	importer model: model; addFromPackagesNamed: (self packageNamesFor: 'Network*'); runWithProgress.
@@ -148,7 +148,7 @@ MooseScripts class >> createModelForMorphic [
 	| model importer |
 	model := FamixStModel new.
 	model name: 'Morphic'.
-	importer := MoosePharoImporterTask new.
+	importer := FamixStPharoImporterTask new.
 	importer importingContext mergeClassAndMetaclass.
 	importer runCandidateOperator.
 	importer model: model; addFromPackagesNamed: (self packageNamesFor: 'Morphic*'); runWithProgress.
@@ -171,7 +171,7 @@ MooseScripts class >> createModelForNetwork [
 	| model importer |
 	model := FamixStModel new.
 	model name: 'Network'.
-	importer := MoosePharoImporterTask new.
+	importer := FamixStPharoImporterTask new.
 	importer importingContext mergeClassAndMetaclass.
 	importer runCandidateOperator.
 	importer model: model; addFromPackagesNamed: (self packageNamesFor: 'Network*') ; runWithProgress.
@@ -185,7 +185,7 @@ MooseScripts class >> createModelForPharo [
 	| model importer |
 	model := FamixStModel new.
 	model name: 'Pharo'.
-	importer := MoosePharoImporterTask new.
+	importer := FamixStPharoImporterTask new.
 	importer importingContext mergeClassAndMetaclass.
 	importer runCandidateOperator.
 	importer model: model; addFromPackagesNamed: self pharoPackageNames; runWithProgress.
@@ -198,7 +198,7 @@ MooseScripts class >> createModelNamed: modelName with: aCollectionOfPackageName
 	| model importer |
 	model := FamixStModel new.
 	model name: modelName.
-	importer := MoosePharoImporterTask new.
+	importer := FamixStPharoImporterTask new.
 	importer importingContext mergeClassAndMetaclass.
 	importer runCandidateOperator.
 	importer model: model; addFromPackagesNamed: aCollectionOfPackageNames; runWithProgress.
@@ -254,14 +254,13 @@ MooseScripts class >> packageNamesFor: aPrefixString withTestPackages: aBoolean
 	self packageNamesFor: 'Network*' withTestPackages: false.
 	self packageNamesFor: 'Network*' withTestPackages: true
 	"
-	
+
 	| packages packageNames aTestPrefixString |
-	self packageOrganizer unregisterPackageNamed: aPrefixString. 
-	packages := self packageOrganizer packages select: [:each | aPrefixString match: each name ].
-	packageNames := packages collect: [:pak | pak name].
+	packages := self packageOrganizer packages select: [ :each | aPrefixString match: each name ].
+	packageNames := packages collect: [ :pak | pak name ].
 	aBoolean ifFalse: [
-		aTestPrefixString := aPrefixString, 'Tests*'.
-		packageNames := packageNames reject: [ :pakName | aTestPrefixString match: pakName] ].
+		aTestPrefixString := aPrefixString , 'Tests*'.
+		packageNames := packageNames reject: [ :pakName | aTestPrefixString match: pakName ] ].
 	^ packageNames
 ]
 

diff --git a/src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterFamixClassTest.class.st b/src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterFamixClassTest.class.st
@@ -6,13 +6,12 @@ Class {
 
 { #category : #tests }
 MooseSmalltalkImporterFamixClassTest >> testIsTestCase [
+
 	| mooseModel |
 	mooseModel := FamixStModel new.
-	MoosePharoImporterTask new
-		importerClass: SmalltalkImporter;
+	FamixStPharoImporterTask new
 		model: mooseModel;
 		addClasses: (OrderedCollection with: self class);
-		run;
-		yourself.
+		run.
 	self assert: (mooseModel allModelClasses select: #isInstanceSide) first isTestCase
 ]
diff --git a/src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterRoelTyperTest.class.st b/src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterRoelTyperTest.class.st
@@ -9,7 +9,7 @@ MooseSmalltalkImporterRoelTyperTest >> testASTCore [
 	| model importer |
 	model := FamixStModel new.
 	self timeLimit: 60 seconds.
-	importer := MoosePharoImporterTask new.
+	importer := FamixStPharoImporterTask new.
 	importer importingContext mergeClassAndMetaclass.	";
 		computeTypeOfAttributes"
 	importer runCandidateOperator.

diff --git a/src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterSubclassesTest.class.st b/src/Moose-SmalltalkImporter-Core-Tests/MooseSmalltalkImporterSubclassesTest.class.st
@@ -30,17 +30,18 @@ MooseSmalltalkImporterSubclassesTest >> pharoImporterTask: anObject [
 
 { #category : #running }
 MooseSmalltalkImporterSubclassesTest >> setUp [
+
 	super setUp.
-	model := FamixStModel new.	
+	model := FamixStModel new.
 	model name: 'Test'.
-	pharoImporterTask := MoosePharoImporterTask new
-		importerClass: SmalltalkImporter;
-		doNotRunCandidateOperator; 
-		importingContext: (MooseImportingContext new 
-										importPackage;
-										importInheritance;
-										importAccess;
-										mergeClassAndMetaclass ; yourself).
+	pharoImporterTask := FamixStPharoImporterTask new
+		                     doNotRunCandidateOperator;
+		                     importingContext: (MooseImportingContext new
+				                      importPackage;
+				                      importInheritance;
+				                      importAccess;
+				                      mergeClassAndMetaclass;
+				                      yourself)
 ]
 
 { #category : #tests }