fixup and move registry tests

jorisvandenbossche · Mar 26, 2024 · 1c20d68 · 1c20d68
1 parent 8c6acab
commit 1c20d68
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/cpp/src/arrow/buffer_test.cc b/cpp/src/arrow/buffer_test.cc
@@ -1023,4 +1023,17 @@ TEST(TestBufferConcatenation, EmptyBuffer) {
   AssertMyBufferEqual(*result, contents);
 }
 
+TEST(TestDeviceRegistry, Basics) {
+  // Test the error cases for the device registry
+
+  // CPU is already registered
+  ASSERT_RAISES(KeyError, RegisterDeviceMemoryManager(
+                              DeviceAllocationType::kCPU, [](int64_t device_id) {
+                                return default_cpu_memory_manager();
+                              }));
+
+  // VPI is not registered
+  ASSERT_RAISES(KeyError, GetDeviceMemoryManager(DeviceAllocationType::kVPI));
+}
+
 }  // namespace arrow
diff --git a/cpp/src/arrow/c/bridge_test.cc b/cpp/src/arrow/c/bridge_test.cc
@@ -4330,19 +4330,6 @@ TEST_F(TestDeviceArrayRoundtrip, Struct) {
   TestWithJSON(mm, type, R"([[4, null], null, [5, "foo"]])");
 }
 
-TEST(TestDeviceRegistry, Basics) {
-  // Test the error cases for the device registry
-
-  // CPU is already registered
-  ASSERT_RAISES(KeyError, RegisterDeviceMemoryManager(
-                              DeviceAllocationType::kCPU, [](int64_t device_id) {
-                                return default_cpu_memory_manager();
-                              }));
-
-  // VPI is not registered
-  ASSERT_RAISES(KeyError, GetDeviceMemoryManager(DeviceAllocationType::kVPI));
-}
-
 ////////////////////////////////////////////////////////////////////////////
 // Array stream export tests
 

diff --git a/cpp/src/arrow/device.cc b/cpp/src/arrow/device.cc
@@ -278,7 +278,7 @@ class DeviceMemoryManagerRegistryImpl {
 
   Status RegisterDevice(DeviceAllocationType device_type, MemoryMapper memory_mapper) {
     std::lock_guard<std::mutex> lock(lock_);
-    auto [_, inserted] = registry.try_emplace(device_type, std::move(memory_mapper));
+    auto [_, inserted] = registry_.try_emplace(device_type, std::move(memory_mapper));
     if (!inserted) {
       return Status::KeyError("Device type ", static_cast<int>(device_type),
                               " is already registered");