mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.20.0.180

Browse Source 
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mcs/class/corlib/Test/System.Resources/ResourceManagerTest.cs
View File

@@ -41,6 +41,8 @@ using System.IO;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Resources
{
[TestFixture]
@@ -350,7 +352,7 @@ namespace MonoTests.System.Resources
public void CreateFileBasedResourceManager_BaseName_Resources ()
{
ResourceManager rm = ResourceManager.CreateFileBasedResourceManager (
"MyResources.resources", "Test/resources", null);
"MyResources.resources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
try {
rm.GetResourceSet (CultureInfo.InvariantCulture, true, true);
Assert.Fail ("#1");
@@ -385,7 +387,7 @@ namespace MonoTests.System.Resources
public void CreateFileBasedResourceManager_UsingResourceSet_Invalid ()
{
ResourceManager rm = ResourceManager.CreateFileBasedResourceManager (
"MyResources", "Test/resources", typeof (string));
"MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), typeof (string));
Assert.IsNotNull (rm.BaseName, "#1");
Assert.AreEqual ("MyResources", rm.BaseName, "#2");
Assert.IsFalse (rm.IgnoreCase, "#3");
@@ -397,7 +399,7 @@ namespace MonoTests.System.Resources
public void CreateFileBasedResourceManager_UsingResourceSet_Null ()
{
ResourceManager rm = ResourceManager.CreateFileBasedResourceManager (
"MyResources", "Test/resources", (Type) null);
"MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), (Type) null);
Assert.IsNotNull (rm.BaseName, "#1");
Assert.AreEqual ("MyResources", rm.BaseName, "#2");
Assert.IsFalse (rm.IgnoreCase, "#3");
@@ -412,7 +414,7 @@ namespace MonoTests.System.Resources
public void GetObject ()
{
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
CreateFileBasedResourceManager ("MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
Assert.AreEqual ("Hello World", rm.GetObject ("HelloWorld"), "#A1");
@@ -474,7 +476,7 @@ namespace MonoTests.System.Resources
{
Thread.CurrentThread.CurrentUICulture = new CultureInfo ("de");
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
CreateFileBasedResourceManager ("MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
ResourceSet rs = rm.GetResourceSet (new CultureInfo ("de"),
true, true);
rs.Dispose ();
@@ -545,7 +547,7 @@ namespace MonoTests.System.Resources
public void GetString ()
{
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
CreateFileBasedResourceManager ("MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
Assert.AreEqual ("Hello World", rm.GetString ("HelloWorld"), "#A1");
@@ -607,7 +609,7 @@ namespace MonoTests.System.Resources
public void GetString_ResourceSet_Disposed ()
{
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
CreateFileBasedResourceManager ("MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
ResourceSet rs = rm.GetResourceSet (new CultureInfo ("de"),
true, true);
rs.Dispose ();
@@ -622,7 +624,7 @@ namespace MonoTests.System.Resources
{
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("StreamTest", "Test/resources", null);
CreateFileBasedResourceManager ("StreamTest", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
UnmanagedMemoryStream s = rm.GetStream ("test");
Assert.AreEqual (22, s.Length, "#A1");
Assert.AreEqual ("veritas vos liberabit\n", new StreamReader (s).ReadToEnd (), "#A2");
@@ -647,7 +649,7 @@ namespace MonoTests.System.Resources
{
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("StreamTest", "Test/resources", null);
CreateFileBasedResourceManager ("StreamTest", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
UnmanagedMemoryStream s = rm.GetStream ("test", new CultureInfo ("ja-JP"));
Assert.AreEqual (22, s.Length, "#1");
Assert.AreEqual ("Veritas Vos Liberabit\n", new StreamReader (s).ReadToEnd (), "#2");
@@ -700,7 +702,7 @@ namespace MonoTests.System.Resources
public void GetStream_Resource_DoesNotExist ()
{
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("StreamTest", "Test/resources", null);
CreateFileBasedResourceManager ("StreamTest", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
Assert.IsNull (rm.GetStream ("HelloWorld"));
rm.ReleaseAllResources ();
}
@@ -710,7 +712,7 @@ namespace MonoTests.System.Resources
public void GetStream_Resource_NonStream ()
{
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
CreateFileBasedResourceManager ("MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
try {
rm.GetStream ("HelloWorld", CultureInfo.InvariantCulture);
@@ -730,7 +732,7 @@ namespace MonoTests.System.Resources
public void GetStream_ResourceFile_DoesNotExist ()
{
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("DoesNotExist", "Test/resources", null);
CreateFileBasedResourceManager ("DoesNotExist", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
try {
rm.GetStream ("HelloWorld");
Assert.Fail ("#1");
@@ -750,7 +752,7 @@ namespace MonoTests.System.Resources
{
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("StreamTest", "Test/resources", null);
CreateFileBasedResourceManager ("StreamTest", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
ResourceSet rs = rm.GetResourceSet (new CultureInfo ("ja-JP"),
true, true);
rs.Dispose ();
@@ -773,7 +775,7 @@ namespace MonoTests.System.Resources
public void IgnoreCase ()
{
ResourceManager rm = ResourceManager.
CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
CreateFileBasedResourceManager ("MyResources", TestResourceHelper.GetFullPathOfResource ("Test/resources"), null);
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
Assert.IsFalse (rm.IgnoreCase, "#A1");
@@ -785,7 +787,6 @@ namespace MonoTests.System.Resources
}
[Test]
[Category ("SatelliteAssembliesNotWorking")]
public void TestSatellites ()
{
ResourceManager manager = new ResourceManager("Resources", GetType ().Assembly);

13
mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
View File

@@ -16,6 +16,8 @@ using System.Resources;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Resources
{
[TestFixture]
@@ -28,9 +30,8 @@ namespace MonoTests.System.Resources
[TestFixtureSetUp]
public void FixtureSetUp ()
{
string base_path = Path.Combine (Directory.GetCurrentDirectory (), Path.Combine ("Test", "resources"));
m_ResourceFile = Path.Combine (base_path, "MyResources.resources");
m_BadResourceFile = Path.Combine (base_path, "Empty.resources");
m_ResourceFile = TestResourceHelper.GetFullPathOfResource ("Test/resources/MyResources.resources");
m_BadResourceFile = TestResourceHelper.GetFullPathOfResource ("Test/resources/Empty.resources");
}
[SetUp]
@@ -231,7 +232,7 @@ namespace MonoTests.System.Resources
[Category ("MobileNotWorking")]
public void GetResourceDataNullName ()
{
ResourceReader r = new ResourceReader ("Test/resources/StreamTest.resources");
ResourceReader r = new ResourceReader (TestResourceHelper.GetFullPathOfResource ("Test/resources/StreamTest.resources"));
string type;
byte [] bytes;
@@ -257,7 +258,7 @@ namespace MonoTests.System.Resources
byte [] t2 = new byte [] {0x0A, 0x73, 0x6F, 0x6D, 0x65, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67};
byte [] t3 = new byte [] {0x0E, 0x00, 0x00, 0x00, 0x73, 0x68, 0x61, 0x72, 0x64, 0x65, 0x6E, 0x66, 0x72, 0x65, 0x75, 0x64, 0x65, 0x0A};
ResourceReader r = new ResourceReader ("Test/resources/StreamTest.resources");
ResourceReader r = new ResourceReader (TestResourceHelper.GetFullPathOfResource ("Test/resources/StreamTest.resources"));
Hashtable items = new Hashtable ();
foreach (DictionaryEntry de in r) {
string type;
@@ -307,7 +308,7 @@ namespace MonoTests.System.Resources
0x68, 0x74, 0x00, 0x00, 0x08, 0x08, 0x02, 0x00,
0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00,
0x00, 0x00, 0x0B};
ResourceReader r = new ResourceReader ("Test/resources/bug81759.resources");
ResourceReader r = new ResourceReader (TestResourceHelper.GetFullPathOfResource ("Test/resources/bug81759.resources"));
string type;
byte [] bytes;
r.GetResourceData ("imageList.ImageSize", out type, out bytes);

8
mcs/class/corlib/Test/System.Resources/ResourceWriterTest.cs
View File

@@ -16,6 +16,8 @@ using System.Text;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Resources
{
[TestFixture]
@@ -356,11 +358,11 @@ namespace MonoTests.System.Resources
stream.Write (buff, 0, buff.Length);
stream.Position = 0;
ResourceWriter rw = new ResourceWriter ("Test/resources/AddResource_Stream.resources");
ResourceWriter rw = new ResourceWriter (TestResourceHelper.GetFullPathOfResource ("Test/resources/AddResource_Stream.resources"));
rw.AddResource ("Name", (object)stream);
rw.Close ();
ResourceReader rr = new ResourceReader ("Test/resources/AddResource_Stream.resources");
ResourceReader rr = new ResourceReader (TestResourceHelper.GetFullPathOfResource ("Test/resources/AddResource_Stream.resources"));
IDictionaryEnumerator enumerator = rr.GetEnumerator ();
// Get the first element
@@ -587,7 +589,7 @@ namespace MonoTests.System.Resources
{
MemoryStream ms = new MemoryStream ();
using (ResourceReader xr = new ResourceReader (
"Test/resources/bug81759.resources")) {
TestResourceHelper.GetFullPathOfResource ("Test/resources/bug81759.resources"))) {
ResourceWriter rw = new ResourceWriter (ms);
foreach (DictionaryEntry de in xr)
rw.AddResource ((string) de.Key, de.Value);