Merge pull request #18 from moosetechnology/1282

correct FamixJavaClass>>isCBTestCase

Author: ISayarLu

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

@@ -95,3 +95,29 @@ CBClassBlueprintForJavaModelTest >> testDeadAccessor [
 		((classBlueprint accessors collect: #entity) detect: #isSetter)
 			isDeadMethod
 ]
+
+{ #category : 'tests' }
+CBClassBlueprintForJavaModelTest >> testIsCBTestCase [
+
+	| famixClass famixClass2 class1 testcase inh1 inh2 testAnnotation testAnnotationInstance famixMethod |
+	famixClass := FamixJavaClass new.
+	class1 := FamixJavaClass new.
+	testcase := FamixJavaClass named: 'TestCase'.
+	inh1 := FamixJavaInheritance new
+		        superclass: testcase;
+		        subclass: class1.
+	inh2 := FamixJavaInheritance new
+		        superclass: class1;
+		        subclass: famixClass.
+	famixClass2 := FamixJavaClass new.
+	testAnnotation := FamixJavaAnnotationType new name: 'Test'.
+	testAnnotationInstance := FamixJavaAnnotationInstance new
+		                          annotationType: testAnnotation.
+	famixMethod := FamixJavaMethod new name: 'someMethodAnnotated'.
+	famixClass2 addMethod: famixMethod.
+	famixMethod annotationInstances add: testAnnotationInstance.
+	"JUnit3"
+	self assert: famixClass isCBTestCase.
+	"JUnit4 and fllowing"
+	self assert: famixClass2 isCBTestCase.
+]

Moose-Blueprint-Models/CBAbstractModel.class.st

@@ -1,45 +1,46 @@
 Class {
-	#name : #CBAbstractModel,
-	#superclass : #Object,
+	#name : 'CBAbstractModel',
+	#superclass : 'Object',
 	#instVars : [
 		'entity',
 		'description'
 	],
-	#category : #'Moose-Blueprint-Models'
+	#category : 'Moose-Blueprint-Models',
+	#package : 'Moose-Blueprint-Models'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 CBAbstractModel class >> newFrom: anEntity [ 
 	self subclassResponsibility 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAbstractModel >> description [
 	^ description
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAbstractModel >> entity [ 
 	^ entity
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAbstractModel >> entity: anEntity [ 
 	entity := anEntity 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 CBAbstractModel >> initializeDescription [
 
 	self subclassResponsibility
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 CBAbstractModel >> isHighlightable [
 	^ false
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAbstractModel >> name [ 
 	^ entity name
 ]

Moose-Blueprint-Models/CBAccessorsModel.class.st

@@ -2,49 +2,50 @@
 I represent a model for getters and setters
 "
 Class {
-	#name : #CBAccessorsModel,
-	#superclass : #CBHighlightableModel,
+	#name : 'CBAccessorsModel',
+	#superclass : 'CBHighlightableModel',
 	#instVars : [
 		'accessorInvocations',
 		'attributeAccess',
 		'modelType',
 		'occurrences',
 		'attribute'
 	],
-	#category : #'Moose-Blueprint-Models'
+	#category : 'Moose-Blueprint-Models',
+	#package : 'Moose-Blueprint-Models'
 }
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 CBAccessorsModel class >> newFrom: aMethod [ 
 	^ self new
 		  entity: aMethod;
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> accessorInvocations [
 	^ accessorInvocations
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> addIncoming: anInvocation [ 
 	((accessorInvocations collect: #target) includes: anInvocation target) ifFalse: [  
 	accessorInvocations add: anInvocation ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> addOutgoing: anAttributeAccess [
 
 	((attributeAccess collect: #source) includes: anAttributeAccess source) ifFalse: [  
 	attributeAccess add: anAttributeAccess ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> attributeAccess [ 
 	^ attributeAccess
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> color [
 
 	"attribute isDead attribute protectors are dead "
@@ -54,26 +55,26 @@ CBAccessorsModel >> color [
 		  ifFalse: [ MiClassBlueprintPalette new colorAt: self type ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 CBAccessorsModel >> initialize [
 
 	super initialize.
 	accessorInvocations := OrderedCollection new.
 	attributeAccess := OrderedCollection new
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 CBAccessorsModel >> isCBGetter [ 
 	^ entity isCBGetter 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 CBAccessorsModel >> isDead [
 
-	^ self entity incomingInvocations isEmpty
+	^ self entity isDead
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 CBAccessorsModel >> isDeadAccessor [
 
 
@@ -82,59 +83,59 @@ CBAccessorsModel >> isDeadAccessor [
 	^ attribute isDead and: [ attribute accessors allSatisfy: #isDead ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 CBAccessorsModel >> isLazyInitializer [ 
 	^ self entity isLazyInitializer 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 CBAccessorsModel >> isSetter [
 
 	^ entity isCBSetter
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> modelType [
 	^ modelType
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> modelType: aSymbol [
 	modelType := aSymbol 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> newIncomingConnection [ 
 
 	^ CBAccessorInvocationModel new 
 		initializeDescription;
 		yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> occurrences [
 	^ occurrences
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> occurrences: aNumber [
 	occurrences := aNumber
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 CBAccessorsModel >> printOn: aStream [
 
 	aStream nextPutAll: '('.
 	self name asString printOn: aStream.
 	aStream nextPutAll: ')'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> protecting: anAttribte [ 
 	attribute := anAttribte 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> shape [
 
 	shape := RSBox new
@@ -148,7 +149,7 @@ CBAccessorsModel >> shape [
 	^ shape
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 CBAccessorsModel >> type [
 
 	(self entity isPureGetter or: [ self entity isSetter ]) ifTrue: [ ^#'isSetter or isGetter' ].