Merge pull request #32 from moosetechnology/31-Remove-isCBTestCase

deprecate isCBTestCase. fix #31

Author: LeoDefossez

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

@@ -116,7 +116,7 @@ CBClassBlueprintForJavaModelTest >> testIsCBTestCase [
 	famixClass2 addMethod: famixMethod.
 	famixMethod annotationInstances add: testAnnotationInstance.
 	"JUnit3"
-	self assert: famixClass isCBTestCase.
+	self assert: famixClass isTestCase.
 	"JUnit4 and fllowing"
-	self assert: famixClass2 isCBTestCase.
+	self assert: famixClass2 isTestCase
 ]

Moose-Blueprint-Models/CBMethodModel.class.st

@@ -345,7 +345,7 @@ CBMethodModel >> shape [
 	" si la méthode est appelée dans une classe de test et que la méthode n'est pas appelée dans sa classe de test => testShape"
 
 	shape := (self isTested and: [
-		          self entity parentType isCBTestCase not ])
+		          self entity parentType isTestCase not ])
 		         ifTrue: [ self testedShape ]
 		         ifFalse: [ self defaultShape ].
 	"shape when: RSMouseClick do: [ self inspect ]."

Moose-Blueprint-Models/FamixJavaAttribute.extension.st

@@ -2,7 +2,7 @@ Extension { #name : 'FamixJavaAttribute' }
 
 { #category : '*Moose-Blueprint-Models' }
 FamixJavaAttribute >> cbAccessors [
-	self deprecated: 'please use acessorMethods'  transformWith:  '`@receiver cbAccessors' -> '`@receiver acessorMethods '.
+	self deprecated: 'please use acessorMethods'  transformWith:  '`@receiver cbAccessors' -> '`@receiver accessorMethods '.
 	^ (self incomingAccesses collectAsSet: [ :each | each source ])
 		  select: [ :each |
 			  each isGetter or: [ each isSetter or: [ each isLazyInitializer ] ] ]

Moose-Blueprint-Models/FamixJavaClass.extension.st

@@ -2,7 +2,7 @@ Extension { #name : 'FamixJavaClass' }
 
 { #category : '*Moose-Blueprint-Models' }
 FamixJavaClass >> isCBTestCase [
-
+	self deprecated: 'please use isTestCase'  transformWith:  '`@receiver isCBTestCase' -> '`@receiver isTestCase '.
 	^ self isJUnit4TestCase or: [ self inheritsFromTestCase or: [self name = 'TestCase' ]  ]
 ]
 

Moose-Blueprint-Models/FamixStAttribute.extension.st

@@ -2,7 +2,7 @@ Extension { #name : 'FamixStAttribute' }
 
 { #category : '*Moose-Blueprint-Models' }
 FamixStAttribute >> cbAccessors [
-	self deprecated: 'please use acessorMethods'  transformWith:  '`@receiver cbAccessors' -> '`@receiver acessorMethods '.
+	self deprecated: 'please use accessorMethods'  transformWith:  '`@receiver cbAccessors' -> '`@receiver accessorMethods '.
 	^ (self incomingAccesses collectAsSet: [ :each | each source ])
 		  select: [ :each |
 			  each isGetter or: [ each isSetter or: [ each isLazyInitializer ] ] ]

Moose-Blueprint-Models/FamixStClass.extension.st

@@ -1,8 +1,16 @@
 Extension { #name : 'FamixStClass' }
 
 { #category : '*Moose-Blueprint-Models' }
-FamixStClass >> isCBTestCase [
+FamixStClass >> inheritsFromTestCase [
+
+	self withSuperclassesDo: [ :each |
+		each name = 'TestCase' ifTrue: [ ^ true ] ].
+	^ false
+]
 
+{ #category : '*Moose-Blueprint-Models' }
+FamixStClass >> isCBTestCase [
+self deprecated: 'please use isTestCase'  transformWith:  '`@receiver isCBTestCase' -> '`@receiver isTestCase '.
 	self withSuperclassesDo: [ :each |
 		each name = 'TestCase' ifTrue: [ ^ true ] ].
 	^ false

Moose-Blueprint-Models/FamixTMethod.extension.st

@@ -62,7 +62,7 @@ FamixTMethod >> isCalledInHierarchyOnly [
 
 	invokingTypes := (self incomingInvocations collect: [ :each |
 		                  each source parentType ]) reject: [ :each |
-		                 each isCBTestCase ].
+		                 each isTestCase ].
 
 	invokingTypes ifEmpty: [ ^ false ].
 
@@ -73,10 +73,9 @@ FamixTMethod >> isCalledInHierarchyOnly [
 FamixTMethod >> isCalledInternallyOnly [
 
 	| incoInvocSources |
-
 	incoInvocSources := (self incomingInvocations collect: [ :each |
 		                     each source ]) reject: [ :each |
-		                    each parentType isCBTestCase ].
+		                    each parentType isTestCase ].
 
 	^ incoInvocSources isNotEmpty and: [
 		  incoInvocSources allSatisfy: [ :i |
@@ -129,12 +128,10 @@ FamixTMethod >> isTestCaseMethod [
 
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> isTestExternalImplementation [
-
 	"Here we do not care if it is called by other test methods"
 
 	| invocationSources |
-
-	self parentType isCBTestCase ifFalse: [ ^ false ].
+	self parentType isTestCase ifFalse: [ ^ false ].
 	invocationSources := self incomingInvocations collect: [ :each |
 		                     each source ].
 
@@ -151,12 +148,10 @@ FamixTMethod >> isTestInternal [
 
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> isTestInternalImplementation [
-
 	"theinconveince is that it might be called by another internal test implementation of another test class"
 
 	| invocationSources |
-
-	self parentType isCBTestCase ifFalse: [ ^ false ].
+	self parentType isTestCase ifFalse: [ ^ false ].
 	invocationSources := self incomingInvocations collect: [ :each |
 		                     each source ].
 
@@ -168,15 +163,15 @@ FamixTMethod >> isTestInternalImplementation [
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> isTestMethod [
 
-	^ self parentType isCBTestCase and: [
+	^ self parentType isTestCase and: [
 		  (self name beginsWith: #test) and: [ self name fifth isUppercase ] ]
 ]
 
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> isTested [
 
 	^ (self incomingInvocations collect: #sender) anySatisfy: [ :each |
-		  each parentType isCBTestCase ]
+		  each parentType isTestCase ]
 ]
 
 { #category : '*Moose-Blueprint-Models' }