Merge pull request #16954 from hernanmd/fix_exclude_package_manifest_…

…from_classref_rule Avoid analyzing classes in Manifest methods while checking ReClassesHaveNoReferencesCondition
pharo-project · Jul 31, 2024 · 29bb15d · 29bb15d
2 parents 8730faa + 9d05ffc
commit 29bb15d
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 5 deletions.
diff --git a/src/Refactoring-Core-Tests/RBClassTest.class.st b/src/Refactoring-Core-Tests/RBClassTest.class.st
@@ -177,6 +177,49 @@ RBClassTest >> testIsInstanceSide [
 
 ]
 
+{ #category : 'tests - navigation' }
+RBClassTest >> testIsManifest [
+
+	| pmNamespace packageManifestClass |
+
+	pmNamespace := RBNamespace new.
+	pmNamespace defineClass: [ :aBuilder |
+		aBuilder
+			name: #PackageManifestForRBClassTest;
+			superclass: PackageManifest ;
+			package: #'Refactory-Testing' ].
+	packageManifestClass := pmNamespace classNamed: #PackageManifestForRBClassTest.
+
+	self assert: packageManifestClass isManifest.
+]
+
+{ #category : 'tests - navigation' }
+RBClassTest >> testIsManifestTransformationClass [
+
+	self 
+		deny: abstractTransformationClass classSide isManifest
+		description: 'It tests that a transformation class is not manifest'.
+	self 
+		deny: abstractTransformationClass isManifest
+		description: 'It tests that a transformation is not manifest'.		
+]
+
+{ #category : 'tests - navigation' }
+RBClassTest >> testIsManifestWhenSuperclassIsUndefined [
+
+	| pmNamespace packageManifestClass |
+
+	pmNamespace := RBNamespace new.
+	pmNamespace defineClass: [ :aBuilder |
+		aBuilder
+			name: #PackageManifestForRBClassTest;
+			superclass: nil ;
+			package: #'Refactory-Testing' ].
+	packageManifestClass := pmNamespace classNamed: #PackageManifestForRBClassTest.
+
+	self deny: packageManifestClass isManifest.
+]
+
 { #category : 'tests - navigation' }
 RBClassTest >> testIsMeta [
 

diff --git a/src/Refactoring-Core/RBClass.class.st b/src/Refactoring-Core/RBClass.class.st
@@ -160,6 +160,13 @@ RBClass >> isEmptyClass [
 					  self selectors isEmpty]]
 ]
 
+{ #category : 'testing' }
+RBClass >> isManifest [ 
+
+	^ self superclass notNil and: [ self superclass name = #PackageManifest ]
+
+]
+
 { #category : 'testing' }
 RBClass >> isMeta [
 

diff --git a/src/Refactoring-Core/RBMetaclass.class.st b/src/Refactoring-Core/RBMetaclass.class.st
@@ -62,6 +62,12 @@ RBMetaclass >> directlyDefinesPoolDictionary: aString [
 	^ self instanceSide directlyDefinesPoolDictionary: aString
 ]
 
+{ #category : 'testing' }
+RBMetaclass >> isManifest [
+
+	^ self instanceSide isManifest
+]
+
 { #category : 'testing' }
 RBMetaclass >> isMeta [
 	^true

diff --git a/src/Refactoring-Core/ReClassesHaveNoReferencesCondition.class.st b/src/Refactoring-Core/ReClassesHaveNoReferencesCondition.class.st
@@ -44,11 +44,10 @@ ReClassesHaveNoReferencesCondition >> violators [
 		  classes do: [ :aClass |
 			  | methodsReferencingClass |
 			  methodsReferencingClass := (model methodsReferencingClass: aClass) reject: [ :each |
-						    classes includes: each methodClass ].
+				(classes includes: each methodClass) or: [ each methodClass isManifest ] ].
 			  methodsReferencingClass ifNotEmpty: [ 
 				  referencingClassesDictionary
 					  at: aClass
 					  put: methodsReferencingClass ] ].
-			referencingClassesDictionary 
-		]
+			referencingClassesDictionary ]
 ]
diff --git a/src/Refactoring-Transformations-Tests/RBRemoveProtocolTransformationTest.class.st b/src/Refactoring-Transformations-Tests/RBRemoveProtocolTransformationTest.class.st
@@ -31,13 +31,13 @@ RBRemoveProtocolTransformationTest >> testTransform [
 	transformation := (RBAddProtocolTransformation
 		                   protocol: 'transforming'
 		                   inClass: #RBDummyEmptyClass).
-	transformation generateChanges.
+	transformation execute.
 
 	transformation := (RBRemoveProtocolTransformation
 		                   model: transformation model
 		                   protocol: 'transforming'
 		                   inClass: #RBDummyEmptyClass).
-	transformation generateChanges.
+	transformation execute.
 
 	self assert: transformation model changes changes size equals: 2
 ]