2009-06-08 Zoltan Varga <vargaz@gmail.com>

	* CSharpCodeProviderTest.cs: Avoid depending on the order in which
	GetManifestResourceNames () returns resource names.

svn path=/trunk/mcs/; revision=135672

diff --git a/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs b/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
index fd0f65bf86d374958d5c97e5eb977d381cb365b7..f34bcca6d6abec884a114ec3cf946fc6efd471ca 100644 (file)
--- a/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
+++ b/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
@@ -207,7 +207,7 @@ namespace MonoTests.Microsoft.CSharp
                        Assert.IsNotNull (resources, "#D1");
                        Assert.AreEqual (2, resources.Length, "#D2");
 
-                       Assert.AreEqual ("file1.cs", resources[0], "#E1");
+                       Assert.IsTrue (resources[0] == "file1.cs" || resources [0] == "file2.cs", "#E1");
                        Assert.IsNull (compiledAssembly.GetFile ("file1.cs"), "#E2");
                        Assert.IsNotNull (compiledAssembly.GetManifestResourceStream  ("file1.cs"), "#E3");
                        ManifestResourceInfo info = compiledAssembly.GetManifestResourceInfo ("file1.cs");
@@ -216,7 +216,7 @@ namespace MonoTests.Microsoft.CSharp
                        Assert.IsNull (info.ReferencedAssembly, "#E6");
                        Assert.AreEqual ((ResourceLocation.Embedded | ResourceLocation.ContainedInManifestFile), info.ResourceLocation, "#E7");
 
-                       Assert.AreEqual ("file2.cs", resources[1], "#F1");
+                       Assert.IsTrue (resources[1] == "file1.cs" || resources [1] == "file2.cs", "#F1");
                        try {
                                compiledAssembly.GetFile ("file2.cs");
                                Assert.Fail ("#F2");
@@ -298,7 +298,7 @@ namespace MonoTests.Microsoft.CSharp
                        Assert.IsNotNull (resources, "#D1");
                        Assert.AreEqual (2, resources.Length, "#D2");
 
-                       Assert.AreEqual ("file1.cs", resources[0], "#E1");
+                       Assert.IsTrue (resources[0] == "file1.cs" || resources [0] == "file2.cs", "#E1");
                        Assert.IsNull (compiledAssembly.GetFile ("file1.cs"), "#E2");
                        Assert.IsNotNull (compiledAssembly.GetManifestResourceStream  ("file1.cs"), "#E3");
                        ManifestResourceInfo info = compiledAssembly.GetManifestResourceInfo ("file1.cs");
@@ -307,7 +307,7 @@ namespace MonoTests.Microsoft.CSharp
                        Assert.IsNull (info.ReferencedAssembly, "#E6");
                        Assert.AreEqual ((ResourceLocation.Embedded | ResourceLocation.ContainedInManifestFile), info.ResourceLocation, "#E7");
 
-                       Assert.AreEqual ("file2.cs", resources[1], "#F1");
+                       Assert.IsTrue (resources[1] == "file1.cs" || resources [1] == "file2.cs", "#F1");
                        try {
                                compiledAssembly.GetFile ("file2.cs");
                                Assert.Fail ("#F2");

diff --git a/mcs/class/System/Test/Microsoft.CSharp/ChangeLog b/mcs/class/System/Test/Microsoft.CSharp/ChangeLog
index 9cdb460fef4d0f238b676f54ab6f90c7b3599a63..4a8356ffde1e2473da58607fc8b939680f94bd63 100644 (file)
--- a/mcs/class/System/Test/Microsoft.CSharp/ChangeLog
+++ b/mcs/class/System/Test/Microsoft.CSharp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-08  Zoltan Varga  <vargaz@gmail.com>
+
+       * CSharpCodeProviderTest.cs: Avoid depending on the order in which
+       GetManifestResourceNames () returns resource names.
+
 2008-05-09  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * CodeGeneratorFromTypeTest.cs: Added tests for