Co usage settings

src/MooseIDE-CoUsageMap-Tests/MiCoHighlightManagerTest.class.st

@@ -9,8 +9,8 @@ Class {
 { #category : 'tests' }
 MiCoHighlightManagerTest >> testDeselectGoesToModel [
 	| mooseEntity attribute1 shape1 |
-	mooseEntity := self specModel currentMooseModel entityNamed: #var1.
-	attribute1 := self specModel getInnerBoxNamed: #var1.
+	mooseEntity := self specModel currentMooseModel entityNamed: #att1.
+	attribute1 := self specModel getInnerBoxNamed: #att1.
 	shape1 := builder canvas deepShapeFromModel: attribute1.
 
 	self specModel selectedEntity: mooseEntity.
@@ -27,7 +27,7 @@ MiCoHighlightManagerTest >> testDeselectInnerBox [
 	| attribute1 shape1 default selected |
 	self tagsWithPalette: { 'Frame'. 'Connection' }.
 
-	attribute1 := self specModel getInnerBoxNamed: #var1.
+	attribute1 := self specModel getInnerBoxNamed: #att1.
 	shape1 := builder canvas deepShapeFromModel: attribute1.
 
 	default := builder highlightManager defaultBoxBorder color.
@@ -46,7 +46,7 @@ MiCoHighlightManagerTest >> testHighlight [
 	| attribute1 shape1 default selected |
 	self tagsWithPalette: { 'Frame'. 'Connection' }.
 
-	attribute1 := self specModel getInnerBoxNamed: #var1.
+	attribute1 := self specModel getInnerBoxNamed: #att1.
 	shape1 := builder canvas deepShapeFromModel: attribute1.
 
 	default := builder highlightManager defaultBoxBorder color.
@@ -64,36 +64,36 @@ MiCoHighlightManagerTest >> testHighlight [
 
 { #category : 'tests' }
 MiCoHighlightManagerTest >> testNoHighlightWhenSelectedInnerBox [
-	| attribute1 shape1 default selected attribute2 shape2 |
+	| attribute3 shape3 default selected attribute4 shape4 |
 	self tagsWithPalette: { 'Frame'. 'Connection' }.
 
-	attribute1 := self specModel getInnerBoxNamed: #var1.
-	attribute2 := self specModel getInnerBoxNamed: #var2.
-	shape1 := builder canvas deepShapeFromModel: attribute1.
-	shape2 := builder canvas deepShapeFromModel: attribute2.
+	attribute3 := self specModel getInnerBoxNamed: #att3.
+	attribute4 := self specModel getInnerBoxNamed: #att4.
+	shape3 := builder canvas deepShapeFromModel: attribute3.
+	shape4 := builder canvas deepShapeFromModel: attribute4.
 
 	default := builder highlightManager defaultBoxBorder color.
 	selected := builder highlightManager selectedBoxBorder color.
 
-	self assert: shape2 border color equals: default.
+	self assert: shape4 border color equals: default.
 
-	shape1 announce: (RSMouseLeftClick new shape: shape1).
-	shape2 announce: (RSMouseEnter new shape: shape2).
+	shape3 announce: (RSMouseLeftClick new shape: shape3).
+	shape4 announce: (RSMouseEnter new shape: shape4).
 
-	self assert: shape2 border color equals: default.
+	self assert: shape4 border color equals: default.
 
 ]
 
 { #category : 'tests' }
 MiCoHighlightManagerTest >> testSelectGoesToModel [
 	| attribute1 shape1 |
-	attribute1 := self specModel getInnerBoxNamed: #var1.
+	attribute1 := self specModel getInnerBoxNamed: #att1.
 	shape1 := builder canvas deepShapeFromModel: attribute1.
 
 	shape1 announce: (RSMouseLeftClick new shape: shape1).
 	self
 		assert: self specModel selectedEntity
-		equals: (self specModel currentMooseModel entityNamed: #var1)
+		equals: (self specModel currentMooseModel entityNamed: #att1)
 
 ]
 
@@ -102,7 +102,7 @@ MiCoHighlightManagerTest >> testSelectInnerBox [
 	| attribute1 shape1 default selected |
 	self tagsWithPalette: { 'Frame'. 'Connection' }.
 
-	attribute1 := self specModel getInnerBoxNamed: #var1.
+	attribute1 := self specModel getInnerBoxNamed: #att1.
 	shape1 := builder canvas deepShapeFromModel: attribute1.
 
 	default := builder highlightManager defaultBoxBorder color.

src/MooseIDE-CoUsageMap-Tests/MiCoAttributeTest.class.st → src/MooseIDE-CoUsageMap-Tests/MiCoInnerBoxTest.class.st

@@ -1,39 +1,39 @@
 Class {
-	#name : 'MiCoAttributeTest',
+	#name : 'MiCoInnerBoxTest',
 	#superclass : 'TestCase',
-	#category : 'MooseIDE-CoUsageMap-Tests-Browser',
+	#category : 'MooseIDE-CoUsageMap-Tests-Model',
 	#package : 'MooseIDE-CoUsageMap-Tests',
-	#tag : 'Browser'
+	#tag : 'Model'
 }
 
 { #category : 'tests' }
-MiCoAttributeTest >> containerBoxOn: aName [
+MiCoInnerBoxTest >> containerBoxOn: aName [
 	^MiCoContainerBox new mooseEntity: (FamixStMethod new name: aName)
 ]
 
 { #category : 'tests' }
-MiCoAttributeTest >> innerBoxOn: aName [
+MiCoInnerBoxTest >> innerBoxOn: aName [
 	^MiCoInnerBox new mooseEntity: (FamixStAttribute new name: aName)
 ]
 
 { #category : 'tests' }
-MiCoAttributeTest >> test01ContainerBox [
+MiCoInnerBoxTest >> test01ContainerBox [
 
 	| container |
 	container := self containerBoxOn: 'method1'.
 	self assert: container asString equals: 'method1'
 ]
 
 { #category : 'tests' }
-MiCoAttributeTest >> test02InnerBox [
+MiCoInnerBoxTest >> test02InnerBox [
 
 	| innerBox |
 	innerBox := self innerBoxOn: 'aVar'.
 	self assert: innerBox asString equals: 'aVar'
 ]
 
 { #category : 'tests' }
-MiCoAttributeTest >> test03PopupMessage [
+MiCoInnerBoxTest >> test03PopupMessage [
 
 	| innerBox containerBox |
 	containerBox := self containerBoxOn: 'method1'.

src/MooseIDE-CoUsageMap-Tests/MiCoInnerEntitiesAttributeAccessExtractorTest.class.st

@@ -0,0 +1,73 @@
+Class {
+	#name : 'MiCoInnerEntitiesAttributeAccessExtractorTest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'mooseModel',
+		'extractor'
+	],
+	#category : 'MooseIDE-CoUsageMap-Tests-Model',
+	#package : 'MooseIDE-CoUsageMap-Tests',
+	#tag : 'Model'
+}
+
+{ #category : 'running' }
+MiCoInnerEntitiesAttributeAccessExtractorTest >> setUp [
+	super setUp.
+
+	mooseModel := MiCoUsageTestFamixModel new.
+	extractor := MiCoInnerEntitiesAttributeAccessExtractor new
+]
+
+{ #category : 'tests' }
+MiCoInnerEntitiesAttributeAccessExtractorTest >> testAttributeAccessorInvocationsNone [
+
+	self assert: (extractor attributeAccessorInvocations: mooseModel method5) size equals: 0
+]
+
+{ #category : 'tests' }
+MiCoInnerEntitiesAttributeAccessExtractorTest >> testAttributeAccessorInvocationsOne [
+
+	self assert: (extractor attributeAccessorInvocations: mooseModel method2) size equals: 1.
+
+	self
+		assertCollection: (extractor attributeAccessorInvocations: mooseModel method2)
+		hasSameElements: { mooseModel att6 }.
+]
+
+{ #category : 'tests' }
+MiCoInnerEntitiesAttributeAccessExtractorTest >> testDirectAttributeAccessesMultipleAccesses [
+
+	self assert: (extractor directAttributeAccesses: mooseModel method1) size equals: 3.
+
+	self
+		assertCollection: (extractor directAttributeAccesses: mooseModel method1)
+		hasSameElements: { mooseModel att1 . mooseModel att1 . mooseModel att1 }.
+]
+
+{ #category : 'tests' }
+MiCoInnerEntitiesAttributeAccessExtractorTest >> testDirectAttributeAccessesMultipleAttributes [
+
+	self assert: (extractor directAttributeAccesses: mooseModel method3) size equals: 3.
+
+	self
+		assertCollection: (extractor directAttributeAccesses: mooseModel method3)
+		hasSameElements: { mooseModel att3 . mooseModel att4 . mooseModel att5 }.
+]
+
+{ #category : 'tests' }
+MiCoInnerEntitiesAttributeAccessExtractorTest >> testDirectAttributeAccessesNone [
+
+	self assert: (extractor directAttributeAccesses: mooseModel method2) size equals: 0
+]
+
+{ #category : 'tests' }
+MiCoInnerEntitiesAttributeAccessExtractorTest >> testInnerEntitiesFor [
+
+	self
+		assertCollection: (extractor innerEntitiesFor: mooseModel method2)
+		hasSameElements: { mooseModel att6 }.
+
+	self
+		assertCollection: (extractor innerEntitiesFor: mooseModel method3)
+		hasSameElements: { mooseModel att3 . mooseModel att4 . mooseModel att5 }.
+]

src/MooseIDE-CoUsageMap-Tests/MiCoMenuManagerTest.class.st

@@ -10,8 +10,8 @@ Class {
 MiCoMenuManagerTest >> testOpenMenu [
 
 	| attribute method |
-	attribute := self specModel getInnerBoxNamed: #var2.
-	method := self specModel containerBoxNamed: #method1.
+	attribute := self specModel getInnerBoxNamed: #att3.
+	method := self specModel containerBoxNamed: #method3.
 	builder menuManager createMenu: MenuMorph new onBox: attribute.
 	builder menuManager createMenu: MenuMorph new onBox: method.
 	builder menuManager

src/MooseIDE-CoUsageMap-Tests/MiCoUsageAbstractTest.class.st

@@ -1,18 +1,28 @@
 Class {
 	#name : 'MiCoUsageAbstractTest',
-	#superclass : 'TestCase',
+	#superclass : 'MiAbstractApplicationTest',
 	#instVars : [
 		'visualization',
 		'builder',
-		'browser',
-		'application',
-		'previousApplication'
+		'mooseModel',
+		'browser'
 	],
 	#category : 'MooseIDE-CoUsageMap-Tests-Browser',
 	#package : 'MooseIDE-CoUsageMap-Tests',
 	#tag : 'Browser'
 }
 
+{ #category : 'testing' }
+MiCoUsageAbstractTest class >> isAbstract [
+	^self name includesSubstring: 'Abstract'
+]
+
+{ #category : 'running' }
+MiCoUsageAbstractTest >> browserClass [
+
+	^MiCoUsageMapBrowser
+]
+
 { #category : 'running' }
 MiCoUsageAbstractTest >> createTag: aName [
 
@@ -25,21 +35,13 @@ MiCoUsageAbstractTest >> createTag: aName [
 MiCoUsageAbstractTest >> setUp [
 
 	super setUp.
-	previousApplication := MiApplication current.
-
-	application := MiTestApplication new.
-	MiApplication current: application.
 
-	browser := MiCoUsageMapBrowser
-		           newApplication: application
-		           model: MiCoUsageMapModel new.
+	mooseModel := MiCoUsageTestFamixModel new.
 
-	browser specModel followEntity:
-		MiCoUsageTestFamixModel new allMethods.
+	browser := self browserClass openForTests: application.
+	browser followEntity: mooseModel allMethods.
 
 	visualization := browser mapVisualization.
-	visualization buildInCanvas: visualization canvas.
-
 	builder := visualization mapBuilder
 ]
 
@@ -59,7 +61,7 @@ MiCoUsageAbstractTest >> tagsWithPalette: aCollection [
 { #category : 'running' }
 MiCoUsageAbstractTest >> tearDown [
 
-	MiApplication reset.
-	MiApplication current: previousApplication.
+	browser ifNotNil: [ browser withWindowDo: [ :window | window close ] ].
+
 	super tearDown
 ]