X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2Fassemblyresolve_event4.cs;h=b5b73f50cb08a6d067d039c2c8b2b42c48c88f2f;hb=15c0640201fee8407c4a945077e4bc41446bcac7;hp=fa12f01984204dc86dd0fa9aed0f5e9b2242365d;hpb=559ad5b34bc086b51af2e589b32ea2eae0f78820;p=mono.git

diff --git a/mono/tests/assemblyresolve_event4.cs b/mono/tests/assemblyresolve_event4.cs
index fa12f019842..b5b73f50cb0 100644
--- a/mono/tests/assemblyresolve_event4.cs
+++ b/mono/tests/assemblyresolve_event4.cs
@@ -9,7 +9,7 @@ class App
 		AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler (MyResolveEventHandler);
 
 		try {
-			var a = Assembly.Load ("test");
+			var a = Assembly.Load ("Test");
 			foreach (Type t in a.GetTypes ()) {
 				Console.WriteLine ("pp: " + t + " " + t.BaseType);
 			}
@@ -23,12 +23,11 @@ class App
 
 	static Assembly MyResolveEventHandler (object sender, ResolveEventArgs args)
 	{
-		var path = Path.Combine (Directory.GetCurrentDirectory (), "assemblyresolve", "deps");
-		if (args.Name == "test" && args.RequestingAssembly == null)
-			return Assembly.LoadFile (Path.Combine (path, "test.dll"));
-		if (args.Name == "TestBase, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" && args.RequestingAssembly.GetName ().Name == "test")
-			return Assembly.LoadFile (Path.Combine (path, "TestBase.dll"));
+		if (args.Name == "Test" && args.RequestingAssembly == null)
+			return Assembly.LoadFile (Path.Combine (Directory.GetCurrentDirectory (), "assemblyresolve_deps", "Test.dll"));
+		if (args.Name == "TestBase, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" && args.RequestingAssembly.GetName ().Name == "Test")
+			return Assembly.LoadFile (Path.Combine (Directory.GetCurrentDirectory (), "assemblyresolve_deps", "TestBase.dll"));
 
-		throw new InvalidOperationException (String.Format ("Unexpected parameter combination {0} {1}", args.Name, args.RequestingAssembly));
+		throw new InvalidOperationException (String.Format ("Unexpected parameter combination Name=\"{0}\" RequestingAssembly=\"{1}\"", args.Name, args.RequestingAssembly));
 	}
 }