diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2009-06-08 20:44:50 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2009-06-08 20:44:50 +0400 |
| commit | 98cc1c9d036ef62f9799526e80a6a6b4bd34d0c5 (patch) | |
| tree | 49de742b674d711562a7bca55afada1db30f9531 /mcs/class/System/Test | |
| parent | 23a7f085d6b690be8cea7e86ed958ba329d6412a (diff) | |
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
Diffstat (limited to 'mcs/class/System/Test')
| -rw-r--r-- | mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs | 8 | ||||
| -rw-r--r-- | mcs/class/System/Test/Microsoft.CSharp/ChangeLog | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs b/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs index fd0f65bf86d..f34bcca6d6a 100644 --- 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 9cdb460fef4..4a8356ffde1 100644 --- 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 |