Merge pull request #34 from NordSecurity/cs_bindgen_tests

C# Tests

.github/workflows/cpp.yml

@@ -10,46 +10,80 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build:
+  build-scaffolding:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.72-bullseye
+      image: ghcr.io/nordsecurity/uniffi-bindgen-cpp-test-runner:v0.3.0
     steps:
     - uses: actions/checkout@v3
-    - name: Build
+    - name: Build scaffolding
+      shell: bash
+      env:
+        # Github sets HOME to /github/home and breaks dependencies in Docker image..
+        # https://github.com/actions/runner/issues/863
+        HOME: /root
       run: |
-        cargo build --release --package uniffi-bindgen-cpp
+        source ~/.bashrc
+        ./build_bindgen.sh
+        ./build_scaffolding.sh
+    - uses: actions/upload-artifact@v3
+      with:
+        name: scaffolding_lib
+        path: cpp-tests/build/libuniffi_fixtures.so
 
-  test-bindings:
+  run-tests:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/nordsecurity/uniffi-bindgen-cpp-test-runner:v0.3.0
     steps:
     - uses: actions/checkout@v3
-    - name: Test bindings
+    - name: Run tests
       shell: bash
       env:
-        # Github sets HOME to /github/home and breaks dependencies in Docker image..
-        # https://github.com/actions/runner/issues/863
         HOME: /root
       run: |
         source ~/.bashrc
+        ./build_bindgen.sh
         ./test_bindings.sh
 
   test-scaffolding-go:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/nordsecurity/uniffi-bindgen-cpp-test-runner:v0.3.0
+    needs: build-scaffolding
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
+    - uses: actions/download-artifact@v3
+      with:
+        name: scaffolding_lib
+        path: cpp-tests/build/
     - name: Test scaffolding Go
       shell: bash
       env:
-        # Github sets HOME to /github/home and breaks dependencies in Docker image..
-        # https://github.com/actions/runner/issues/863
         HOME: /root
       run: |
         source ~/.bashrc
         ./test_scaffolding_go.sh
+
+  test-scaffolding-cs:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/nordsecurity/uniffi-bindgen-cs-test-runner:v0.1.0
+    needs: build-scaffolding
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - uses: actions/download-artifact@v3
+      with:
+        name: scaffolding_lib
+        path: cpp-tests/build/
+    - name: Test scaffolding C#
+      shell: bash
+      env:
+        HOME: /root
+      run: |
+        source ~/.bashrc
+        ./test_scaffolding_cs.sh

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "3rd-party/uniffi-bindgen-go"]
 	path = 3rd-party/uniffi-bindgen-go
 	url = https://github.com/NordSecurity/uniffi-bindgen-go
+[submodule "3rd-party/uniffi-bindgen-cs"]
+	path = 3rd-party/uniffi-bindgen-cs
+	url = https://github.com/NordSecurity/uniffi-bindgen-cs

build_bindgen.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euxo pipefail
+
+cargo build --release --package uniffi-bindgen-cpp

build_scaffolding.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euxo pipefail
+
+mkdir -p cpp-tests/build
+cd cpp-tests/build
+cmake -DCMAKE_BUILD_TYPE=Debug ..
+make uniffi_fixtures

cpp-tests/scaffolding_tests/fixture_callbacks/lib_fixture_callbacks.cpp

@@ -7,6 +7,8 @@ bool fixture_callbacks::RustGetters::get_bool(std::shared_ptr<fixture_callbacks:
 std::string fixture_callbacks::RustGetters::get_string(std::shared_ptr<fixture_callbacks::ForeignGetters> foreign, std::string v, bool argument_two) {
     try {
         return foreign->get_string(v, argument_two);
+    } catch (const fixture_callbacks::simple_error::BadArgument &e) {
+        throw e;
     } catch (const std::runtime_error &e) {
         throw fixture_callbacks::simple_error::UnexpectedError(e.what());
     }

cpp-tests/scaffolding_tests/rondpoint/lib_rondpoint.cpp

@@ -1,5 +1,7 @@
 #include "lib_rondpoint.hpp"
 
+#include <sstream>
+
 int8_t rondpoint::Retourneur::identique_i8(int8_t value) {
     return value;
 }
@@ -98,11 +100,19 @@ std::string rondpoint::Stringifier::to_string_u64(uint64_t value) {
 }
 
 std::string rondpoint::Stringifier::to_string_float(float value) {
-    return std::to_string(value);
+    std::stringstream ss;
+    ss.precision(8);
+    ss << value;
+
+    return ss.str();
 }
 
 std::string rondpoint::Stringifier::to_string_double(double value) {
-    return std::to_string(value);
+    std::stringstream ss;
+    ss.precision(17);
+    ss << value;
+
+    return ss.str();
 }
 
 std::string rondpoint::Stringifier::to_string_boolean(bool value) {

test_scaffolding_cs.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+set -euxo pipefail
+
+SCRIPT_DIR="${SCRIPT_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )}"
+ROOT_DIR="$SCRIPT_DIR"
+
+GENERATOR_DIR="$ROOT_DIR/3rd-party/uniffi-bindgen-cs"
+SOLUTION_DIR="dotnet-tests"
+BINARIES_DIR="$ROOT_DIR/cpp-tests/build"
+
+pushd $GENERATOR_DIR
+./build.sh
+./generate_bindings.sh
+
+export LD_LIBRARY_PATH="$BINARIES_DIR:${LD_LIBRARY_PATH:-}"
+cd $SOLUTION_DIR
+dotnet test --filter \
+    "FullyQualifiedName!~Docstring \
+    & FullyQualifiedName!~Numeric \
+    & FullyQualifiedName!~Stringify \
+    & FullyQualifiedName!~Disposable \
+    & FullyQualifiedName!~TestTraitMethods \
+    & FullyQualifiedName!~OptionalParameterTests \
+    & FullyQualifiedName!~TestCustomTypes \
+    & FullyQualifiedName!~TestGlobalMethodsClassName \
+    & FullyQualifiedName!~DateTimeMinMax \
+    & FullyQualifiedName!~ChronologicalWorks \
+    & FullyQualifiedName!~TimespanMax" \
+    -l "console;verbosity=normal"

test_scaffolding_go.sh

@@ -1,13 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
 
-mkdir -p cpp-tests/build
-pushd cpp-tests/build
-cmake -DCMAKE_BUILD_TYPE=Debug ..
-make uniffi_fixtures
-
-popd
-
 SCRIPT_DIR="${SCRIPT_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )}"
 ROOT_DIR="$SCRIPT_DIR"
 
@@ -16,12 +9,10 @@ BINDINGS_DIR="$GENERATOR_DIR/binding_tests"
 BINARIES_DIR="$ROOT_DIR/cpp-tests/build"
 
 pushd $GENERATOR_DIR
-cargo build
+./build.sh
 ./build_bindings.sh
 
-
 pushd $BINDINGS_DIR
-
 # We exclude tests that are not part of the main Rust fixtures
 EXCLUDE_LIST="custom_types_test\
 |destroy_test\