Don't raise an exception if we can't find the src assembly.

These changes are released under the MIT license.

1 files changed, 22 insertions, 10 deletions

diff --git a/mcs/class/corlib/Test/System/AppDomainTest.cs b/mcs/class/corlib/Test/System/AppDomainTest.cs
index 9c950226391..8772d7afdea 100644
--- a/mcs/class/corlib/Test/System/AppDomainTest.cs
+++ b/mcs/class/corlib/Test/System/AppDomainTest.cs
@@ -3308,6 +3308,14 @@ namespace MonoTests.System
 			TestSerialization (tester, typeof (StuffToPick<int>).GetMethod ("GenericMethod").MakeGenericMethod (typeof (int)));
 		}
 
+		[Test]
+		public void ShadowCopyTypeGetTypeMissingAssemblyTest ()
+		{
+			ad = CreateShadowCopyAppDomain (tempDir, true);
+			CrossDomainTester tester = CreateCrossDomainTester (ad);
+			tester.AssertLoadMissingAssemblyType ();
+		}
+
 		private static AppDomain CreateTestDomain (string baseDirectory, bool assemblyResolver)
 		{
 			AppDomainSetup setup = new AppDomainSetup ();
@@ -3316,6 +3324,15 @@ namespace MonoTests.System
 			return CreateTestDomain (setup, assemblyResolver);
 		}
 
+		private static AppDomain CreateShadowCopyAppDomain (string baseDirectory, bool assemblyResolver)
+		{
+			AppDomainSetup setup = new AppDomainSetup ();
+			setup.ApplicationBase = baseDirectory;
+			setup.ApplicationName = "testdomain";
+			setup.ShadowCopyFiles = "true";
+			return CreateTestDomain (setup, assemblyResolver);
+		}
+
 		private static AppDomain CreateTestDomain (AppDomainSetup setup, bool assemblyResolver)
 		{
 			AppDomain ad = AppDomain.CreateDomain ("testdomain",
@@ -3423,22 +3440,17 @@ namespace MonoTests.System
 				}
 			}
 
-			public bool AssertFileLoadException (AssemblyName assemblyRef)
+			public void AssertLoadMissingAssemblyType ()
 			{
-				try {
-					AppDomain.CurrentDomain.Load (assemblyRef);
-					return false;
-				} catch (FileLoadException) {
-					return true;
-				}
+				Assert.IsNull (Type.GetType ("A.B.C, MissingAssembly"));
 			}
 
-			public bool AssertFileNotFoundException (AssemblyName assemblyRef)
+			public bool AssertFileLoadException (AssemblyName assemblyRef)
 			{
 				try {
 					AppDomain.CurrentDomain.Load (assemblyRef);
 					return false;
-				} catch (FileNotFoundException) {
+				} catch (FileLoadException) {
 					return true;
 				}
 			}
@@ -3608,4 +3620,4 @@ namespace MonoTests.System
 	}
 }
 
-#endif
\ No newline at end of file
+#endif