cleaning ClassBlueprint

Author: LeoDefossez

Moose-Blueprint-Models/FamixJavaMethod.extension.st

@@ -125,6 +125,11 @@ FamixJavaMethod >> isSubPublic [
 	^ reimplementations anySatisfy: [ :m | m isPublic ]
 ]
 
+{ #category : '*Moose-Blueprint-Models' }
+FamixJavaMethod >> isTestMethod [
+	 ^ self belongsToTestCase and: [ self nameBeginsWithTest or: [ self isJUnit4Test ] ]
+]
+
 { #category : '*Moose-Blueprint-Models' }
 FamixJavaMethod >> lazyInitializerRegex [
 

Moose-Blueprint-Models/FamixStMethod.extension.st

@@ -102,3 +102,8 @@ FamixStMethod >> isSubCalledInternallyOnly [
 
 	^ redefinitions allSatisfy: [ :m | m isCalledInHierarchyOnly ]
 ]
+
+{ #category : '*Moose-Blueprint-Models' }
+FamixStMethod >> isTestMethod [
+	 ^ self belongsToTestCase and: [ self nameBeginsWithTest ] 
+]

Moose-Blueprint-Models/FamixTClass.extension.st

@@ -0,0 +1,7 @@
+Extension { #name : 'FamixTClass' }
+
+{ #category : '*Moose-Blueprint-Models' }
+FamixTClass >> hierarchyOfClasses [
+
+	^ self withSuperclassHierarchy , self subclassHierarchy
+]

Moose-Blueprint-Models/FamixTMethod.extension.st

@@ -8,6 +8,12 @@ FamixTMethod >> belongsToDeadBranch [
 		  ofClass: self parentType
 ]
 
+{ #category : '*Moose-Blueprint-Models' }
+FamixTMethod >> belongsToTestCase [
+
+	^ self parentType isTestCase
+]
+
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> calledBy [
 
@@ -19,8 +25,7 @@ FamixTMethod >> calledBy [
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> hierarchyOfClasses [
 
-	^ self parentType withSuperclassHierarchy
-	  , self parentType subclassHierarchy
+	^ self parentType hierarchyOfClasses 
 ]
 
 { #category : '*Moose-Blueprint-Models' }
@@ -163,15 +168,20 @@ FamixTMethod >> isTestInternalImplementation [
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> isTestMethod [
 
-	^ self parentType isTestCase and: [
-		  (self name beginsWith: #test) and: [ self name fifth isUppercase ] ]
+	^ self subclassResponsibility 
 ]
 
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> isTested [
 
 	^ (self incomingInvocations collect: #sender) anySatisfy: [ :each |
-		  each parentType isTestCase ]
+		  each isTestCase ]
+]
+
+{ #category : '*Moose-Blueprint-Models' }
+FamixTMethod >> nameBeginsWithTest [ 
+
+	^ self name beginsWith: 'test'
 ]
 
 { #category : '*Moose-Blueprint-Models' }