Merge d620e4c

OpenPonk · Nov 13, 2024 · 7ce6832 · 7ce6832
2 parents dcf05f0 + d620e4c
commit 7ce6832
Show file tree

Hide file tree

Showing 19 changed files with 149 additions and 35 deletions.
diff --git a/...penPonk-Core/OPAbstractShapeTest.class.st → ...ore/OPAbstractDiagramElementTest.class.st b/...penPonk-Core/OPAbstractShapeTest.class.st → ...ore/OPAbstractDiagramElementTest.class.st
@@ -1,40 +1,62 @@
 Class {
-	#name : 'OPAbstractShapeTest',
+	#name : 'OPAbstractDiagramElementTest',
 	#superclass : 'TestCase',
 	#instVars : [
 		'canvas',
-		'shape'
+		'shape',
+		'model'
 	],
 	#category : 'OpenPonk-Core-Tests',
 	#package : 'OpenPonk-Core',
 	#tag : 'Tests'
 }
 
 { #category : 'testing' }
-OPAbstractShapeTest class >> isAbstract [
+OPAbstractDiagramElementTest class >> isAbstract [
 	^ self name includesSubstring: 'Abstract'
 ]
 
 { #category : 'instance creation' }
-OPAbstractShapeTest >> newShapeInstance [
+OPAbstractDiagramElementTest >> modelClass [
+
+	^ self subclassResponsibility
+]
+
+{ #category : 'instance creation' }
+OPAbstractDiagramElementTest >> newModelInstance [
+
+	^ self modelClass new
+]
+
+{ #category : 'instance creation' }
+OPAbstractDiagramElementTest >> newShapeInstance [
 	^ self shapeClass new
 ]
 
 { #category : 'running' }
-OPAbstractShapeTest >> setUp [
+OPAbstractDiagramElementTest >> setUp [
 
 	super setUp.
 	shape := self newShapeInstance.
+	model := self newModelInstance.
+	shape modelElement: model.
 	canvas := RSCanvas new
 ]
 
 { #category : 'hooks' }
-OPAbstractShapeTest >> shapeClass [
+OPAbstractDiagramElementTest >> shapeClass [
 	^ self subclassResponsibility
 ]
 
+{ #category : 'running' }
+OPAbstractDiagramElementTest >> testEmpty [
+
+	self assert: shape modelElement equals: model.
+	self assertCollection: shape modelElements hasSameElements: { model }
+]
+
 { #category : 'tests' }
-OPAbstractShapeTest >> testRenderSimplifiedForController [
+OPAbstractDiagramElementTest >> testRenderSimplifiedForController [
 
 	| diagramController controller |
 	canvas := RSCanvas new.

diff --git a/repository/OpenPonk-Core/OPAbstractEdgeTest.class.st b/repository/OpenPonk-Core/OPAbstractEdgeTest.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : 'OPAbstractEdgeTest',
-	#superclass : 'OPAbstractShapeTest',
+	#superclass : 'OPAbstractDiagramElementTest',
 	#category : 'OpenPonk-Core-Tests',
 	#package : 'OpenPonk-Core',
 	#tag : 'Tests'

diff --git a/repository/OpenPonk-Core/OPAbstractLabelTest.class.st b/repository/OpenPonk-Core/OPAbstractLabelTest.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : 'OPAbstractLabelTest',
-	#superclass : 'OPAbstractShapeTest',
+	#superclass : 'OPAbstractNodeTest',
 	#category : 'OpenPonk-Core-Tests',
 	#package : 'OpenPonk-Core',
 	#tag : 'Tests'

diff --git a/repository/OpenPonk-Core/OPAbstractNodeTest.class.st b/repository/OpenPonk-Core/OPAbstractNodeTest.class.st
@@ -0,0 +1,51 @@
+Class {
+	#name : 'OPAbstractNodeTest',
+	#superclass : 'OPAbstractDiagramElementTest',
+	#category : 'OpenPonk-Core-Tests',
+	#package : 'OpenPonk-Core',
+	#tag : 'Tests'
+}
+
+{ #category : 'tests' }
+OPAbstractNodeTest >> testDoesNotMoveOnShapeCreation [
+
+	| diagram originalRoassalPosition movedRoassalPosition newShape |
+	diagram := OPDiagram new.
+	diagram renderIn: canvas.
+	shape owningElement: diagram.
+	shape modelElement: model.
+	shape renderIn: canvas.
+	shape isPositionableByUser ifFalse: [ ^ self ].
+	originalRoassalPosition := shape roassalShape position.
+	shape updateFromRender.
+	self assert: shape bounds position equals: originalRoassalPosition.
+	shape roassalShape translateBy: 100 @ 50.
+	movedRoassalPosition := shape roassalShape position.
+	self
+		assert: movedRoassalPosition
+		equals: originalRoassalPosition + (100 @ 50).
+	self assert: shape bounds position equals: originalRoassalPosition.
+	newShape := OPTestLabel in: diagram.
+	newShape renderIn: canvas.
+	self assert: shape bounds position equals: originalRoassalPosition.
+	self assert: shape roassalShape position equals: movedRoassalPosition
+]
+
+{ #category : 'tests' }
+OPAbstractNodeTest >> testUpdateFromRender [
+
+	| originalBounds movedBounds |
+	self assert: shape bounds equals: nil.
+	shape modelElement: model.
+	shape renderIn: canvas.
+	shape updateFromRender.
+	shape isPositionableByUser ifFalse: [ ^ self ].
+	originalBounds := shape bounds veryDeepCopy.
+	shape roassalShape translateBy: 100 @ 50.
+	self assert: shape bounds position equals: originalBounds position.
+	shape updateFromRender.
+	movedBounds := shape bounds veryDeepCopy.
+	self deny: movedBounds position equals: originalBounds position.
+	self assert: movedBounds position equals: originalBounds position + (100 @ 50).
+
+]
diff --git a/repository/OpenPonk-Core/OPBoundNode.class.st b/repository/OpenPonk-Core/OPBoundNode.class.st
@@ -103,7 +103,7 @@ OPBoundNode >> renderIn: aCanvas [
 { #category : 'as yet unclassified' }
 OPBoundNode >> updateFromRender [
 
-	self isResizableByUser | self isPositionableByUser ifTrue: [
+	(self isResizableByUser or: [ self isPositionableByUser ]) ifTrue: [
 		self bounds: (OPNodeBounds new
 				 position: roassalShape position
 				 extent: roassalShape extent) ].

diff --git a/repository/OpenPonk-Core/OPDiagram.class.st b/repository/OpenPonk-Core/OPDiagram.class.st
@@ -26,7 +26,8 @@ OPDiagram >> canvas: aCanvas [
 		self
 			assert: roassalShape canvas = aCanvas
 			description:
-			'Reusing same diagram element for 2 canvases not allowed' ].
+			'Reusing same diagram element for 2 canvases not allowed'.
+		^ self ].
 	roassalShape := aCanvas.
 	self updateRenderFromSelf
 ]

diff --git a/repository/OpenPonk-Core/OPDiagramInfo.class.st b/repository/OpenPonk-Core/OPDiagramInfo.class.st
@@ -12,9 +12,9 @@ Class {
 		'order',
 		'diagramName'
 	],
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'testing' }

diff --git a/repository/OpenPonk-Core/OPDiagramView.class.st b/repository/OpenPonk-Core/OPDiagramView.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : 'OPDiagramView',
 	#superclass : 'OPLegacyDiagram',
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
diff --git a/repository/OpenPonk-Core/OPDiagramViewCamera.class.st b/repository/OpenPonk-Core/OPDiagramViewCamera.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPDiagramViewCamera',
 	#superclass : 'OPLegacyDiagramCamera',
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'testing' }

diff --git a/repository/OpenPonk-Core/OPDiagramViewInfo.class.st b/repository/OpenPonk-Core/OPDiagramViewInfo.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : 'OPDiagramViewInfo',
 	#superclass : 'OPDiagramInfo',
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
diff --git a/repository/OpenPonk-Core/OPLabelTest.class.st b/repository/OpenPonk-Core/OPLabelTest.class.st
@@ -5,3 +5,9 @@ Class {
 	#package : 'OpenPonk-Core',
 	#tag : 'Tests'
 }
+
+{ #category : 'instance creation' }
+OPLabelTest >> modelClass [
+
+	^ Mock
+]
diff --git a/repository/OpenPonk-Core/OPLegacyDiagram.class.st b/repository/OpenPonk-Core/OPLegacyDiagram.class.st
@@ -16,9 +16,9 @@ Class {
 		'model',
 		'commonElements'
 	],
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'instance creation' }
@@ -231,6 +231,12 @@ OPLegacyDiagram >> commonElements: anObject [
 	commonElements := anObject
 ]
 
+{ #category : 'comparing' }
+OPLegacyDiagram >> hash [
+
+	^ self asJson hash
+]
+
 { #category : 'initialization' }
 OPLegacyDiagram >> initialize [
 	super initialize.

diff --git a/repository/OpenPonk-Core/OPLegacyDiagramCamera.class.st b/repository/OpenPonk-Core/OPLegacyDiagramCamera.class.st
@@ -8,9 +8,9 @@ Class {
 		'offset',
 		'zoom'
 	],
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'testing' }

diff --git a/repository/OpenPonk-Core/OPLegacyDiagramTest.class.st b/repository/OpenPonk-Core/OPLegacyDiagramTest.class.st
@@ -4,9 +4,9 @@ Class {
 	#instVars : [
 		'view'
 	],
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'tests' }

diff --git a/repository/OpenPonk-Core/OPLegacyElementLayout.class.st b/repository/OpenPonk-Core/OPLegacyElementLayout.class.st
@@ -11,9 +11,9 @@ Class {
 	#classInstVars : [
 		'none'
 	],
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'testing' }

diff --git a/repository/OpenPonk-Core/OPLegacyRelationshipPath.class.st b/repository/OpenPonk-Core/OPLegacyRelationshipPath.class.st
@@ -7,9 +7,9 @@ Class {
 		'source',
 		'points'
 	],
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'instance creation' }

diff --git a/repository/OpenPonk-Core/OPModelObjectReference.class.st b/repository/OpenPonk-Core/OPModelObjectReference.class.st
@@ -4,9 +4,9 @@ Class {
 	#instVars : [
 		'uuid'
 	],
-	#category : 'OpenPonk-Core-Diagrams',
+	#category : 'OpenPonk-Core-LegacySupport-Diagrams',
 	#package : 'OpenPonk-Core',
-	#tag : 'Diagrams'
+	#tag : 'LegacySupport-Diagrams'
 }
 
 { #category : 'as yet unclassified' }
@@ -21,6 +21,12 @@ OPModelObjectReference >> = otherModelObject [
 	^ self references: otherModelObject
 ]
 
+{ #category : 'comparing' }
+OPModelObjectReference >> hash [
+
+	^ self uuid hash
+]
+
 { #category : 'comparing' }
 OPModelObjectReference >> modelObjectFrom: aCollection [
 

diff --git a/repository/OpenPonk-Core/OPNodeBounds.class.st b/repository/OpenPonk-Core/OPNodeBounds.class.st
@@ -71,22 +71,20 @@ OPNodeBounds >> origin: aPoint [
 
 { #category : 'accessing' }
 OPNodeBounds >> position [
-
 	"center point"
 
-	^ self origin + (self extent / 2)
+	^ self origin + (self extent / 2) rounded
 ]
 
 { #category : 'accessing' }
 OPNodeBounds >> position: aPoint [
-
 	"center point"
 
 	self
 		assert: self extent isNotNil
 		description:
 		'Extent (width and height) must be set before setting position (origin x and y)'.
-	self origin: aPoint - (self extent / 2)
+	self origin: aPoint - (self extent / 2) rounded
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Core/OPNoteTest.class.st b/repository/OpenPonk-Core/OPNoteTest.class.st
@@ -0,0 +1,24 @@
+Class {
+	#name : 'OPNoteTest',
+	#superclass : 'OPAbstractNodeTest',
+	#category : 'OpenPonk-Core-Tests',
+	#package : 'OpenPonk-Core',
+	#tag : 'Tests'
+}
+
+{ #category : 'instance creation' }
+OPNoteTest >> newModelInstance [
+
+	^ nil
+]
+
+{ #category : 'hooks' }
+OPNoteTest >> shapeClass [
+	^ OPNote
+]
+
+{ #category : 'instance creation' }
+OPNoteTest >> testEmpty [
+
+	self skip
+]