[corlib] Makes GetReferencedAssemblies test more reliable

[mono.git] / mcs / class / corlib / Test / System.Reflection / AssemblyTest.cs

diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
index d8bbbeb169c09ad09f4ef3272961113f79f53f62..1fcbf8a410b04497f70cc169f2a6588a62755970 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
@@ -322,7 +322,6 @@ namespace MonoTests.System.Reflection
 
                [Test]
                [Category ("AndroidNotWorking")] // Assemblies in Xamarin.Android cannot be accessed as FileStream
-               [Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
                public void GetFiles_False ()
                {
                        Assembly corlib = typeof (int).Assembly;
@@ -336,7 +335,6 @@ namespace MonoTests.System.Reflection
 
                [Test]
                [Category ("AndroidNotWorking")] // Assemblies in Xamarin.Android cannot be accessed as FileStream
-               [Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
                public void GetFiles_True ()
                {
                        Assembly corlib = typeof (int).Assembly;
@@ -504,20 +502,17 @@ namespace MonoTests.System.Reflection
                public void GetReferencedAssemblies ()
                {
                        Assembly corlib_test = Assembly.GetExecutingAssembly ();
-                       AssemblyName[] names = corlib_test.GetReferencedAssemblies ();
-                       foreach (AssemblyName an in names) {
-                               Assert.IsNull (an.CodeBase, "CodeBase");
-                               Assert.IsNotNull (an.CultureInfo, "CultureInfo");
-                               Assert.IsNull (an.EscapedCodeBase, "EscapedCodeBase");
-                               Assert.AreEqual (AssemblyNameFlags.None, an.Flags, "Flags");
-                               Assert.IsNotNull (an.FullName, "FullName");
-                               Assert.AreEqual (AssemblyHashAlgorithm.SHA1, an.HashAlgorithm, "HashAlgorithm");
-                               Assert.IsNull (an.KeyPair, "KeyPair");
-                               Assert.IsNotNull (an.Name, "Name");
-                               Assert.IsNotNull (an.Version, "Version");
-                               Assert.AreEqual (AssemblyVersionCompatibility.SameMachine, 
-                                       an.VersionCompatibility, "VersionCompatibility");
-                       }
+                       AssemblyName an = corlib_test.GetReferencedAssemblies ().First (l => l.Name == "mscorlib");
+                       Assert.IsNull (an.CodeBase, "CodeBase");
+                       Assert.IsNotNull (an.CultureInfo, "CultureInfo");
+                       Assert.IsNull (an.EscapedCodeBase, "EscapedCodeBase");
+                       Assert.AreEqual (AssemblyNameFlags.None, an.Flags, "Flags");
+                       Assert.IsNotNull (an.FullName, "FullName");
+                       Assert.AreEqual (AssemblyHashAlgorithm.SHA1, an.HashAlgorithm, "HashAlgorithm");
+                       Assert.IsNull (an.KeyPair, "KeyPair");
+                       Assert.IsNotNull (an.Name, "Name");
+                       Assert.IsNotNull (an.Version, "Version");
+                       Assert.AreEqual (AssemblyVersionCompatibility.SameMachine, an.VersionCompatibility, "VersionCompatibility");
                }
 
 #if !MONOTOUCH && !FULL_AOT_RUNTIME // Reflection.Emit is not supported.