Merge branch 'master' into remove-unused-assert-option

uber · Dec 23, 2024 · cb7d7b7 · cb7d7b7
2 parents 6f51a8e + ae31177
commit cb7d7b7
Show file tree

Hide file tree

Showing 61 changed files with 880 additions and 414 deletions.
diff --git a/.cmake-format.yaml b/.cmake-format.yaml
@@ -0,0 +1,2 @@
+format:
+    tab_size: 4
diff --git a/.github/workflows/test-fuzzer.yml b/.github/workflows/test-fuzzer.yml
@@ -69,5 +69,5 @@ jobs:
           cd build
           for fuzzer in bin/fuzzer*; do
             echo $fuzzer
-            $fuzzer -runs=100000 -max_total_time=60 -timeout=120
+            $fuzzer -runs=100000 -max_total_time=60 -timeout=300
           done
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/CMakeTests.cmake b/CMakeTests.cmake
diff --git a/cmake/TestWrapValgrind.cmake b/cmake/TestWrapValgrind.cmake
@@ -1,36 +1,37 @@
 # Copyright 2018 Uber Technologies, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
 
 # Support code for wrapping tests or other executables with Valgrind.
 
 if(__test_wrap_valgrind)
-  return()
+    return()
 endif()
 set(__test_wrap_valgrind 1)
 
 include(CMakeDependentOption)
 
 find_program(VALGRIND valgrind)
-cmake_dependent_option(WRAP_VALGRIND "Wrap tests in valgrind" OFF
-                       "VALGRIND" OFF)
+cmake_dependent_option(WRAP_VALGRIND "Wrap tests in valgrind" OFF "VALGRIND"
+                       OFF)
 if(WRAP_VALGRIND)
-    # TEST_WRAPPER could be used to configure the Valgrind parameters, or
-    # to use a different wrapper entirely.
-    set(TEST_WRAPPER ${VALGRIND} --track-origins=yes --leak-check=full --error-exitcode=99 CACHE STRING
-        "Wrapper executable for tests and benchmarks")
+    # TEST_WRAPPER could be used to configure the Valgrind parameters, or to use
+    # a different wrapper entirely.
+    set(TEST_WRAPPER
+        ${VALGRIND} --track-origins=yes --leak-check=full --error-exitcode=99
+        CACHE STRING "Wrapper executable for tests and benchmarks")
     mark_as_advanced(TEST_WRAPPER)
-    # Convert from semicolon separated list of values to a form
-    # that can be used by a shell.
+    # Convert from semicolon separated list of values to a form that can be used
+    # by a shell.
     string(REPLACE ";" " " TEST_WRAPPER_STR "${TEST_WRAPPER}")
 endif()
diff --git a/tests/cli/areNeighborCells.txt b/tests/cli/areNeighborCells.txt
@@ -1,3 +1,9 @@
-add_h3_cli_test(testCliAreNeighborCells "areNeighborCells -o 85283473fffffff -d 85283477fffffff" "true")
-add_h3_cli_test(testCliAreNotNeighborCells "areNeighborCells -o 85283473fffffff -d 85283472fffffff" "false")
-add_h3_cli_test(testCliAreNeighborNotCells "areNeighborCells -o 85283473fffffff -d 852834727fffffff 2>&1" "Error 5: Cell argument was not valid")
+add_h3_cli_test(testCliAreNeighborCells
+                "areNeighborCells -o 85283473fffffff -d 85283477fffffff" "true")
+add_h3_cli_test(
+    testCliAreNotNeighborCells
+    "areNeighborCells -o 85283473fffffff -d 85283472fffffff" "false")
+add_h3_cli_test(
+    testCliAreNeighborNotCells
+    "areNeighborCells -o 85283473fffffff -d 852834727fffffff 2>&1"
+    "Error 5: Cell argument was not valid")
diff --git a/tests/cli/cellAreaKm2.txt b/tests/cli/cellAreaKm2.txt
@@ -1,2 +1,4 @@
-add_h3_cli_test(testCliCellAreaKm2 "cellAreaKm2 -c 85283473fffffff" "265.0925581283")
-add_h3_cli_test(testCliNotCellAreaKm2 "cellAreaKm2 -c 115283473fffffff 2>&1" "Error 5: Cell argument was not valid")
+add_h3_cli_test(testCliCellAreaKm2 "cellAreaKm2 -c 85283473fffffff"
+                "265.0925581283")
+add_h3_cli_test(testCliNotCellAreaKm2 "cellAreaKm2 -c 115283473fffffff 2>&1"
+                "Error 5: Cell argument was not valid")
diff --git a/tests/cli/cellAreaM2.txt b/tests/cli/cellAreaM2.txt
@@ -1,2 +1,5 @@
-add_h3_cli_test(testCliCellAreaM2 "cellAreaM2 -c 85283473fffffff | xargs printf '%.3f'" "265092558.128")
-add_h3_cli_test(testCliNotCellAreaM2 "cellAreaM2 -c 115283473fffffff 2>&1" "Error 5: Cell argument was not valid")
+add_h3_cli_test(
+    testCliCellAreaM2 "cellAreaM2 -c 85283473fffffff | xargs printf '%.3f'"
+    "265092558.128")
+add_h3_cli_test(testCliNotCellAreaM2 "cellAreaM2 -c 115283473fffffff 2>&1"
+                "Error 5: Cell argument was not valid")
diff --git a/tests/cli/cellAreaRads2.txt b/tests/cli/cellAreaRads2.txt
@@ -1,2 +1,5 @@
-add_h3_cli_test(testCliCellAreaRads2 "cellAreaRads2 -c 85283473fffffff" "0.0000065310")
-add_h3_cli_test(testCliNotCellAreaRads2 "cellAreaRads2 -c 115283473fffffff 2>&1" "Error 5: Cell argument was not valid")
+add_h3_cli_test(testCliCellAreaRads2 "cellAreaRads2 -c 85283473fffffff"
+                "0.0000065310")
+add_h3_cli_test(
+    testCliNotCellAreaRads2 "cellAreaRads2 -c 115283473fffffff 2>&1"
+    "Error 5: Cell argument was not valid")
diff --git a/tests/cli/cellToBoundary.txt b/tests/cli/cellToBoundary.txt
@@ -1 +1,5 @@
-add_h3_cli_test(testCliCellToBoundary "cellToBoundary -c 8928342e20fffff -f wkt" "POLYGON((-122.4990471431 37.4997389893, -122.4979805011 37.5014245698, -122.4992373065 37.5029321860, -122.5015607527 37.5027541980, -122.5026273256 37.5010686174, -122.5013705214 37.4995610248, -122.4990471431 37.4997389893))")
+add_h3_cli_test(
+    testCliCellToBoundary
+    "cellToBoundary -c 8928342e20fffff -f wkt"
+    "POLYGON((-122.4990471431 37.4997389893, -122.4979805011 37.5014245698, -122.4992373065 37.5029321860, -122.5015607527 37.5027541980, -122.5026273256 37.5010686174, -122.5013705214 37.4995610248, -122.4990471431 37.4997389893))"
+)
diff --git a/tests/cli/cellToCenterChild.txt b/tests/cli/cellToCenterChild.txt
@@ -1 +1,4 @@
-add_h3_cli_test(testCliCellToCenterChild "cellToCenterChild -c 85283473fffffff --resolution 7 -f newline" "872834700ffffff")
+add_h3_cli_test(
+    testCliCellToCenterChild
+    "cellToCenterChild -c 85283473fffffff --resolution 7 -f newline"
+    "872834700ffffff")
diff --git a/tests/cli/cellToChildPos.txt b/tests/cli/cellToChildPos.txt
@@ -1 +1,2 @@
-add_h3_cli_test(testCliCellToChildPos "cellToChildPos -c 85283473fffffff -r 3" "25")
+add_h3_cli_test(testCliCellToChildPos "cellToChildPos -c 85283473fffffff -r 3"
+                "25")
diff --git a/tests/cli/cellToChildren.txt b/tests/cli/cellToChildren.txt
@@ -1 +1,5 @@
-add_h3_cli_test(testCliCellToChildren "cellToChildren -c 85283473fffffff -r 6" "[ \"862834707ffffff\", \"86283470fffffff\", \"862834717ffffff\", \"86283471fffffff\", \"862834727ffffff\", \"86283472fffffff\", \"862834737ffffff\" ]")
+add_h3_cli_test(
+    testCliCellToChildren
+    "cellToChildren -c 85283473fffffff -r 6"
+    "[ \"862834707ffffff\", \"86283470fffffff\", \"862834717ffffff\", \"86283471fffffff\", \"862834727ffffff\", \"86283472fffffff\", \"862834737ffffff\" ]"
+)
diff --git a/tests/cli/cellToChildrenSize.txt b/tests/cli/cellToChildrenSize.txt
@@ -1 +1,2 @@
-add_h3_cli_test(testCliCellToChildrenSize "cellToChildrenSize -c 85283473fffffff -r 6" "7")
+add_h3_cli_test(testCliCellToChildrenSize
+                "cellToChildrenSize -c 85283473fffffff -r 6" "7")
diff --git a/tests/cli/cellToLatLng.txt b/tests/cli/cellToLatLng.txt
@@ -1,2 +1,4 @@
-add_h3_cli_test(testCliCellToLatLng "cellToLatLng -c 8928342e20fffff -f wkt" "POINT(-122.5003039349 37.5012466151)")
-add_h3_cli_test(testCliInvalidCellToLatLng "cellToLatLng -c asdf 2>&1" "Error 5: Cell argument was not valid")
+add_h3_cli_test(testCliCellToLatLng "cellToLatLng -c 8928342e20fffff -f wkt"
+                "POINT(-122.5003039349 37.5012466151)")
+add_h3_cli_test(testCliInvalidCellToLatLng "cellToLatLng -c asdf 2>&1"
+                "Error 5: Cell argument was not valid")
diff --git a/tests/cli/cellToLocalIj.txt b/tests/cli/cellToLocalIj.txt
@@ -1 +1,3 @@
-add_h3_cli_test(testCliCellToLocalIj "cellToLocalIj -o 85283473fffffff -c 8528342bfffffff" "[25, 13]")
+add_h3_cli_test(
+    testCliCellToLocalIj "cellToLocalIj -o 85283473fffffff -c 8528342bfffffff"
+    "[25, 13]")
diff --git a/tests/cli/cellToParent.txt b/tests/cli/cellToParent.txt
@@ -1 +1,4 @@
-add_h3_cli_test(testCliCellToParent "cellToParent -c 8928342e20fffff --resolution 3 -f newline" "832834fffffffff")
+add_h3_cli_test(
+    testCliCellToParent
+    "cellToParent -c 8928342e20fffff --resolution 3 -f newline"
+    "832834fffffffff")
diff --git a/tests/cli/cellToVertex.txt b/tests/cli/cellToVertex.txt
@@ -1,2 +1,6 @@
-add_h3_cli_test(testCliCellToVertex "cellToVertex -c 85283473fffffff -v 0 -f newline" "22528340bfffffff")
-add_h3_cli_test(testCliNotCellToVertex "cellToVertex -c 115283473fffffff -v 0 2>&1" "Error 5: Cell argument was not valid")
+add_h3_cli_test(
+    testCliCellToVertex "cellToVertex -c 85283473fffffff -v 0 -f newline"
+    "22528340bfffffff")
+add_h3_cli_test(
+    testCliNotCellToVertex "cellToVertex -c 115283473fffffff -v 0 2>&1"
+    "Error 5: Cell argument was not valid")
diff --git a/tests/cli/cellToVertexes.txt b/tests/cli/cellToVertexes.txt
@@ -1,2 +1,8 @@
-add_h3_cli_test(testCliCellToVertexes "cellToVertexes -c 85283473fffffff" "[ \"22528340bfffffff\", \"235283447fffffff\", \"205283463fffffff\", \"255283463fffffff\", \"22528340ffffffff\", \"23528340bfffffff\" ]")
-add_h3_cli_test(testCliNotCellToVertexes "cellToVertexes -c 115283473fffffff 2>&1" "Error 5: Cell argument was not valid")
+add_h3_cli_test(
+    testCliCellToVertexes
+    "cellToVertexes -c 85283473fffffff"
+    "[ \"22528340bfffffff\", \"235283447fffffff\", \"205283463fffffff\", \"255283463fffffff\", \"22528340ffffffff\", \"23528340bfffffff\" ]"
+)
+add_h3_cli_test(
+    testCliNotCellToVertexes "cellToVertexes -c 115283473fffffff 2>&1"
+    "Error 5: Cell argument was not valid")
diff --git a/tests/cli/cellsToDirectedEdge.txt b/tests/cli/cellsToDirectedEdge.txt
@@ -1,2 +1,8 @@
-add_h3_cli_test(testCliCellsToDirectedEdge "cellsToDirectedEdge -o 85283473fffffff -d 85283477fffffff -f newline" "115283473fffffff")
-add_h3_cli_test(testCliCellsNotToDirectedEdge "cellsToDirectedEdge -o 85283473fffffff -d 85283472fffffff 2>&1" "Error 11: Cell arguments were not neighbors")
+add_h3_cli_test(
+    testCliCellsToDirectedEdge
+    "cellsToDirectedEdge -o 85283473fffffff -d 85283477fffffff -f newline"
+    "115283473fffffff")
+add_h3_cli_test(
+    testCliCellsNotToDirectedEdge
+    "cellsToDirectedEdge -o 85283473fffffff -d 85283472fffffff 2>&1"
+    "Error 11: Cell arguments were not neighbors")