Skip to content

Commit

Permalink
Fix return exception
Browse files Browse the repository at this point in the history
  • Loading branch information
ebocher committed Jun 6, 2024
1 parent 22201b4 commit 19ca07e
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 64 deletions.
2 changes: 1 addition & 1 deletion osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/TransformTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TransformTest extends AbstractOSMToolsTest {

assertThrows(Exception.class, () -> OSMTools.Transform.toPoints(ds, prefix, -1, tags, columnsToKeep))

assertThrows(Exception.class, () -> OSMTools.Transform.toPoints(ds, prefix, epsgCode, tags, columnsToKeep))
assertNotNull(OSMTools.Transform.toPoints(ds, prefix, epsgCode, tags, columnsToKeep))

assertThrows(Exception.class, () -> OSMTools.Transform.toPoints(ds, prefix, epsgCode, null, null))
}
Expand Down
102 changes: 39 additions & 63 deletions osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtilsTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,9 @@ class TransformUtilsTest extends AbstractOSMToolsTest {
@Test
void badBuildIndexesTest() {
def osmTable = "toto"
LOGGER.warn("An error will be thrown next")
assertFalse OSMTools.TransformUtils.buildIndexes(h2gis, null)
LOGGER.warn("An error will be thrown next")
assertFalse OSMTools.TransformUtils.buildIndexes(null, null)
LOGGER.warn("An error will be thrown next")
assertFalse OSMTools.TransformUtils.buildIndexes(null, osmTable)
assertThrows(Exception.class,()->OSMTools.TransformUtils.buildIndexes(h2gis, null))
assertThrows(Exception.class, ()->OSMTools.TransformUtils.buildIndexes(null, null))
assertThrows(Exception.class, ()->OSMTools.TransformUtils.buildIndexes(null, osmTable))
}

/**
Expand Down Expand Up @@ -297,55 +294,38 @@ ${osmTablesPrefix}_way_member, ${osmTablesPrefix}_way_not_taken_into_account, ${

OSMTools.TransformUtils.buildIndexes(h2gis, osmTablesPrefix)

assertNotNull h2gis.getTable("${osmTablesPrefix}_node")
assertNotNull h2gis.getTable("${osmTablesPrefix}_node")."id_node"
assertTrue h2gis.getTable("${osmTablesPrefix}_node")."id_node".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_way_node")
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_node")."id_node"
assertTrue h2gis.getTable("${osmTablesPrefix}_way_node")."id_node".indexed
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_node")."node_order"
assertTrue h2gis.getTable("${osmTablesPrefix}_way_node")."node_order".indexed
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_node")."id_way"
assertTrue h2gis.getTable("${osmTablesPrefix}_way_node")."id_way".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_way")
assertNotNull h2gis.getTable("${osmTablesPrefix}_way")."id_way"
assertTrue h2gis.getTable("${osmTablesPrefix}_way")."id_way".indexed
assertNotNull h2gis.getTable("${osmTablesPrefix}_way")."not_taken_into_account"
assertFalse h2gis.getTable("${osmTablesPrefix}_way")."not_taken_into_account".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_way_tag")
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_tag")."tag_key"
assertTrue h2gis.getTable("${osmTablesPrefix}_way_tag")."tag_key".indexed
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_tag")."id_way"
assertTrue h2gis.getTable("${osmTablesPrefix}_way_tag")."id_way".indexed
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_tag")."tag_value"
assertTrue h2gis.getTable("${osmTablesPrefix}_way_tag")."tag_value".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_relation_tag")
assertNotNull h2gis.getTable("${osmTablesPrefix}_relation_tag")."tag_key"
assertTrue h2gis.getTable("${osmTablesPrefix}_relation_tag")."tag_key".indexed
assertNotNull h2gis.getTable("${osmTablesPrefix}_relation_tag")."id_relation"
assertTrue h2gis.getTable("${osmTablesPrefix}_relation_tag")."id_relation".indexed
assertNotNull h2gis.getTable("${osmTablesPrefix}_relation_tag")."tag_value"
assertTrue h2gis.getTable("${osmTablesPrefix}_relation_tag")."tag_value".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_relation")
assertNotNull h2gis.getTable("${osmTablesPrefix}_relation")."id_relation"
assertTrue h2gis.getTable("${osmTablesPrefix}_relation")."id_relation".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_way_member")
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_member")."id_relation"
assertTrue h2gis.getTable("${osmTablesPrefix}_way_member")."id_relation".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_way_not_taken_into_account")
assertNotNull h2gis.getTable("${osmTablesPrefix}_way_not_taken_into_account")."id_way"
assertFalse h2gis.getTable("${osmTablesPrefix}_way_not_taken_into_account")."id_way".indexed

assertNotNull h2gis.getTable("${osmTablesPrefix}_relation_not_taken_into_account")
assertNotNull h2gis.getTable("${osmTablesPrefix}_relation_not_taken_into_account")."id_relation"
assertFalse h2gis.getTable("${osmTablesPrefix}_relation_not_taken_into_account")."id_relation".indexed
assertTrue h2gis.hasTable("${osmTablesPrefix}_node")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_node","id_node")

assertTrue h2gis.hasTable("${osmTablesPrefix}_way_node")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_way_node","id_node")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_way_node","node_order")

assertTrue h2gis.hasTable("${osmTablesPrefix}_way")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_way","id_way")
assertFalse h2gis.isIndexed("${osmTablesPrefix}_way","not_taken_into_account")

assertTrue h2gis.hasTable("${osmTablesPrefix}_way_tag")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_way_tag","tag_key")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_way_tag","id_way")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_way_tag","tag_value")

assertTrue h2gis.hasTable("${osmTablesPrefix}_relation_tag")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_relation_tag","tag_key")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_relation_tag","id_relation")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_relation_tag","tag_value")

assertTrue h2gis.hasTable("${osmTablesPrefix}_relation")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_relation","id_relation")

assertTrue h2gis.hasTable("${osmTablesPrefix}_way_member")
assertTrue h2gis.isIndexed("${osmTablesPrefix}_way_member","id_relation")

assertTrue h2gis.hasTable("${osmTablesPrefix}_way_not_taken_into_account")
assertFalse h2gis.isIndexed("${osmTablesPrefix}_way_not_taken_into_account","id_way")

assertTrue h2gis.hasTable("${osmTablesPrefix}_relation_not_taken_into_account")
assertFalse h2gis.isIndexed("${osmTablesPrefix}_relation_not_taken_into_account","id_relation")
}

/**
Expand Down Expand Up @@ -407,14 +387,10 @@ ${osmTablesPrefix}_way_member, ${osmTablesPrefix}_way_not_taken_into_account, ${

loadDataForNodeExtraction(h2gis, prefix)

LOGGER.warn("An error will be thrown next")
assertFalse OSMTools.TransformUtils.extractNodesAsPoints(null, prefix, epsgCode, outTable, tags, columnsToKeep)
LOGGER.warn("An error will be thrown next")
assertFalse OSMTools.TransformUtils.extractNodesAsPoints(h2gis, null, epsgCode, outTable, tags, columnsToKeep)
LOGGER.warn("An error will be thrown next")
assertFalse OSMTools.TransformUtils.extractNodesAsPoints(h2gis, prefix, -1, outTable, tags, columnsToKeep)
LOGGER.warn("An error will be thrown next")
assertFalse OSMTools.TransformUtils.extractNodesAsPoints(h2gis, prefix, epsgCode, null, tags, columnsToKeep)
assertThrows(Exception.class, ()->OSMTools.TransformUtils.extractNodesAsPoints(null, prefix, epsgCode, outTable, tags, columnsToKeep))
assertThrows(Exception.class, ()-> OSMTools.TransformUtils.extractNodesAsPoints(h2gis, null, epsgCode, outTable, tags, columnsToKeep))
assertThrows(Exception.class, ()->OSMTools.TransformUtils.extractNodesAsPoints(h2gis, prefix, -1, outTable, tags, columnsToKeep))
assertThrows(Exception.class, ()->OSMTools.TransformUtils.extractNodesAsPoints(h2gis, prefix, epsgCode, null, tags, columnsToKeep))

assertFalse OSMTools.TransformUtils.extractNodesAsPoints(h2gis, prefix, epsgCode, outTable, [house: "false", path: 'false'], null)
}
Expand Down

0 comments on commit 19ca07e

Please sign in to comment.