Merge pull request #70 from ylatuya/unit_tests

Create generator integration tests and fix generation issues

Author: ylatuya

.github/workflows/ci.yml

@@ -7,7 +7,8 @@ jobs:
         config:
           - { os: ubuntu-latest, arch: x64, name: ubuntu-x64 }
           - { os: macos-latest, arch: x64, name: macos-x64 }
-          - { os: windows-latest, arch: x64, name: windows-x64 }
+          # Disable Windows until gobject-introspeciton build is fixed
+          # - { os: windows-latest, arch: x64, name: windows-x64 }
     runs-on: ${{ matrix.config.os }}
     steps:
       - uses: actions/checkout@v2
@@ -22,11 +23,22 @@ jobs:
         run: dotnet format Source/gtk-sharp.sln --verify-no-changes --no-restore
       - name: Install Deps
         run: pip3 install meson ninja
+      - name: Install Windows Deps
+        if: matrix.config.os == 'windows-latest'
+        run: choco install winflexbison3 pkgconfiglite -y --allow-empty-checksum
+      - name: Install macOS Deps
+        if: matrix.config.os == 'macos-latest'
+        run: |
+          brew update
+          brew install bison
+          echo "/usr/local/opt/bison/bin" >> $GITHUB_PATH
       - name: Configure
-        run: meson builddir
+        run: meson setup builddir --buildtype=release --prefix=${GITHUB_WORKSPACE}/build_prefix
       - name: Build
         run: meson compile -C builddir
       - name: Install
         run: meson install -C builddir
       - name: Build dotnet
         run: dotnet build Source/gtk-sharp.sln /p:Platform="Any CPU"
+      - name: Test
+        run: dotnet test Source/gtk-sharp.sln /p:Platform="Any CPU"

Source/.editorconfig

@@ -3,6 +3,8 @@ root = true
 
 [**/generated/*.cs]
 generated_code = true
+[**/generated/*/*.cs]
+generated_code = true
 
 # C# files
 [*.cs]

Source/atk/Atk.metadata

@@ -29,6 +29,7 @@
   <attr path="/api/namespace/object[@cname='AtkObject']/virtual_method[@cname='ref_state_set']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@cname='AtkObjectFactory']/virtual_method" name="override_in">declaring_class</attr>
   <attr path="/api/namespace/object[@cname='AtkRelation']/constructor[@cname='atk_relation_new']/*/*[@name='targets']" name="array">1</attr>
+  <attr path="/api/namespace/object[@cname='AtkRelation']/constructor[@cname='atk_relation_new']/*/*[@name='targets']" name="array_length_param_index">1</attr>
   <attr path="/api/namespace/object[@cname='AtkRelation']/method[@name='GetTarget']/return-type" name="element_type">AtkObject*</attr>
   <attr path="/api/namespace/object[@cname='AtkUtil']/virtual_method" name="override_in">declaring_class</attr>
   <attr path="/api/namespace/object[@cname='AtkUtil']/virtual_method[@name='AddGlobalEventListener']" name="hidden">1</attr>

Source/atk/generated/Atk_Relation.cs

@@ -14,7 +14,7 @@ public partial class Relation : GLib.Object {
 		public Relation (IntPtr raw) : base(raw) {}
 
 		[DllImport("atk-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern IntPtr atk_relation_new(IntPtr[] targets, int n_targets, int relationship);
+		static extern IntPtr atk_relation_new([MarshalAs(UnmanagedType.LPArray, SizeParamIndex=1)]IntPtr[] targets, int n_targets, int relationship);
 
 		public Relation (Atk.Object[] targets, Atk.RelationType relationship) : base (IntPtr.Zero)
 		{
@@ -24,11 +24,11 @@ public Relation (Atk.Object[] targets, Atk.RelationType relationship) : base (In
 				CreateNativeObject (names.ToArray (), vals.ToArray ());
 				return;
 			}
-			int cnt_targets = targets == null ? 0 : targets.Length;
-			IntPtr[] native_targets = new IntPtr [cnt_targets];
-			for (int i = 0; i < cnt_targets; i++)
+			int n_targets = (targets == null ? 0 : targets.Length);
+			IntPtr[] native_targets = new IntPtr [n_targets];
+			for (int i = 0; i < n_targets; i++)
 				native_targets [i] = targets[i] == null ? IntPtr.Zero : targets[i].Handle;
-			Raw = atk_relation_new(native_targets, (targets == null ? 0 : targets.Length), (int) relationship);
+			Raw = atk_relation_new(native_targets, n_targets, (int) relationship);
 		}
 
 		[DllImport("atk-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]

Source/atk/generated/atk-api.xml

@@ -2777,7 +2777,7 @@
       </method>
       <constructor cname="atk_relation_new">
         <parameters>
-          <parameter type="AtkObject**" name="targets" array="1" />
+          <parameter type="AtkObject**" name="targets" array="1" array_length_param_index="1" />
           <parameter type="gint" name="n_targets" />
           <parameter type="AtkRelationType" name="relationship" />
         </parameters>

Source/bindinator/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2012-216 Andreia Gaita
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.