Skip to content

Commit 0166274

Browse files
jpobstjpobst
committed
Update expected test results.
1 parent c102f43 commit 0166274

File tree

187 files changed

+539
-429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+539
-429
lines changed

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Va
6767
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
6868
{
6969
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
70-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
70+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
7171
return cb_getSpanFlags_Ljava_lang_Object_;
7272
}
7373

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
7272
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
7373
{
7474
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
75-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
75+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
7676
return cb_getSpanFlags_Ljava_lang_Object_;
7777
}
7878

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public unsafe SpannableString (string source)
7878
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
7979
{
8080
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
81-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
81+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
8282
return cb_getSpanFlags_Ljava_lang_Object_;
8383
}
8484

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran
3535
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
3636
{
3737
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
38-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
38+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
3939
return cb_getSpanFlags_Ljava_lang_Object_;
4040
}
4141

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba
7575
static Delegate GetOnClick_Landroid_view_View_Handler ()
7676
{
7777
if (cb_onClick_Landroid_view_View_ == null)
78-
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_OnClick_Landroid_view_View_);
78+
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnClick_Landroid_view_View_);
7979
return cb_onClick_Landroid_view_View_;
8080
}
8181

@@ -154,7 +154,7 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR
154154
static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler ()
155155
{
156156
if (cb_setOnClickListener_Landroid_view_View_OnClickListener_ == null)
157-
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
157+
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
158158
return cb_setOnClickListener_Landroid_view_View_OnClickListener_;
159159
}
160160

@@ -184,7 +184,7 @@ public virtual unsafe void SetOnClickListener (Android.Views.View.IOnClickListen
184184
static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ()
185185
{
186186
if (cb_setOn123Listener_Landroid_view_View_OnClickListener_ == null)
187-
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
187+
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
188188
return cb_setOn123Listener_Landroid_view_View_OnClickListener_;
189189
}
190190

@@ -214,7 +214,7 @@ public virtual unsafe void SetOn123Listener (Android.Views.View.IOnClickListener
214214
static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler ()
215215
{
216216
if (cb_addTouchables_Ljava_util_ArrayList_ == null)
217-
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_AddTouchables_Ljava_util_ArrayList_);
217+
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_AddTouchables_Ljava_util_ArrayList_);
218218
return cb_addTouchables_Ljava_util_ArrayList_;
219219
}
220220

‎tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
using System;
2+
13
[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.view", Managed="Android.Views")]
24
[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.text", Managed="Android.Text")]
35
[assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
6+
7+
delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
8+
delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);

‎tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Va
5858
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
5959
{
6060
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
61-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
61+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
6262
return cb_getSpanFlags_Ljava_lang_Object_;
6363
}
6464

‎tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
6363
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
6464
{
6565
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
66-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
66+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
6767
return cb_getSpanFlags_Ljava_lang_Object_;
6868
}
6969

‎tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public unsafe SpannableString (string source)
9292
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
9393
{
9494
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
95-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
95+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
9696
return cb_getSpanFlags_Ljava_lang_Object_;
9797
}
9898

‎tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran
3030
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
3131
{
3232
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
33-
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
33+
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
3434
return cb_getSpanFlags_Ljava_lang_Object_;
3535
}
3636

‎tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba
6666
static Delegate GetOnClick_Landroid_view_View_Handler ()
6767
{
6868
if (cb_onClick_Landroid_view_View_ == null)
69-
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_OnClick_Landroid_view_View_);
69+
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnClick_Landroid_view_View_);
7070
return cb_onClick_Landroid_view_View_;
7171
}
7272

@@ -141,7 +141,7 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR
141141
static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler ()
142142
{
143143
if (cb_setOnClickListener_Landroid_view_View_OnClickListener_ == null)
144-
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
144+
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
145145
return cb_setOnClickListener_Landroid_view_View_OnClickListener_;
146146
}
147147

@@ -177,7 +177,7 @@ public virtual unsafe void SetOnClickListener (Android.Views.View.IOnClickListen
177177
static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ()
178178
{
179179
if (cb_setOn123Listener_Landroid_view_View_OnClickListener_ == null)
180-
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
180+
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
181181
return cb_setOn123Listener_Landroid_view_View_OnClickListener_;
182182
}
183183

@@ -213,7 +213,7 @@ public virtual unsafe void SetOn123Listener (Android.Views.View.IOnClickListener
213213
static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler ()
214214
{
215215
if (cb_addTouchables_Ljava_util_ArrayList_ == null)
216-
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_AddTouchables_Ljava_util_ArrayList_);
216+
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_AddTouchables_Ljava_util_ArrayList_);
217217
return cb_addTouchables_Ljava_util_ArrayList_;
218218
}
219219

‎tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
using System;
2+
13
[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.view", Managed="Android.Views")]
24
[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.text", Managed="Android.Text")]
35
[assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
6+
7+
delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
8+
delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
33
static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
44
{
55
if (cb_GetCountForKey_Ljava_lang_String_ == null)
6-
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
6+
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
77
return cb_GetCountForKey_Ljava_lang_String_;
88
}
99

@@ -34,7 +34,7 @@ static Delegate cb_Key;
3434
static Delegate GetKeyHandler ()
3535
{
3636
if (cb_Key == null)
37-
cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
37+
cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
3838
return cb_Key;
3939
}
4040

@@ -58,7 +58,7 @@ static Delegate cb_AbstractMethod;
5858
static Delegate GetAbstractMethodHandler ()
5959
{
6060
if (cb_AbstractMethod == null)
61-
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
61+
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
6262
return cb_AbstractMethod;
6363
}
6464

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
33
static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
44
{
55
if (cb_GetCountForKey_Ljava_lang_String_ == null)
6-
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
6+
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
77
return cb_GetCountForKey_Ljava_lang_String_;
88
}
99

@@ -34,7 +34,7 @@ static Delegate cb_Key;
3434
static Delegate GetKeyHandler ()
3535
{
3636
if (cb_Key == null)
37-
cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
37+
cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
3838
return cb_Key;
3939
}
4040

@@ -58,7 +58,7 @@ static Delegate cb_AbstractMethod;
5858
static Delegate GetAbstractMethodHandler ()
5959
{
6060
if (cb_AbstractMethod == null)
61-
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
61+
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
6262
return cb_AbstractMethod;
6363
}
6464

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ static Delegate cb_get_Count;
33
static Delegate Getget_CountHandler ()
44
{
55
if (cb_get_Count == null)
6-
cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
6+
cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
77
return cb_get_Count;
88
}
99

@@ -19,7 +19,7 @@ static Delegate cb_set_Count_I;
1919
static Delegate Getset_Count_IHandler ()
2020
{
2121
if (cb_set_Count_I == null)
22-
cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
22+
cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
2323
return cb_set_Count_I;
2424
}
2525

@@ -52,7 +52,7 @@ static Delegate cb_get_Key;
5252
static Delegate Getget_KeyHandler ()
5353
{
5454
if (cb_get_Key == null)
55-
cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
55+
cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
5656
return cb_get_Key;
5757
}
5858

@@ -68,7 +68,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
6868
static Delegate Getset_Key_Ljava_lang_String_Handler ()
6969
{
7070
if (cb_set_Key_Ljava_lang_String_ == null)
71-
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
71+
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
7272
return cb_set_Key_Ljava_lang_String_;
7373
}
7474

@@ -104,7 +104,7 @@ static Delegate cb_get_StaticCount;
104104
static Delegate Getget_StaticCountHandler ()
105105
{
106106
if (cb_get_StaticCount == null)
107-
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
107+
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
108108
return cb_get_StaticCount;
109109
}
110110

@@ -120,7 +120,7 @@ static Delegate cb_set_StaticCount_I;
120120
static Delegate Getset_StaticCount_IHandler ()
121121
{
122122
if (cb_set_StaticCount_I == null)
123-
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
123+
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
124124
return cb_set_StaticCount_I;
125125
}
126126

@@ -153,7 +153,7 @@ static Delegate cb_get_AbstractCount;
153153
static Delegate Getget_AbstractCountHandler ()
154154
{
155155
if (cb_get_AbstractCount == null)
156-
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
156+
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
157157
return cb_get_AbstractCount;
158158
}
159159

@@ -169,7 +169,7 @@ static Delegate cb_set_AbstractCount_I;
169169
static Delegate Getset_AbstractCount_IHandler ()
170170
{
171171
if (cb_set_AbstractCount_I == null)
172-
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
172+
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
173173
return cb_set_AbstractCount_I;
174174
}
175175

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ static Delegate cb_get_Key;
33
static Delegate Getget_KeyHandler ()
44
{
55
if (cb_get_Key == null)
6-
cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
6+
cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
77
return cb_get_Key;
88
}
99

@@ -19,7 +19,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
1919
static Delegate Getset_Key_Ljava_lang_String_Handler ()
2020
{
2121
if (cb_set_Key_Ljava_lang_String_ == null)
22-
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
22+
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
2323
return cb_set_Key_Ljava_lang_String_;
2424
}
2525

@@ -55,7 +55,7 @@ static Delegate cb_get_StaticCount;
5555
static Delegate Getget_StaticCountHandler ()
5656
{
5757
if (cb_get_StaticCount == null)
58-
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
58+
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
5959
return cb_get_StaticCount;
6060
}
6161

@@ -71,7 +71,7 @@ static Delegate cb_set_StaticCount_I;
7171
static Delegate Getset_StaticCount_IHandler ()
7272
{
7373
if (cb_set_StaticCount_I == null)
74-
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
74+
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
7575
return cb_set_StaticCount_I;
7676
}
7777

@@ -104,7 +104,7 @@ static Delegate cb_get_AbstractCount;
104104
static Delegate Getget_AbstractCountHandler ()
105105
{
106106
if (cb_get_AbstractCount == null)
107-
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
107+
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
108108
return cb_get_AbstractCount;
109109
}
110110

@@ -120,7 +120,7 @@ static Delegate cb_set_AbstractCount_I;
120120
static Delegate Getset_AbstractCount_IHandler ()
121121
{
122122
if (cb_set_AbstractCount_I == null)
123-
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
123+
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
124124
return cb_set_AbstractCount_I;
125125
}
126126

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
33
static Delegate Getget_MyPropertyHandler ()
44
{
55
if (cb_get_MyProperty == null)
6-
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
6+
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
77
return cb_get_MyProperty;
88
}
99

@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
1919
static Delegate Getset_MyProperty_IHandler ()
2020
{
2121
if (cb_set_MyProperty_I == null)
22-
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
22+
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
2323
return cb_set_MyProperty_I;
2424
}
2525

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
33
static Delegate Getget_MyPropertyHandler ()
44
{
55
if (cb_get_MyProperty == null)
6-
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
6+
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
77
return cb_get_MyProperty;
88
}
99

@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
1919
static Delegate Getset_MyProperty_IHandler ()
2020
{
2121
if (cb_set_MyProperty_I == null)
22-
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
22+
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
2323
return cb_set_MyProperty_I;
2424
}
2525

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
33
static Delegate Getget_MyPropertyHandler ()
44
{
55
if (cb_get_MyProperty == null)
6-
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
6+
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
77
return cb_get_MyProperty;
88
}
99

@@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
1919
static Delegate Getset_MyProperty_IHandler ()
2020
{
2121
if (cb_set_MyProperty_I == null)
22-
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
22+
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
2323
return cb_set_MyProperty_I;
2424
}
2525

0 commit comments

Comments
 (0)