Adding tests for method calls in foreign namespaces

Author: adetaylor

tests/BUCK

@@ -15,6 +15,7 @@ rust_library(
         "ffi/extra.rs",
         "ffi/lib.rs",
         "ffi/module.rs",
+        "ffi/class_in_ns.rs",
     ],
     crate = "cxx_test_suite",
     deps = [
@@ -30,6 +31,7 @@ cxx_library(
         ":bridge/source",
         ":extra/source",
         ":module/source",
+        ":class_in_ns/source",
     ],
     headers = {
         "ffi/lib.rs.h": ":bridge/header",
@@ -52,3 +54,8 @@ rust_cxx_bridge(
     name = "module",
     src = "ffi/module.rs",
 )
+
+rust_cxx_bridge(
+    name = "class_in_ns",
+    src = "ffi/class_in_ns.rs",
+)

tests/BUILD

@@ -18,6 +18,7 @@ rust_library(
         "ffi/extra.rs",
         "ffi/lib.rs",
         "ffi/module.rs",
+        "ffi/class_in_ns.rs",
     ],
     deps = [
         ":impl",
@@ -32,6 +33,7 @@ cc_library(
         ":bridge/source",
         ":extra/source",
         ":module/source",
+        ":class_in_ns/source",
     ],
     hdrs = ["ffi/tests.h"],
     deps = [
@@ -57,3 +59,9 @@ rust_cxx_bridge(
     src = "ffi/module.rs",
     deps = [":impl"],
 )
+
+rust_cxx_bridge(
+    name = "class_in_ns",
+    src = "ffi/class_in_ns.rs",
+    deps = [":impl"],
+)

tests/ffi/build.rs

@@ -6,7 +6,7 @@ fn main() {
     }
 
     CFG.include_prefix = "tests/ffi";
-    let sources = vec!["lib.rs", "extra.rs", "module.rs"];
+    let sources = vec!["lib.rs", "extra.rs", "module.rs", "class_in_ns.rs"];
     cxx_build::bridges(sources)
         .file("tests.cc")
         .flag_if_supported(cxxbridge_flags::STD)

tests/ffi/class_in_ns.rs

@@ -0,0 +1,21 @@
+// To test receivers on a type in a namespace outide
+// the default. cxx::bridge blocks can only have a single
+// receiver type, and there can only be one such block per,
+// which is why this is outside.
+
+#[rustfmt::skip]
+#[cxx::bridge(namespace = tests)]
+pub mod ffi3 {
+
+    extern "C" {
+        include!("tests/ffi/tests.h");
+
+        #[namespace (namespace = I)]
+        type I;
+
+        fn get(self: &I) -> u32;
+
+        #[namespace (namespace = I)]
+        fn ns_c_return_unique_ptr_ns() -> UniquePtr<I>;
+    }
+}

tests/ffi/lib.rs

@@ -4,6 +4,7 @@
     clippy::trivially_copy_pass_by_ref
 )]
 
+pub mod class_in_ns;
 pub mod extra;
 pub mod module;
 

tests/ffi/tests.cc

@@ -647,4 +647,14 @@ namespace other {
       cxx_test_suite_set_correct();
     }
   }
-}
+} // namespace other
+
+namespace I {
+  uint32_t I::get() const {
+    return a;
+  }
+
+  std::unique_ptr<I> ns_c_return_unique_ptr_ns() {
+    return std::unique_ptr<I>(new I());
+  }
+} // namespace I

tests/ffi/tests.h

@@ -182,4 +182,16 @@ namespace other {
   void ns_c_take_trivial(::tests::D d);
   ::tests::D ns_c_return_trivial();
   void ns_c_take_ns_shared(::A::AShared shared);
-} // namespace other
+} // namespace other
+
+namespace I {
+  class I {
+  private:
+    uint32_t a;
+  public:
+    I() : a(1000) {}
+    uint32_t get() const;
+  };
+
+  std::unique_ptr<I> ns_c_return_unique_ptr_ns();
+} // namespace I

tests/test.rs

@@ -1,3 +1,4 @@
+use cxx_test_suite::class_in_ns::ffi3;
 use cxx_test_suite::extra::ffi2;
 use cxx_test_suite::ffi;
 use std::cell::Cell;
@@ -193,6 +194,14 @@ fn test_c_method_calls() {
     assert!(unique_ptr.get_fail().is_err());
 }
 
+#[test]
+fn test_c_ns_method_calls() {
+    let unique_ptr = ffi3::ns_c_return_unique_ptr_ns();
+
+    let old_value = unique_ptr.get();
+    assert_eq!(1000, old_value);
+}
+
 #[test]
 fn test_enum_representations() {
     assert_eq!(0, ffi::Enum::AVal.repr);