Use uppercase for constants

Author: joto

tests/test-ordered-index.cpp

@@ -13,21 +13,21 @@
 
 TEST_CASE("ordered index basics", "[NoDB]")
 {
-    constexpr std::size_t block_size = 16;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 16;
+    ordered_index_t index{BLOCK_SIZE};
 
     REQUIRE(index.size() == 0);
     REQUIRE(index.capacity() == 0);
     REQUIRE(index.used_memory() == 0);
 
     index.add(17, 32);
     REQUIRE(index.size() == 1);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
     REQUIRE(index.used_memory() > 0);
 
     index.add(19, 33);
     REQUIRE(index.size() == 2);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
     REQUIRE(index.used_memory() > 0);
 
     index.clear();
@@ -38,8 +38,8 @@ TEST_CASE("ordered index basics", "[NoDB]")
 
 TEST_CASE("ordered index set/get", "[NoDB]")
 {
-    constexpr std::size_t block_size = 16;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 16;
+    ordered_index_t index{BLOCK_SIZE};
 
     index.add(19, 0);
     index.add(22, 10);
@@ -64,23 +64,23 @@ TEST_CASE("ordered index set/get", "[NoDB]")
 
 TEST_CASE("ordered index set/get with multiple second-level blocks", "[NoDB]")
 {
-    constexpr std::size_t block_size = 4;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 4;
+    ordered_index_t index{BLOCK_SIZE};
 
     index.add(19, 0);
     index.add(22, 10);
     index.add(23, 22);
     index.add(26, 24);
     REQUIRE(index.size() == 4);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
 
     REQUIRE(index.get(31) == index.not_found_value());
 
     index.add(31, 25);
     index.add(42, 30);
     index.add(65, 32);
     REQUIRE(index.size() == 7);
-    REQUIRE(index.capacity() == block_size * (1 + 2));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2));
 
     REQUIRE(index.get(22) == 10);
     REQUIRE(index.get(23) == 22);
@@ -106,24 +106,24 @@ TEST_CASE("ordered index set/get with multiple second-level blocks", "[NoDB]")
 
 TEST_CASE("ordered index with huge gaps in ids", "[NoDB]")
 {
-    constexpr std::size_t block_size = 4;
-    ordered_index_t index{block_size};
+    constexpr std::size_t BLOCK_SIZE = 4;
+    ordered_index_t index{BLOCK_SIZE};
 
     index.add(1, 0);
     REQUIRE(index.size() == 1);
-    REQUIRE(index.capacity() == block_size);
+    REQUIRE(index.capacity() == BLOCK_SIZE);
 
     index.add((1ULL << 32U) + 3U, 1);
     REQUIRE(index.size() == 2);
-    REQUIRE(index.capacity() == block_size * (1 + 2));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2));
 
     index.add((1ULL << 32U) + 4U, 2);
     REQUIRE(index.size() == 3);
-    REQUIRE(index.capacity() == block_size * (1 + 2));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2));
 
     index.add((2ULL << 32U) + 9U, 3);
     REQUIRE(index.size() == 4);
-    REQUIRE(index.capacity() == block_size * (1 + 2 + 4));
+    REQUIRE(index.capacity() == BLOCK_SIZE * (1 + 2 + 4));
 
     REQUIRE(index.used_memory() > (index.capacity() * 8));
 

tests/test-output-flex-nodes.cpp

@@ -63,7 +63,7 @@ enum class node_relationship : std::uint8_t
 template <node_relationship R>
 struct node_rel
 {
-    static constexpr node_relationship rs = R;
+    static constexpr node_relationship RS = R;
 };
 
 using node_rel_none = node_rel<node_relationship::none>;
@@ -87,9 +87,9 @@ TEMPLATE_TEST_CASE("change nodes", "", node_rel_none, node_rel_in_way,
 
     options.append = true;
 
-    if (TestType{}.rs == node_relationship::in_way) {
+    if (TestType{}.RS == node_relationship::in_way) {
         REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn14,n15,n16\n"));
-    } else if (TestType{}.rs == node_relationship::in_relation) {
+    } else if (TestType{}.RS == node_relationship::in_relation) {
         REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV Mn14@,n15@,n16@\n"));
     }
 
@@ -174,9 +174,9 @@ TEMPLATE_TEST_CASE("delete nodes", "", node_rel_none, node_rel_in_way,
 
     options.append = true;
 
-    if (TestType{}.rs == node_relationship::in_way) {
+    if (TestType{}.RS == node_relationship::in_way) {
         REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn14,n15,n16\n"));
-    } else if (TestType{}.rs == node_relationship::in_relation) {
+    } else if (TestType{}.RS == node_relationship::in_relation) {
         REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV Mn14@,n15@,n16@\n"));
     }