Merge pull request #26 from ThalesGroup/dev-issue25

Fix tests time issue #25 and tests setup refactoring

Author: LabordePierre

.smalltalkci.default.ston

@@ -7,8 +7,6 @@ SmalltalkCISpec {
     }
   ],
   #testing : {
-    #include : {
-      #packages : [ 'OWS*-Tests' ]
-    }
+    #packages : [ 'OWS-Tests' ]
   }
 }

src/OWS-Tests/OWSServiceWMSTest.class.st

@@ -6,14 +6,24 @@ Class {
 	#superclass : #TestCase,
 	#traits : 'TTestTools',
 	#classTraits : 'TTestTools classTrait',
+	#instVars : [
+		'wms'
+	],
 	#category : #'OWS-Tests'
 }
 
+{ #category : #running }
+OWSServiceWMSTest >> setUp [
+
+	super setUp.
+
+	wms := OWSServiceWMS new
+]
+
 { #category : #testsGetCapabilities }
 OWSServiceWMSTest >> testDocument [
 
-	| wms doc |
-	wms := OWSServiceWMS new.
+	| doc |
 	wms url: 'https://data.geopf.fr/wms-r'.
 	doc := wms capabilities.
 	self assert: doc root name equals: 'WMS_Capabilities'
@@ -22,8 +32,7 @@ OWSServiceWMSTest >> testDocument [
 { #category : #testsGetMap }
 OWSServiceWMSTest >> testInvalidLayer [
 
-	| wms map size |
-	wms := OWSServiceWMS new.
+	| map size |
 	size := 800 @ 600.
 	wms url: 'https://data.geopf.fr/wms-r'.
 
@@ -40,8 +49,7 @@ OWSServiceWMSTest >> testInvalidLayer [
 { #category : #testsGetCapabilities }
 OWSServiceWMSTest >> testLayers [
 
-	| wms layers ok |
-	wms := OWSServiceWMS new.
+	| layers ok |
 	wms url: 'https://data.geopf.fr/wms-r'.
 	layers := wms layers.
 	self assert: layers isNotEmpty.
@@ -58,8 +66,9 @@ OWSServiceWMSTest >> testLayers [
 { #category : #testsGetMap }
 OWSServiceWMSTest >> testOneLayer [
 
-	| wms map size |
-	wms := OWSServiceWMS new.
+	| map size |
+	self timeLimit: 10 seconds.
+	
 	wms url: 'https://data.geopf.fr/wms-r'.
 
 	size := 800 @ 600.
@@ -79,8 +88,7 @@ OWSServiceWMSTest >> testOneLayer [
 { #category : #testsGetCapabilities }
 OWSServiceWMSTest >> testOperations [
 
-	| wms requests ok x |
-	wms := OWSServiceWMS new.
+	| requests ok x |
 	wms url: 'https://data.geopf.fr/wms-r'.
 	requests := wms operations.
 	self assert: requests isNotEmpty.
@@ -106,8 +114,9 @@ OWSServiceWMSTest >> testOperations [
 { #category : #testsGetMap }
 OWSServiceWMSTest >> testSeveralLayers [
 
-	| wms map size |
-	wms := OWSServiceWMS new.
+	| map size |
+	self timeLimit: 10 seconds.
+	
 	size := 800 @ 600.
 	wms url: 'https://data.geopf.fr/wms-r'.
 	map := wms
@@ -126,8 +135,7 @@ OWSServiceWMSTest >> testSeveralLayers [
 { #category : #testsGetCapabilities }
 OWSServiceWMSTest >> testVersion [
 
-	| wms version |
-	wms := OWSServiceWMS new.
+	| version |
 	wms url: 'https://data.geopf.fr/wms-r'.
 
 	version := wms version.

src/OWS-Tests/OWSServiceWMTSTest.class.st

@@ -3,14 +3,23 @@ Class {
 	#superclass : #TestCase,
 	#traits : 'TTestTools',
 	#classTraits : 'TTestTools classTrait',
+	#instVars : [
+		'wmts'
+	],
 	#category : #'OWS-Tests'
 }
 
+{ #category : #running }
+OWSServiceWMTSTest >> setUp [
+	super setUp.
+
+	wmts := OWSServiceWMTS new
+]
+
 { #category : #testsGetTile }
 OWSServiceWMTSTest >> testGetTile [
 
-	| wmts tile |
-	wmts := OWSServiceWMTS new.
+	| tile |
 	wmts url: 'https://data.geopf.fr/wmts'.
 
 	tile := wmts
@@ -32,8 +41,7 @@ OWSServiceWMTSTest >> testGetTile [
 { #category : #testsGetCapabilities }
 OWSServiceWMTSTest >> testOperations [
 
-	| wmts requests gettile |
-	wmts := OWSServiceWMTS new.
+	| requests gettile |
 	wmts url: 'https://data.geopf.fr/wmts'.
 	requests := wmts operations.
 	self assert: requests size equals: 3.
@@ -45,8 +53,7 @@ OWSServiceWMTSTest >> testOperations [
 { #category : #testsGetCapabilities }
 OWSServiceWMTSTest >> testVersion [
 
-	| wmts version |
-	wmts := OWSServiceWMTS new.
+	| version |
 	wmts url: 'https://data.geopf.fr/wmts'.
 
 	version := wmts version.

src/OWS-Tests/OWSTMSTest.class.st

@@ -1,14 +1,24 @@
 Class {
 	#name : #OWSTMSTest,
 	#superclass : #TestCase,
+	#instVars : [
+		'tms'
+	],
 	#category : #'OWS-Tests'
 }
 
+{ #category : #running }
+OWSTMSTest >> setUp [
+
+	super setUp.
+
+	tms := OWSTMS new
+]
+
 { #category : #tests }
 OWSTMSTest >> testTile [
 
-	| tms tile |
-	tms := OWSTMS new.
+	| tile |
 	tms url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png'.
 
 	tile := tms tile: 0 y: 0 z: 0.