[Java.Interop-Tests] Allow consumption by Xamarin.Android (dotnet#454)

jonpryor · web-flow · commit be581591d0a9 · 2019-07-29T15:25:07.000-04:00
Context: dotnet/android#3393 Allow the Java.Interop unit tests to be consumed by Xamarin.Android. In particular, this means: * "Proper" exceptions such as `Java.Lang.ClassNotFoundException` are thrown, not "based" `JavaException` types. * `Xamarin.Android.NUnitLite.dll` doesn't provide `[OneTimeSetUpAttribute]`/etc., so use `[TestFixtureSetUpAttribute]` instead. * Xamarin.Android doesn't currently support `Java.Interop.MarshalMemberBuilder`, so any tests which require it will not work. "Hide" those behind `#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT`.
diff --git a/src/Java.Interop/Tests/Java.Interop/JavaArrayContract.cs b/src/Java.Interop/Tests/Java.Interop/JavaArrayContract.cs
@@ -12,13 +12,21 @@ public abstract class JavaArrayContract<T> : ListContract<T>
 	{
 		int lrefStartCount;
 
+#if __ANDROID__
+		[TestFixtureSetUp]
+#else   // __ANDROID__
 		[OneTimeSetUp]
+#endif  // __ANDROID__
 		public void StartArrayTests ()
 		{
 			lrefStartCount  = JniEnvironment.LocalReferenceCount;
 		}
 
+#if __ANDROID__
+		[TestFixtureTearDown]
+#else   // __ANDROID__
 		[OneTimeTearDown]
+#endif  // __ANDROID__
 		public void EndArrayTests ()
 		{
 			int lref    = JniEnvironment.LocalReferenceCount;
diff --git a/src/Java.Interop/Tests/Java.Interop/JavaExceptionTests.cs b/src/Java.Interop/Tests/Java.Interop/JavaExceptionTests.cs
@@ -24,6 +24,18 @@ public void StackTrace ()
 						// Dalvik, JVM
 						e.JavaStackTrace.StartsWith ("java.lang.NoClassDefFoundError: this/type/had/better/not/exist", StringComparison.Ordinal));
 				e.Dispose ();
+#if __ANDROID__
+			} catch (Java.Lang.Throwable e) {
+				Assert.IsTrue (
+						string.Equals ("this/type/had/better/not/exist", e.Message, StringComparison.OrdinalIgnoreCase) ||
+						e.Message.StartsWith ("Didn't find class \"this.type.had.better.not.exist\" on path: DexPathList"));
+				Assert.IsTrue (
+						// ART
+						e.StackTrace.Contains ("java.lang.ClassNotFoundException: ", StringComparison.Ordinal) ||
+						// Dalvik, JVM
+						e.StackTrace.Contains ("java.lang.NoClassDefFoundError: this/type/had/better/not/exist", StringComparison.Ordinal));
+				e.Dispose ();
+#endif  // __ANDROID__
 			}
 		}
 
diff --git a/src/Java.Interop/Tests/Java.Interop/JavaObjectArrayTest.cs b/src/Java.Interop/Tests/Java.Interop/JavaObjectArrayTest.cs
@@ -130,7 +130,11 @@ public class JavaObjectArray_object_ContractTest : JavaObjectArrayContractTest<o
 
 		int grefStartCount;
 
+#if __ANDROID__
+		[TestFixtureSetUp]
+#else   // __ANDROID__
 		[OneTimeSetUp]
+#endif  // __ANDROID__
 		public void BeginCheckGlobalRefCount ()
 		{
 			// So that the JavaProxyObject.TypeRef GREF isn't counted.
@@ -139,7 +143,11 @@ public void BeginCheckGlobalRefCount ()
 			grefStartCount  = JniEnvironment.Runtime.GlobalReferenceCount;
 		}
 
+#if __ANDROID__
+		[TestFixtureTearDown]
+#else   // __ANDROID__
 		[OneTimeTearDown]
+#endif  // __ANDROID__
 		public void EndCheckGlobalRefCount ()
 		{
 			int gref    = JniEnvironment.Runtime.GlobalReferenceCount;
diff --git a/src/Java.Interop/Tests/Java.Interop/JavaObjectTest.cs b/src/Java.Interop/Tests/Java.Interop/JavaObjectTest.cs
@@ -166,7 +166,11 @@ public void Ctor_Exceptions ()
 
 			// Note: This may break if/when JavaVM provides "default"
 			Assert.Throws<NotSupportedException> (() => new JavaObjectWithNoJavaPeer ());
+#if __ANDROID__
+			Assert.Throws<Java.Lang.ClassNotFoundException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
+#else   // !__ANDROID__
 			Assert.Throws<JavaException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
+#endif  // !__ANDROID__
 		}
 
 		[Test]
diff --git a/src/Java.Interop/Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs b/src/Java.Interop/Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
@@ -126,6 +126,7 @@ public void GetValue_ReturnsNullWithInvalidSafeHandle ()
 			Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.GetValue (ref invalid, JniObjectReferenceOptions.CopyAndDispose));
 		}
 
+#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 		[Test]
 		public unsafe void GetValue_FindBestMatchType ()
 		{
@@ -138,6 +139,7 @@ public unsafe void GetValue_FindBestMatchType ()
 				}
 			}
 		}
+#endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 	}
 }
 
diff --git a/src/Java.Interop/Tests/Java.Interop/JniTypeManagerTests.cs b/src/Java.Interop/Tests/Java.Interop/JniTypeManagerTests.cs
@@ -75,7 +75,10 @@ public void GetTypeSignature_Type ()
 			AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>),         "[[I",                  true,   2);
 			AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>[]),       "[[[I",                 true,   3);
 
+#if !__ANDROID__
+			// Re-enable once typemap files contain `JavaObject` subclasses, not just Java.Lang.Object subclasses
 			AssertGetJniTypeInfoForType (typeof (GenericHolder<int>),       GenericHolder<int>.JniTypeName,    false,   0);
+#endif  // !__ANDROID__
 		}
 
 		static void AssertGetJniTypeInfoForType (Type type, string jniType, bool isKeyword, int arrayRank)
diff --git a/src/Java.Interop/Tests/Java.Interop/JniTypeTest.cs b/src/Java.Interop/Tests/Java.Interop/JniTypeTest.cs
@@ -33,7 +33,11 @@ public unsafe void Sanity ()
 		[Test]
 		public void Ctor_ThrowsIfTypeNotFound ()
 		{
+#if __ANDROID__
+			Assert.Throws<Java.Lang.ClassNotFoundException> (() => new JniType ("__this__/__type__/__had__/__better__/__not__/__Exist__")).Dispose ();
+#else   // __ANDROID__
 			Assert.Throws<JavaException> (() => new JniType ("__this__/__type__/__had__/__better__/__not__/__Exist__")).Dispose ();
+#endif  // __ANDROID__
 		}
 
 		[Test]
@@ -92,27 +96,29 @@ public void IsAssignableFrom ()
 		}
 
 		[Test]
-		public void IsInstanceOfType ()
+		public unsafe void IsInstanceOfType ()
 		{
-			using (var t = new JniType ("java/lang/Object"))
-			using (var b = new TestType ()) {
-				Assert.IsTrue (t.IsInstanceOfType (b.PeerReference));
-			}
-		}
-
-		[Test]
-		public void ObjectBinding ()
-		{
-			using (var b = new TestType ()) {
-				Console.WriteLine ("# ObjectBinding: {0}", b.ToString ());
+			using (var Object_class = new JniType ("java/lang/Object"))
+			using (var String_class = new JniType ("java/lang/String")) {
+				var String_ctor = String_class.GetConstructor ("()V");
+				var s           = String_class.NewObject (String_ctor, null);
+				try {
+					Assert.IsTrue (Object_class.IsInstanceOfType (s), "java.lang.String IS-NOT-A java.lang.Object?!");
+				} finally {
+					JniObjectReference.Dispose (ref s);
+				}
 			}
 		}
 
 		[Test]
 		public void InvalidSignatureThrowsJniException ()
 		{
 			using (var Integer_class = new JniType ("java/lang/Integer")) {
+#if __ANDROID__
+				Assert.Throws<Java.Lang.NoSuchMethodError> (() => Integer_class.GetConstructor ("(C)V")).Dispose ();
+#else   // __ANDROID__
 				Assert.Throws<JavaException> (() => Integer_class.GetConstructor ("(C)V")).Dispose ();
+#endif  // __ANDROID__
 			}
 		}
 
@@ -122,6 +128,7 @@ public void GetStaticFieldID ()
 			using (var System_class = new JniType ("java/lang/System")) {
 				var System_in = System_class.GetStaticField ("in", "Ljava/io/InputStream;");
 				Assert.IsNotNull (System_in);
+				Assert.IsTrue (System_in.ID != IntPtr.Zero);
 			}
 		}
 
diff --git a/src/Java.Interop/Tests/Java.Interop/TestType.cs b/src/Java.Interop/Tests/Java.Interop/TestType.cs
@@ -8,6 +8,7 @@
 
 namespace Java.InteropTests
 {
+#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 	[JniTypeSignature (TestType.JniTypeName)]
 	public partial class TestType : JavaObject
 	{
@@ -204,5 +205,6 @@ public string GetStringValue (int value)
 			return value.ToString ();
 		}
 	}
+#endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 }
 
diff --git a/src/Java.Interop/Tests/Java.Interop/TestTypeTests.cs b/src/Java.Interop/Tests/Java.Interop/TestTypeTests.cs
@@ -7,18 +7,27 @@
 
 namespace Java.InteropTests
 {
+#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 	[TestFixture]
 	public class TestTypeTests : JavaVMFixture
 	{
 		int lrefStartCount;
 
+#if __ANDROID__
+		[TestFixtureSetUp]
+#else   // __ANDROID__
 		[OneTimeSetUp]
+#endif  // __ANDROID__
 		public void StartArrayTests ()
 		{
 			lrefStartCount  = JniEnvironment.LocalReferenceCount;
 		}
 
+#if __ANDROID__
+		[TestFixtureTearDown]
+#else   // __ANDROID__
 		[OneTimeTearDown]
+#endif  // __ANDROID__
 		public void EndArrayTests ()
 		{
 			int lref    = JniEnvironment.LocalReferenceCount;
@@ -52,6 +61,14 @@ public void TestCase ()
 			}
 		}
 
+		[Test]
+		public void ObjectBinding ()
+		{
+			using (var b = new TestType ()) {
+				Console.WriteLine ("# ObjectBinding: {0}", b.ToString ());
+			}
+		}
+
 		[Test]
 		public void UpdateInt32Array ()
 		{
@@ -143,5 +160,6 @@ public void PropogateException ()
 			}
 		}
 	}
+#endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,21 @@ public abstract class JavaArrayContract<T> : ListContract<T>`
`12`	`12`	`{`
`13`	`13`	`int lrefStartCount;`
`14`	`14`
	`15`	`+#if __ANDROID__`
	`16`	`+ [TestFixtureSetUp]`
	`17`	`+#else // __ANDROID__`
`15`	`18`	`[OneTimeSetUp]`
	`19`	`+#endif // __ANDROID__`
`16`	`20`	`public void StartArrayTests ()`
`17`	`21`	`{`
`18`	`22`	`lrefStartCount = JniEnvironment.LocalReferenceCount;`
`19`	`23`	`}`
`20`	`24`
	`25`	`+#if __ANDROID__`
	`26`	`+ [TestFixtureTearDown]`
	`27`	`+#else // __ANDROID__`
`21`	`28`	`[OneTimeTearDown]`
	`29`	`+#endif // __ANDROID__`
`22`	`30`	`public void EndArrayTests ()`
`23`	`31`	`{`
`24`	`32`	`int lref = JniEnvironment.LocalReferenceCount;`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ public void GetValue_ReturnsNullWithInvalidSafeHandle ()`
`126`	`126`	`Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.GetValue (ref invalid, JniObjectReferenceOptions.CopyAndDispose));`
`127`	`127`	`}`
`128`	`128`
	`129`	`+#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT`
`129`	`130`	`[Test]`
`130`	`131`	`public unsafe void GetValue_FindBestMatchType ()`
`131`	`132`	`{`
`@@ -138,6 +139,7 @@ public unsafe void GetValue_FindBestMatchType ()`
`138`	`139`	`}`
`139`	`140`	`}`
`140`	`141`	`}`
	`142`	`+#endif // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT`
`141`	`143`	`}`
`142`	`144`	`}`
`143`	`145`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,10 @@ public void GetTypeSignature_Type ()`
`75`	`75`	`AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>), "[[I", true, 2);`
`76`	`76`	`AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>[]), "[[[I", true, 3);`
`77`	`77`
	`78`	`+#if !__ANDROID__`
	`79`	+ // Re-enable once typemap files contain `JavaObject` subclasses, not just Java.Lang.Object subclasses
`78`	`80`	`AssertGetJniTypeInfoForType (typeof (GenericHolder<int>), GenericHolder<int>.JniTypeName, false, 0);`
	`81`	`+#endif // !__ANDROID__`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`static void AssertGetJniTypeInfoForType (Type type, string jniType, bool isKeyword, int arrayRank)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,11 @@ public unsafe void Sanity ()`
`33`	`33`	`[Test]`
`34`	`34`	`public void Ctor_ThrowsIfTypeNotFound ()`
`35`	`35`	`{`
	`36`	`+#if __ANDROID__`
	`37`	`+ Assert.Throws<Java.Lang.ClassNotFoundException> (() => new JniType ("__this__/__type__/__had__/__better__/__not__/__Exist__")).Dispose ();`
	`38`	`+#else // __ANDROID__`
`36`	`39`	`Assert.Throws<JavaException> (() => new JniType ("__this__/__type__/__had__/__better__/__not__/__Exist__")).Dispose ();`
	`40`	`+#endif // __ANDROID__`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`[Test]`
`@@ -92,27 +96,29 @@ public void IsAssignableFrom ()`
`92`	`96`	`}`
`93`	`97`
`94`	`98`	`[Test]`
`95`		`- public void IsInstanceOfType ()`
	`99`	`+ public unsafe void IsInstanceOfType ()`
`96`	`100`	`{`
`97`		`- using (var t = new JniType ("java/lang/Object"))`
`98`		`- using (var b = new TestType ()) {`
`99`		`- Assert.IsTrue (t.IsInstanceOfType (b.PeerReference));`
`100`		`- }`
`101`		`- }`
`102`		`-`
`103`		`- [Test]`
`104`		`- public void ObjectBinding ()`
`105`		`- {`
`106`		`- using (var b = new TestType ()) {`
`107`		`- Console.WriteLine ("# ObjectBinding: {0}", b.ToString ());`
	`101`	`+ using (var Object_class = new JniType ("java/lang/Object"))`
	`102`	`+ using (var String_class = new JniType ("java/lang/String")) {`
	`103`	`+ var String_ctor = String_class.GetConstructor ("()V");`
	`104`	`+ var s = String_class.NewObject (String_ctor, null);`
	`105`	`+ try {`
	`106`	`+ Assert.IsTrue (Object_class.IsInstanceOfType (s), "java.lang.String IS-NOT-A java.lang.Object?!");`
	`107`	`+ } finally {`
	`108`	`+ JniObjectReference.Dispose (ref s);`
	`109`	`+ }`
`108`	`110`	`}`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`[Test]`
`112`	`114`	`public void InvalidSignatureThrowsJniException ()`
`113`	`115`	`{`
`114`	`116`	`using (var Integer_class = new JniType ("java/lang/Integer")) {`
	`117`	`+#if __ANDROID__`
	`118`	`+ Assert.Throws<Java.Lang.NoSuchMethodError> (() => Integer_class.GetConstructor ("(C)V")).Dispose ();`
	`119`	`+#else // __ANDROID__`
`115`	`120`	`Assert.Throws<JavaException> (() => Integer_class.GetConstructor ("(C)V")).Dispose ();`
	`121`	`+#endif // __ANDROID__`
`116`	`122`	`}`
`117`	`123`	`}`
`118`	`124`
`@@ -122,6 +128,7 @@ public void GetStaticFieldID ()`
`122`	`128`	`using (var System_class = new JniType ("java/lang/System")) {`
`123`	`129`	`var System_in = System_class.GetStaticField ("in", "Ljava/io/InputStream;");`
`124`	`130`	`Assert.IsNotNull (System_in);`
	`131`	`+ Assert.IsTrue (System_in.ID != IntPtr.Zero);`
`125`	`132`	`}`
`126`	`133`	`}`
`127`	`134`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace Java.InteropTests`
`10`	`10`	`{`
	`11`	`+#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT`
`11`	`12`	`[JniTypeSignature (TestType.JniTypeName)]`
`12`	`13`	`public partial class TestType : JavaObject`
`13`	`14`	`{`
`@@ -204,5 +205,6 @@ public string GetStringValue (int value)`
`204`	`205`	`return value.ToString ();`
`205`	`206`	`}`
`206`	`207`	`}`
	`208`	`+#endif // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT`
`207`	`209`	`}`
`208`	`210`
Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,27 @@`
`7`	`7`
`8`	`8`	`namespace Java.InteropTests`
`9`	`9`	`{`
	`10`	`+#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT`
`10`	`11`	`[TestFixture]`
`11`	`12`	`public class TestTypeTests : JavaVMFixture`
`12`	`13`	`{`
`13`	`14`	`int lrefStartCount;`
`14`	`15`
	`16`	`+#if __ANDROID__`
	`17`	`+ [TestFixtureSetUp]`
	`18`	`+#else // __ANDROID__`
`15`	`19`	`[OneTimeSetUp]`
	`20`	`+#endif // __ANDROID__`
`16`	`21`	`public void StartArrayTests ()`
`17`	`22`	`{`
`18`	`23`	`lrefStartCount = JniEnvironment.LocalReferenceCount;`
`19`	`24`	`}`
`20`	`25`
	`26`	`+#if __ANDROID__`
	`27`	`+ [TestFixtureTearDown]`
	`28`	`+#else // __ANDROID__`
`21`	`29`	`[OneTimeTearDown]`
	`30`	`+#endif // __ANDROID__`
`22`	`31`	`public void EndArrayTests ()`
`23`	`32`	`{`
`24`	`33`	`int lref = JniEnvironment.LocalReferenceCount;`
`@@ -52,6 +61,14 @@ public void TestCase ()`
`52`	`61`	`}`
`53`	`62`	`}`
`54`	`63`
	`64`	`+ [Test]`
	`65`	`+ public void ObjectBinding ()`
	`66`	`+ {`
	`67`	`+ using (var b = new TestType ()) {`
	`68`	`+ Console.WriteLine ("# ObjectBinding: {0}", b.ToString ());`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+`
`55`	`72`	`[Test]`
`56`	`73`	`public void UpdateInt32Array ()`
`57`	`74`	`{`
`@@ -143,5 +160,6 @@ public void PropogateException ()`
`143`	`160`	`}`
`144`	`161`	`}`
`145`	`162`	`}`
	`163`	`+#endif // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT`
`146`	`164`	`}`
`147`	`165`