Skip to content

[jcw-gen] constructors need to respect ExportAttribute #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 13, 2017
Merged

[jcw-gen] constructors need to respect ExportAttribute #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...aCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,10 @@ public string Retval {
get { return retval; }
}

public string ThrowsDeclaration {
get { return ThrownTypeNames?.Length > 0 ? " throws " + String.Join (", ", ThrownTypeNames) : null; }
}

public readonly string JavaAccess;
public readonly string ManagedParameters;
public readonly string JniSignature;
Expand All @@ -757,7 +761,7 @@ void GenerateConstructor (Signature ctor, TextWriter sw)
sw.WriteLine ();
if (ctor.Annotations != null)
sw.WriteLine (ctor.Annotations);
sw.WriteLine ("\tpublic {0} ({1}) throws java.lang.Throwable", name, ctor.Params);
sw.WriteLine ("\tpublic {0} ({1}){2}", name, ctor.Params, ctor.ThrowsDeclaration);
sw.WriteLine ("\t{");
sw.WriteLine ("\t\tsuper ({0});", ctor.SuperCall);
#if MONODROID_TIMING
Expand Down Expand Up @@ -796,7 +800,7 @@ void GenerateMethod (Signature method, TextWriter sw)
sw.WriteLine ();
if (method.Annotations != null)
sw.WriteLine (method.Annotations);
sw.WriteLine ("\t{0} {1}{2} {3} ({4}){5}", method.IsExport ? method.JavaAccess : "public", method.IsStatic ? "static " : null, method.Retval, method.JavaName, method.Params, method.ThrownTypeNames != null ? " throws " + String.Join (", ", method.ThrownTypeNames) : null);
sw.WriteLine ("\t{0} {1}{2} {3} ({4}){5}", method.IsExport ? method.JavaAccess : "public", method.IsStatic ? "static " : null, method.Retval, method.JavaName, method.Params, method.ThrowsDeclaration);
sw.WriteLine ("\t{");
#if MONODROID_TIMING
sw.WriteLine ("\t\tandroid.util.Log.i(\"MonoDroid-Timing\", \"{0}.{1}: time: \"+java.lang.System.currentTimeMillis());", name, method.Name);
Expand Down
134 changes: 134 additions & 0 deletions ...rappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ extends java.lang.Object
""n_GetValue:()Ljava/lang/String;:__export__\n"" +
""n_methodNamesNotMangled:()V:__export__\n"" +
""n_CompletelyDifferentName:(Ljava/lang/String;I)Ljava/lang/String;:__export__\n"" +
""n_methodThatThrows:()V:__export__\n"" +
""n_methodThatThrowsEmptyArray:()V:__export__\n"" +
"""";
mono.android.Runtime.register (""Xamarin.Android.ToolsTests.ExportsMembers, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", ExportsMembers.class, __md_methods);
}
Expand Down Expand Up @@ -200,6 +202,22 @@ public java.lang.String attributeOverridesNames (java.lang.String p0, int p1)

private native java.lang.String n_CompletelyDifferentName (java.lang.String p0, int p1);


public void methodThatThrows () throws java.lang.Throwable
{
n_methodThatThrows ();
}

private native void n_methodThatThrows ();


public void methodThatThrowsEmptyArray ()
{
n_methodThatThrowsEmptyArray ();
}

private native void n_methodThatThrowsEmptyArray ();

private java.util.ArrayList refList;
public void monodroidAddReference (java.lang.Object obj)
{
Expand Down Expand Up @@ -353,6 +371,122 @@ public void monodroidClearReferences ()
refList.clear ();
}
}
";
Assert.AreEqual (expected, actual);
}

[Test]
public void GenerateConstructors ()
{
var actual = Generate (typeof (ExportsConstructors));
var expected = @"package register;


public class ExportsConstructors
extends java.lang.Object
implements
mono.android.IGCUserPeer
{
/** @hide */
public static final String __md_methods;
static {
__md_methods =
"""";
mono.android.Runtime.register (""Xamarin.Android.ToolsTests.ExportsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", ExportsConstructors.class, __md_methods);
}


public ExportsConstructors ()
{
super ();
if (getClass () == ExportsConstructors.class)
mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", """", this, new java.lang.Object[] { });
}


public ExportsConstructors (int p0)
{
super (p0);
if (getClass () == ExportsConstructors.class)
mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", """", this, new java.lang.Object[] { p0 });
}

private java.util.ArrayList refList;
public void monodroidAddReference (java.lang.Object obj)
{
if (refList == null)
refList = new java.util.ArrayList ();
refList.add (obj);
}

public void monodroidClearReferences ()
{
if (refList != null)
refList.clear ();
}
}
";
Assert.AreEqual (expected, actual);
}

[Test]
public void GenerateConstructors_WithThrows ()
{
var actual = Generate (typeof (ExportsThrowsConstructors));
var expected = @"package register;


public class ExportsThrowsConstructors
extends java.lang.Object
implements
mono.android.IGCUserPeer
{
/** @hide */
public static final String __md_methods;
static {
__md_methods =
"""";
mono.android.Runtime.register (""Xamarin.Android.ToolsTests.ExportsThrowsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", ExportsThrowsConstructors.class, __md_methods);
}


public ExportsThrowsConstructors () throws java.lang.Throwable
{
super ();
if (getClass () == ExportsThrowsConstructors.class)
mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsThrowsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", """", this, new java.lang.Object[] { });
}


public ExportsThrowsConstructors (int p0) throws java.lang.Throwable
{
super (p0);
if (getClass () == ExportsThrowsConstructors.class)
mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsThrowsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", """", this, new java.lang.Object[] { p0 });
}


public ExportsThrowsConstructors (java.lang.String p0)
{
super (p0);
if (getClass () == ExportsThrowsConstructors.class)
mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsThrowsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"", """", this, new java.lang.Object[] { p0 });
}

private java.util.ArrayList refList;
public void monodroidAddReference (java.lang.Object obj)
{
if (refList == null)
refList = new java.util.ArrayList ();
refList.add (obj);
}

public void monodroidClearReferences ()
{
if (refList != null)
refList.clear ();
}
}
";
Assert.AreEqual (expected, actual);
}
Expand Down
38 changes: 38 additions & 0 deletions ....JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ namespace Java.Lang {
class Object : Android.Runtime.IJavaObject
{
}

[Register ("java/lang/Throwable", DoNotGenerateAcw = true)]
class Throwable : Exception, Android.Runtime.IJavaObject
{
}
}

namespace Xamarin.Android.ToolsTests {
Expand Down Expand Up @@ -219,5 +224,38 @@ public string CompletelyDifferentName (string value, int count)
{
return value;
}

[Export (Throws = new [] { typeof (Java.Lang.Throwable) })]
public void methodThatThrows()
{
}

[Export (Throws = new Type [0])]
public void methodThatThrowsEmptyArray ()
{
}
}

[Register ("register.ExportsConstructors")]
class ExportsConstructors : Java.Lang.Object
{
[Export]
public ExportsConstructors () { }

[Export]
public ExportsConstructors (int value) { }
}

[Register ("register.ExportsThrowsConstructors")]
class ExportsThrowsConstructors : Java.Lang.Object
{
[Export (Throws = new [] { typeof (Java.Lang.Throwable) })]
public ExportsThrowsConstructors () { }

[Export (Throws = new [] { typeof (Java.Lang.Throwable) })]
public ExportsThrowsConstructors (int value) { }

[Export (Throws = new Type [0])]
public ExportsThrowsConstructors (string value) { }
}
}