Experimental .Net support

.gitignore

@@ -7,5 +7,11 @@ jni_tests/java/com/example/rust
 /cpp_tests/c++/build_with_boost
 target/
 /macroslib/target/
+/dotnet_tests/flapigen_test_dotnet
+/dotnet_tests/dotnet/bin/
+/dotnet_tests/dotnet/obj/
+/dotnet_tests/dotnet/*.dll
 .vscode
-Cargo.lock
+Cargo.lock
+/Cargo.toml
+android-example/app/src/main/java/net/akaame/myapplication/JNIReachabilityFence.java

ci_build_and_test.py

@@ -10,6 +10,7 @@
 
 JNI_TESTS = "jni_tests"
 PYTHON_TESTS = "python_tests"
+DOTNET_TESTS = "dotnet_tests"
 CPP_TESTS = "cpp_tests"
 ANDROID_TESTS = "android-example"
 UNIT_TESTS = "unit_tests"
@@ -223,6 +224,34 @@ def test_python(is_windows: bool, test_cfg: Set[str]):
             shutil.copyfile(os.path.join(target_dir, lib_name), "python_tests/python/flapigen_test_python.so")
             subprocess.check_call(["python3", "main.py"], cwd = "python_tests/python")
 
+@show_timing
+def test_dotnet(test_cfg):
+    for cfg in test_cfg:
+        cmd = ["cargo", "build", "-v", "--package", "flapigen_test_dotnet_native"]
+        if cfg == RELEASE:
+            cmd.append("--release")
+        env = os.environ.copy()
+        subprocess.check_call(cmd, shell = False, env = env)
+
+        target_dir = find_path_to_cargo_artifacts("dotnet_tests", cfg)
+        native_lib_name = "libflapigen_test_dotnet_native.so"
+        if sys.platform == "darwin":
+            native_lib_name = "libflapigen_test_dotnet_native.dylib"
+        elif sys.platform.startswith("win"):
+            native_lib_name = "flapigen_test_dotnet_native.dll"
+
+        test_projekt_target_dir = "dotnet_tests/dotnet/bin/Debug/netcoreapp3.1"
+
+        os.makedirs(test_projekt_target_dir, exist_ok=True)
+        shutil.copyfile(os.path.join(target_dir, native_lib_name), os.path.join(test_projekt_target_dir, native_lib_name))
+
+        # Build managed wrapper dll.
+        subprocess.check_call(["dotnet", "build"], cwd = "dotnet_tests/flapigen_test_dotnet")
+        shutil.copyfile("dotnet_tests/flapigen_test_dotnet/bin/Debug/netstandard2.0/flapigen_test_dotnet.dll", "dotnet_tests/dotnet/flapigen_test_dotnet.dll")
+
+        # Run test
+        subprocess.check_call(["dotnet", "test", '--logger:"console;verbosity=detailed"'], cwd = "dotnet_tests/dotnet")
+
 
 @show_timing
 def build_cargo_docs():
@@ -265,7 +294,7 @@ def main():
     sys.stdout.flush()
 
     test_cfg = set([RELEASE, DEBUG])
-    test_set = set([JNI_TESTS, CPP_TESTS, ANDROID_TESTS, UNIT_TESTS, DOC_TESTS, PYTHON_TESTS])
+    test_set = set([JNI_TESTS, CPP_TESTS, ANDROID_TESTS, UNIT_TESTS, DOC_TESTS, PYTHON_TESTS, DOTNET_TESTS])
     for arg in sys.argv[1:]:
         if arg == "--skip-android-tests":
             test_set.remove(ANDROID_TESTS)
@@ -277,12 +306,16 @@ def main():
             test_set.remove(JNI_TESTS)
         elif arg == "--skip-python-tests":
             test_set.remove(PYTHON_TESTS)
+        elif arg == "--skip-dotnet-tests":
+            test_set.remove(DOTNET_TESTS)
         elif arg == "--android-only-tests":
             test_set = set([ANDROID_TESTS])
         elif arg == "--rust-unit-tests-only":
             test_set = set([UNIT_TESTS])
         elif arg == "--python-only-tests":
             test_set = set([PYTHON_TESTS])
+        elif arg == "--dotnet-only-tests":
+            test_set = set([DOTNET_TESTS])
         else:
             raise Exception("Fatal Error: unknown option: %s" % arg)
 
@@ -324,5 +357,8 @@ def main():
     if PYTHON_TESTS in test_set:
         test_python(is_windows, test_cfg)
 
+    if DOTNET_TESTS in test_set:
+        test_dotnet(test_cfg)
+
 if __name__ == "__main__":
     main()

dotnet_tests/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "flapigen_test_dotnet_native"
+version = "0.1.0"
+authors = ["Adam Rzepka <adam@simteract.com>"]
+build = "build.rs"
+edition = "2018"
+
+[lib]
+name = "flapigen_test_dotnet_native"
+crate-type = ["cdylib"]
+
+[build-dependencies]
+flapigen = { path = "../macroslib" }
+env_logger = "0.7"
+log = "0.4"

dotnet_tests/build.rs

@@ -0,0 +1,29 @@
+use std::{env, path::Path, time::Instant};
+
+use flapigen::{DotNetConfig, LanguageConfig};
+
+fn main() {
+    env_logger::init();
+
+    let now = Instant::now();
+
+    let out_dir = env::var("OUT_DIR").unwrap();
+    flapigen_expand(
+        Path::new("src/glue.rs.in"),
+        &Path::new(&out_dir).join("glue.rs"),
+    );
+    let expand_time = now.elapsed();
+    println!(
+        "flapigen expand time: {}",
+        expand_time.as_secs() as f64 + (expand_time.subsec_nanos() as f64) / 1_000_000_000.
+    );
+    println!("cargo:rerun-if-changed=src/glue.rs.in");
+    println!("cargo:rerun-if-changed=src/lib.rs");
+}
+
+fn flapigen_expand(from: &Path, out: &Path) {
+    println!("Run flapigen_expand");
+    let config = DotNetConfig::new("flapigen_test_dotnet".to_owned(), "flapigen_test_dotnet".into());
+    let swig_gen = flapigen::Generator::new(LanguageConfig::DotNetConfig(config));
+    swig_gen.expand("flapigen_test_dotnet_native", from, out);
+}

dotnet_tests/dotnet/Test.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using Xunit;
+using flapigen_test_dotnet;
+
+namespace dotnet
+{
+    public class UnitTest
+    {
+        [Fact]
+        /// "Smoke" tests for flapigen dotnet backend.
+        /// Note, that some function does not return anything. They are called here just to verify, that there are no crashes.
+        public void TestAll()
+        {
+            TestStaticClass.Hello();
+            TestStaticClass.PrintNumber(123);
+            Assert.Equal(3, TestStaticClass.Add(1, 2));
+            Assert.Equal("Concatenated String", TestStaticClass.Concat("Concatenated ", "String"));
+            Assert.Equal("Concatenated str", TestStaticClass.Concat("Concatenated ", "str"));
+
+            var obj = new TestClass();
+            Assert.Equal(0, obj.Get());
+            obj.Increment();
+            Assert.Equal(1, obj.Get());
+            obj.Add(3);
+            obj.Print();
+            Assert.Equal(4, obj.Get());
+
+            TestStaticClass.TestObjByValue(obj);
+
+            var vec = new List<int>();
+            vec.Add(1);
+            vec.Add(2);
+
+            TestStaticClass.PrintVecLen(vec);
+            var new_vec = TestStaticClass.GetVec();
+            Assert.Equal(3, new_vec.Count);
+            Assert.Equal(5, new_vec[0]);
+            Assert.Equal(6, new_vec[1]);
+            Assert.Equal(7, new_vec[2]);
+
+            Assert.Equal(0, TestStaticClass.MaybeReturnClass(new Option<string>("asdf")).Value.Get());
+            Assert.False(TestStaticClass.MaybeAddOne(new Option<int>()).IsSome);
+
+            // This shouldn't throw.
+            TestStaticClass.TryCreateObjectOk();
+            // But this one should.
+            Assert.Throws<flapigen_test_dotnet.Error>(() => TestStaticClass.TryCreateObjectErr());
+
+            var arc_mutex = new TestArcMutex();
+            arc_mutex.Inc();
+            Assert.Equal("1", arc_mutex.ToString());
+            Assert.Equal("1", TestArcMutex.ToStringArc(arc_mutex));
+
+            Assert.Equal(TestEnum.A, TestStaticClass.ReverseEnum(TestEnum.B));
+
+            var tuple = TestStaticClass.GetTuple();
+            Assert.Equal(0, tuple.Item1);
+            Assert.Equal("0", tuple.Item2);
+        }
+    }
+}
+

dotnet_tests/dotnet/dotnet.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <Reference Include="flapigen_test_dotnet" />
+  </ItemGroup>
+
+</Project>