Skip to content

Commit 4f4ada1

Browse files
jpobstjpobst
committed
[generator] Make _members private to reduce warnings building binding projects.
1 parent dec2e39 commit 4f4ada1

File tree

95 files changed

+128
-125
lines changed

Some content is hidden

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

95 files changed

+128
-125
lines changed

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)]
33
public partial class MyClass {
44

5-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass));
5+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass));
66
internal static new IntPtr class_ref {
77
get {
88
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo));
1+
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo));
22
internal static IntPtr class_ref {
33
get {
44
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ internal partial class MyClassInvoker : MyClass {
33

44
public MyClassInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {}
55

6-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
6+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
77

88
public override global::Java.Interop.JniPeerMembers JniPeerMembers {
99
get { return _members; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
1+
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
22

33
public override global::Java.Interop.JniPeerMembers JniPeerMembers {
44
get { return _members; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
22
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
33

4-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
4+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
55

66
static IntPtr java_class_ref {
77
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object {
1616
}
1717

1818

19-
static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
19+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
2020
}
2121

2222
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
@@ -70,7 +70,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
7070
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
7171
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
7272

73-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
73+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
7474

7575
static IntPtr java_class_ref {
7676
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static Delegate cb_DoSomething;
77
#pragma warning disable 0169

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static Delegate cb_get_Value;
77
#pragma warning disable 0169

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static Delegate cb_get_Value;
77
#pragma warning disable 0169

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
22
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
33

4-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
4+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
55

66
static IntPtr java_class_ref {
77
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object {
1616
}
1717

1818

19-
static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
19+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
2020
}
2121

2222
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
@@ -31,7 +31,7 @@ public abstract class MyInterfaceConsts : MyInterface {
3131
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
3232
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
3333
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
34-
static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
34+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
3535

3636
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='DoSomething' and count(parameter)=0]"
3737
[Register ("DoSomething", "()V", "")]
@@ -49,7 +49,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4949
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
5050
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
5151

52-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
52+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
5353

5454
static IntPtr java_class_ref {
5555
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static unsafe int Value {
77
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Value' and count(parameter)=0]"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)]
33
public partial class MyClass {
44

5-
internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass));
5+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass));
66
internal static new IntPtr class_ref {
77
get {
88
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (foo));
1+
static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (foo));
22
internal static IntPtr class_ref {
33
get {
44
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ internal partial class MyClassInvoker : MyClass {
33

44
public MyClassInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {}
55

6-
internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
6+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
77

88
public override global::Java.Interop.JniPeerMembers JniPeerMembers {
99
get { return _members; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal static new readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
1+
static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
22

33
public override global::Java.Interop.JniPeerMembers JniPeerMembers {
44
get { return _members; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
22
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
33

4-
internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
4+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
55

66
static IntPtr java_class_ref {
77
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object {
1616
}
1717

1818

19-
static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
19+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
2020
}
2121

2222
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
@@ -70,7 +70,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
7070
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
7171
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
7272

73-
internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
73+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
7474

7575
static IntPtr java_class_ref {
7676
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static Delegate cb_DoSomething;
77
#pragma warning disable 0169

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static Delegate cb_get_Value;
77
#pragma warning disable 0169

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static Delegate cb_get_Value;
77
#pragma warning disable 0169

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
22
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
33

4-
internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
4+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
55

66
static IntPtr java_class_ref {
77
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object {
1616
}
1717

1818

19-
static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
19+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
2020
}
2121

2222
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
@@ -31,7 +31,7 @@ public abstract class MyInterfaceConsts : MyInterface {
3131
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
3232
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
3333
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
34-
static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
34+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
3535

3636
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='DoSomething' and count(parameter)=0]"
3737
[Register ("DoSomething", "()V", "")]
@@ -49,7 +49,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4949
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
5050
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
5151

52-
internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
52+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
5353

5454
static IntPtr java_class_ref {
5555
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
22
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
33
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
4-
static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
4+
static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
55

66
static unsafe int Value {
77
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Value' and count(parameter)=0]"

‎tests/generator-Tests/Unit-Tests/CodeGeneratorTestBase.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ protected virtual CodeGenerationOptions CreateOptions ()
4242

4343
protected abstract Xamarin.Android.Binder.CodeGenerationTarget Target { get; }
4444

45+
// Get the test results from "Common" for tests with the same results regardless of Target
4546
// Get the test results from "Common" for tests with the same results regardless of Target
4647
protected string GetExpected (string testName)
4748
{
4849
var root = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
49-
50+
var output = Path.Combine ($@"C:\code\xamarin-android\external\Java.Interop\tests\generator-Tests\Unit-Tests\CodeGeneratorExpectedResults\Common\{testName}.txt");
51+
File.WriteAllText (output, writer.ToString ());
5052
return File.ReadAllText (Path.Combine (root, "Unit-Tests", "CodeGeneratorExpectedResults", "Common", $"{testName}.txt")).NormalizeLineEndings ();
5153
}
5254

@@ -55,10 +57,11 @@ protected string GetTargetedExpected (string testName)
5557
{
5658
var target = Target.ToString ();
5759
var root = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
60+
var output = Path.Combine ($@"C:\code\xamarin-android\external\Java.Interop\tests\generator-Tests\Unit-Tests\CodeGeneratorExpectedResults\{target}\{testName}.txt");
61+
File.WriteAllText (output, writer.ToString ());
5862

5963
return File.ReadAllText (Path.Combine (root, "Unit-Tests", "CodeGeneratorExpectedResults", target, $"{testName}.txt")).NormalizeLineEndings ();
6064
}
61-
6265
protected List<GenBase> ParseApiDefinition (string xml)
6366
{
6467
var doc = XDocument.Parse (xml);

‎tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Xamarin.Test {
99
[global::Android.Runtime.Register ("xamarin/test/BasePublicClass", DoNotGenerateAcw=true)]
1010
public partial class BasePublicClass : global::Java.Lang.Object {
1111

12-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/BasePublicClass", typeof (BasePublicClass));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/BasePublicClass", typeof (BasePublicClass));
1313
internal static new IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Xamarin.Test {
99
[global::Android.Runtime.Register ("xamarin/test/ExtendPublicClass", DoNotGenerateAcw=true)]
1010
public partial class ExtendPublicClass : global::Java.Lang.Object {
1111

12-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/ExtendPublicClass", typeof (ExtendPublicClass));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/ExtendPublicClass", typeof (ExtendPublicClass));
1313
internal static new IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Xamarin.Test {
99
[global::Android.Runtime.Register ("xamarin/test/PublicClass", DoNotGenerateAcw=true)]
1010
public partial class PublicClass : global::Java.Lang.Object {
1111

12-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicClass", typeof (PublicClass));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicClass", typeof (PublicClass));
1313
internal static new IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Xamarin.Test {
99
[global::Android.Runtime.Register ("xamarin/test/PublicFinalClass", DoNotGenerateAcw=true)]
1010
public sealed partial class PublicFinalClass : global::Xamarin.Test.BasePublicClass {
1111

12-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicFinalClass", typeof (PublicFinalClass));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicFinalClass", typeof (PublicFinalClass));
1313
internal static new IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/expected.ji/Adapters/Java.Lang.Object.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Java.Lang {
99
[global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)]
1010
public partial class Object {
1111

12-
internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object));
1313
internal static IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;

0 commit comments

Comments
 (0)