Merge pull request orbisgis#4 from SPalominos/j3r3m1-lczTest0

Fix trainingDatabdtopov2.geojson file.
ebocher · May 13, 2020 · 1dad9d6 · 1dad9d6
2 parents 96d0229 + 7f8dbb9
commit 1dad9d6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.../groovy/org/orbisgis/orbisprocess/geoclimate/geoindicators/BuildingIndicatorsTests.groovy b/.../groovy/org/orbisgis/orbisprocess/geoclimate/geoindicators/BuildingIndicatorsTests.groovy
@@ -14,7 +14,7 @@ class BuildingIndicatorsTests {
 
     @BeforeAll
     static void init(){
-        h2GIS = H2GIS.open('./target/buildingdb;AUTO_SERVER=TRUE')
+        h2GIS = H2GIS.open("./target/${BuildingIndicatorsTests.getName()};AUTO_SERVER=TRUE")
     }
 
     @BeforeEach

diff --git a/...t/groovy/org/orbisgis/orbisprocess/geoclimate/geoindicators/GenericIndicatorsTests.groovy b/...t/groovy/org/orbisgis/orbisprocess/geoclimate/geoindicators/GenericIndicatorsTests.groovy
@@ -14,7 +14,7 @@ class GenericIndicatorsTests {
 
     @BeforeAll
     static void init(){
-        h2GIS = H2GIS.open('./target/buildingdb;AUTO_SERVER=TRUE')
+        h2GIS = H2GIS.open("./target/${GenericIndicatorsTests.getName()};AUTO_SERVER=TRUE")
     }
 
     @BeforeEach

diff --git a/...ovy/org/orbisgis/orbisprocess/geoclimate/geoindicators/TypologyClassificationTests.groovy b/...ovy/org/orbisgis/orbisprocess/geoclimate/geoindicators/TypologyClassificationTests.groovy
@@ -15,14 +15,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertFalse
 import static org.junit.jupiter.api.Assertions.assertNotNull
 import static org.junit.jupiter.api.Assertions.assertTrue
+import static org.junit.jupiter.api.Assertions.fail
 
 class TypologyClassificationTests {
 
     private static H2GIS h2GIS
 
     @BeforeAll
     static void init(){
-        h2GIS = H2GIS.open( './target/buildingdb;AUTO_SERVER=TRUE')
+        h2GIS = H2GIS.open( "./target/${TypologyClassificationTests.getName()};AUTO_SERVER=TRUE")
     }
 
     @BeforeEach
@@ -252,7 +253,7 @@ class TypologyClassificationTests {
                          prefixName         : "test",
                          datasource         : h2GIS])){
             println "Cannot compute the LCZ classification."
-            return
+            fail()
         }
         def rsuLcz = classifyLCZ.results.outputTableName
 

diff --git a/...gis/orbisprocess/geoclimate/geoindicators/lczTests/trainingDatabdtopov2.geojson b/...gis/orbisprocess/geoclimate/geoindicators/lczTests/trainingDatabdtopov2.geojson