Refactoring of code into OpenSmock

OpenSmock · Nov 28, 2023 · 129e8d6 · 129e8d6
1 parent 6e0e05a
commit 129e8d6
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 553 deletions.
diff --git a/GeoView-Tests/GeoGraphicModelTest.class.st b/GeoView-Tests/GeoGraphicModelTest.class.st
diff --git a/GeoView-Tests/GeoProjectionModelTest.class.st b/GeoView-Tests/GeoProjectionModelTest.class.st
@@ -7,6 +7,6 @@ Class {
 { #category : #tests }
 GeoProjectionModelTest >> testInitialize [
 	| model |
-	model := GeoViewProjectionModel new.
+	model := GeoViewCUDModel new.
 	self assert: model projection isNil.
 ]
diff --git a/GeoView-Tests/GeoViewManagerImplTests.class.st b/GeoView-Tests/GeoViewManagerImplTests.class.st
@@ -46,7 +46,7 @@ GeoViewManagerImplTests >> testCreateAndAddGeoObjectLayer [
 
 	[layer := geoViewManager createAndAddGeoObjectLayer: nil] 
 		on: Error do: [ :e | error := e ].
-	self assert: error class equals: GeoViewNoIdError.
+	self assert: error class equals: SmockNoIdError.
 
 	layer := geoViewManager createAndAddGeoObjectLayer: #layerA.
 	self assert: layer isNil.

diff --git a/GeoView-Tests/GeoViewProcessDataTest.class.st b/GeoView-Tests/GeoViewProcessDataTest.class.st
@@ -11,7 +11,7 @@ Class {
 GeoViewProcessDataTest >> testInitialize [
 
 	| processData |
-	processData := GeoViewTestProcessData new.
+	processData := SmockTestProcessData new.
 
 	self assert: processData processor isNil.
 	self assert: processData properties isEmpty.
@@ -21,7 +21,7 @@ GeoViewProcessDataTest >> testInitialize [
 GeoViewProcessDataTest >> testProperty [
 
 	| processData |
-	processData := GeoViewTestProcessData new.
+	processData := SmockTestProcessData new.
 
 	processData setProperty: #toto value: #tata. 
 	self assert: processData properties size equals: 1.

diff --git a/GeoView-Tests/GeoViewTestData.class.st b/GeoView-Tests/GeoViewTestData.class.st
diff --git a/GeoView-Tests/GeoViewTestProcessData.class.st b/GeoView-Tests/GeoViewTestProcessData.class.st
diff --git a/GeoView/GeoViewProjectionModel.class.st → GeoView/GeoViewCUDModel.class.st b/GeoView/GeoViewProjectionModel.class.st → GeoView/GeoViewCUDModel.class.st
@@ -2,20 +2,22 @@
 I am a Graphic Projection Model
 "
 Class {
-	#name : #GeoViewProjectionModel,
-	#superclass : #GeoViewModel,
+	#name : #GeoViewCUDModel,
+	#superclass : #SmockCUDModel,
 	#instVars : [
 		'projection'
 	],
 	#category : #'GeoView-Model'
 }
 
 { #category : #accessing }
-GeoViewProjectionModel >> projection [
+GeoViewCUDModel >> projection [
+
 	^ projection
 ]
 
 { #category : #accessing }
-GeoViewProjectionModel >> projection: aMapProjection [ 
+GeoViewCUDModel >> projection: aMapProjection [
+
 	projection := aMapProjection
 ]
diff --git a/GeoView/GeoViewDuplicateIdError.class.st b/GeoView/GeoViewDuplicateIdError.class.st
diff --git a/GeoView/GeoViewError.class.st b/GeoView/GeoViewError.class.st
@@ -1,5 +1,5 @@
 Class {
 	#name : #GeoViewError,
-	#superclass : #Error,
+	#superclass : #SmockError,
 	#category : #'GeoView-Exceptions'
 }
diff --git a/GeoView/GeoViewManagerImpl.class.st b/GeoView/GeoViewManagerImpl.class.st
@@ -132,10 +132,10 @@ GeoViewManagerImpl >> createAndAddGeoObjectLayer: aKey [
 	"add a layer to the geoplot"
 
 	| existingLayer layer |
-	aKey ifNil:[ GeoViewNoIdError signal: 'Cannot add layer with nil key.'. ^ nil ].
+	aKey ifNil:[ SmockNoIdError signal: 'Cannot add layer with nil key.'. ^ nil ].
 
 	existingLayer := self getLayer: aKey.
-	existingLayer ifNotNil:[ GeoViewDuplicateIdError signal: 'Cannot add layer with already existing key.'. ^ nil ].
+	existingLayer ifNotNil:[ SmockDuplicateIdError signal: 'Cannot add layer with already existing key.'. ^ nil ].
 
 	layer := self createGeoObjectLayer: aKey.
 	^self addLayer: layer