Skip to content

Commit 369ae73

Browse files
jpobstjpobst
committed
Update tests.
1 parent 11145de commit 369ae73

File tree

67 files changed

+1975
-844
lines changed

Some content is hidden

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

67 files changed

+1975
-844
lines changed

‎tests/generator-Tests/SupportFiles/DebuggerDisableUserUnhandledExceptionsAttribute.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#if !NET9_0_OR_GREATER
2+
3+
using System;
4+
5+
namespace System.Diagnostics
6+
{
7+
// This attribute was added in .NET 9, and we may not be targeting .NET 9 yet.
8+
public class DebuggerDisableUserUnhandledExceptionsAttribute : Attribute
9+
{
10+
}
11+
}
12+
13+
#endif // !NET9_0_OR_GREATER

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,23 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima
7070
#pragma warning disable 0169
7171
static Delegate GetOnAnimationEnd_IHandler ()
7272
{
73-
if (cb_OnAnimationEnd_OnAnimationEnd_I_Z == null)
74-
cb_OnAnimationEnd_OnAnimationEnd_I_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I));
75-
return cb_OnAnimationEnd_OnAnimationEnd_I_Z;
73+
return cb_OnAnimationEnd_OnAnimationEnd_I_Z ??= new _JniMarshal_PPI_Z (n_OnAnimationEnd_I);
7674
}
7775

76+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
7877
static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1)
7978
{
80-
var __this = global::Java.Lang.Object.GetObject<java.code.AnimatorListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
81-
return __this.OnAnimationEnd (param1);
79+
var __envp = new global::Java.Interop.JniTransition (jnienv);
80+
81+
try {
82+
var __this = global::Java.Lang.Object.GetObject<java.code.AnimatorListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
83+
return __this.OnAnimationEnd (param1);
84+
} catch (global::System.Exception __e) {
85+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
86+
return default;
87+
} finally {
88+
__envp.Dispose ();
89+
}
8290
}
8391
#pragma warning restore 0169
8492

@@ -96,15 +104,23 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima
96104
#pragma warning disable 0169
97105
static Delegate GetOnAnimationEnd_IIHandler ()
98106
{
99-
if (cb_OnAnimationEnd_OnAnimationEnd_II_Z == null)
100-
cb_OnAnimationEnd_OnAnimationEnd_II_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II));
101-
return cb_OnAnimationEnd_OnAnimationEnd_II_Z;
107+
return cb_OnAnimationEnd_OnAnimationEnd_II_Z ??= new _JniMarshal_PPII_Z (n_OnAnimationEnd_II);
102108
}
103109

110+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
104111
static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2)
105112
{
106-
var __this = global::Java.Lang.Object.GetObject<java.code.AnimatorListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
107-
return __this.OnAnimationEnd (param1, param2);
113+
var __envp = new global::Java.Interop.JniTransition (jnienv);
114+
115+
try {
116+
var __this = global::Java.Lang.Object.GetObject<java.code.AnimatorListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
117+
return __this.OnAnimationEnd (param1, param2);
118+
} catch (global::System.Exception __e) {
119+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
120+
return default;
121+
} finally {
122+
__envp.Dispose ();
123+
}
108124
}
109125
#pragma warning restore 0169
110126

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,22 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter
6666
#pragma warning disable 0169
6767
static Delegate GetDoSomethingHandler ()
6868
{
69-
if (cb_DoSomething_DoSomething_V == null)
70-
cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething));
71-
return cb_DoSomething_DoSomething_V;
69+
return cb_DoSomething_DoSomething_V ??= new _JniMarshal_PP_V (n_DoSomething);
7270
}
7371

72+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
7473
static void n_DoSomething (IntPtr jnienv, IntPtr native__this)
7574
{
76-
var __this = global::Java.Lang.Object.GetObject<java.code.IMyInterface2> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
77-
__this.DoSomething ();
75+
var __envp = new global::Java.Interop.JniTransition (jnienv);
76+
77+
try {
78+
var __this = global::Java.Lang.Object.GetObject<java.code.IMyInterface2> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
79+
__this.DoSomething ();
80+
} catch (global::System.Exception __e) {
81+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
82+
} finally {
83+
__envp.Dispose ();
84+
}
7885
}
7986
#pragma warning restore 0169
8087

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt‎

Lines changed: 116 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,46 @@ public partial class MyClass {
5353
#pragma warning disable 0169
5454
static Delegate Getget_CountHandler ()
5555
{
56-
if (cb_get_Count_get_Count_I == null)
57-
cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count));
58-
return cb_get_Count_get_Count_I;
56+
return cb_get_Count_get_Count_I ??= new _JniMarshal_PP_I (n_get_Count);
5957
}
6058

59+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
6160
static int n_get_Count (IntPtr jnienv, IntPtr native__this)
6261
{
63-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
64-
return __this.Count;
62+
var __envp = new global::Java.Interop.JniTransition (jnienv);
63+
64+
try {
65+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
66+
return __this.Count;
67+
} catch (global::System.Exception __e) {
68+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
69+
return default;
70+
} finally {
71+
__envp.Dispose ();
72+
}
6573
}
6674
#pragma warning restore 0169
6775

6876
static Delegate? cb_set_Count_set_Count_I_V;
6977
#pragma warning disable 0169
7078
static Delegate Getset_Count_IHandler ()
7179
{
72-
if (cb_set_Count_set_Count_I_V == null)
73-
cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I));
74-
return cb_set_Count_set_Count_I_V;
80+
return cb_set_Count_set_Count_I_V ??= new _JniMarshal_PPI_V (n_set_Count_I);
7581
}
7682

83+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
7784
static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value)
7885
{
79-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
80-
__this.Count = value;
86+
var __envp = new global::Java.Interop.JniTransition (jnienv);
87+
88+
try {
89+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
90+
__this.Count = value;
91+
} catch (global::System.Exception __e) {
92+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
93+
} finally {
94+
__envp.Dispose ();
95+
}
8196
}
8297
#pragma warning restore 0169
8398

@@ -109,32 +124,47 @@ public partial class MyClass {
109124
#pragma warning disable 0169
110125
static Delegate Getget_KeyHandler ()
111126
{
112-
if (cb_get_Key_get_Key_Ljava_lang_String_ == null)
113-
cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key));
114-
return cb_get_Key_get_Key_Ljava_lang_String_;
127+
return cb_get_Key_get_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_get_Key);
115128
}
116129

130+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
117131
static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this)
118132
{
119-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
120-
return JNIEnv.NewString (__this.Key);
133+
var __envp = new global::Java.Interop.JniTransition (jnienv);
134+
135+
try {
136+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
137+
return JNIEnv.NewString (__this.Key);
138+
} catch (global::System.Exception __e) {
139+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
140+
return default;
141+
} finally {
142+
__envp.Dispose ();
143+
}
121144
}
122145
#pragma warning restore 0169
123146

124147
static Delegate? cb_set_Key_set_Key_Ljava_lang_String__V;
125148
#pragma warning disable 0169
126149
static Delegate Getset_Key_Ljava_lang_String_Handler ()
127150
{
128-
if (cb_set_Key_set_Key_Ljava_lang_String__V == null)
129-
cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_));
130-
return cb_set_Key_set_Key_Ljava_lang_String__V;
151+
return cb_set_Key_set_Key_Ljava_lang_String__V ??= new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_);
131152
}
132153

154+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
133155
static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value)
134156
{
135-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
136-
var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer);
137-
__this.Key = value;
157+
var __envp = new global::Java.Interop.JniTransition (jnienv);
158+
159+
try {
160+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
161+
var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer);
162+
__this.Key = value;
163+
} catch (global::System.Exception __e) {
164+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
165+
} finally {
166+
__envp.Dispose ();
167+
}
138168
}
139169
#pragma warning restore 0169
140170

@@ -192,31 +222,46 @@ public partial class MyClass {
192222
#pragma warning disable 0169
193223
static Delegate Getget_AbstractCountHandler ()
194224
{
195-
if (cb_get_AbstractCount_get_AbstractCount_I == null)
196-
cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount));
197-
return cb_get_AbstractCount_get_AbstractCount_I;
225+
return cb_get_AbstractCount_get_AbstractCount_I ??= new _JniMarshal_PP_I (n_get_AbstractCount);
198226
}
199227

228+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
200229
static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this)
201230
{
202-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
203-
return __this.AbstractCount;
231+
var __envp = new global::Java.Interop.JniTransition (jnienv);
232+
233+
try {
234+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
235+
return __this.AbstractCount;
236+
} catch (global::System.Exception __e) {
237+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
238+
return default;
239+
} finally {
240+
__envp.Dispose ();
241+
}
204242
}
205243
#pragma warning restore 0169
206244

207245
static Delegate? cb_set_AbstractCount_set_AbstractCount_I_V;
208246
#pragma warning disable 0169
209247
static Delegate Getset_AbstractCount_IHandler ()
210248
{
211-
if (cb_set_AbstractCount_set_AbstractCount_I_V == null)
212-
cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I));
213-
return cb_set_AbstractCount_set_AbstractCount_I_V;
249+
return cb_set_AbstractCount_set_AbstractCount_I_V ??= new _JniMarshal_PPI_V (n_set_AbstractCount_I);
214250
}
215251

252+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
216253
static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value)
217254
{
218-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
219-
__this.AbstractCount = value;
255+
var __envp = new global::Java.Interop.JniTransition (jnienv);
256+
257+
try {
258+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
259+
__this.AbstractCount = value;
260+
} catch (global::System.Exception __e) {
261+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
262+
} finally {
263+
__envp.Dispose ();
264+
}
220265
}
221266
#pragma warning restore 0169
222267

@@ -234,17 +279,25 @@ public partial class MyClass {
234279
#pragma warning disable 0169
235280
static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
236281
{
237-
if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null)
238-
cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_));
239-
return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I;
282+
return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I ??= new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_);
240283
}
241284

285+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
242286
static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key)
243287
{
244-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
245-
var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer);
246-
int __ret = __this.GetCountForKey (key);
247-
return __ret;
288+
var __envp = new global::Java.Interop.JniTransition (jnienv);
289+
290+
try {
291+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
292+
var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer);
293+
int __ret = __this.GetCountForKey (key);
294+
return __ret;
295+
} catch (global::System.Exception __e) {
296+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
297+
return default;
298+
} finally {
299+
__envp.Dispose ();
300+
}
248301
}
249302
#pragma warning restore 0169
250303

@@ -268,15 +321,23 @@ public partial class MyClass {
268321
#pragma warning disable 0169
269322
static Delegate GetKeyHandler ()
270323
{
271-
if (cb_Key_Key_Ljava_lang_String_ == null)
272-
cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key));
273-
return cb_Key_Key_Ljava_lang_String_;
324+
return cb_Key_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_Key);
274325
}
275326

327+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
276328
static IntPtr n_Key (IntPtr jnienv, IntPtr native__this)
277329
{
278-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
279-
return JNIEnv.NewString (__this.Key ());
330+
var __envp = new global::Java.Interop.JniTransition (jnienv);
331+
332+
try {
333+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
334+
return JNIEnv.NewString (__this.Key ());
335+
} catch (global::System.Exception __e) {
336+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
337+
return default;
338+
} finally {
339+
__envp.Dispose ();
340+
}
280341
}
281342
#pragma warning restore 0169
282343

@@ -307,15 +368,22 @@ public partial class MyClass {
307368
#pragma warning disable 0169
308369
static Delegate GetAbstractMethodHandler ()
309370
{
310-
if (cb_AbstractMethod_AbstractMethod_V == null)
311-
cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod));
312-
return cb_AbstractMethod_AbstractMethod_V;
371+
return cb_AbstractMethod_AbstractMethod_V ??= new _JniMarshal_PP_V (n_AbstractMethod);
313372
}
314373

374+
[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
315375
static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this)
316376
{
317-
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
318-
__this.AbstractMethod ();
377+
var __envp = new global::Java.Interop.JniTransition (jnienv);
378+
379+
try {
380+
var __this = global::Java.Lang.Object.GetObject<java.code.MyClass> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
381+
__this.AbstractMethod ();
382+
} catch (global::System.Exception __e) {
383+
global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);
384+
} finally {
385+
__envp.Dispose ();
386+
}
319387
}
320388
#pragma warning restore 0169
321389

0 commit comments

Comments
 (0)