Imported Upstream version 5.20.0.180

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

View File

@ -38,9 +38,10 @@ using System.Collections;
using System.Drawing;
using System.Runtime.Serialization.Formatters.Binary;
using MonoTests.Helpers;
namespace MonoTests.System.Resources {
public class ResourcesTestHelper {
string tempFileWithIcon = null;
string tempFileWithSerializable = null;
[SetUp]
@ -82,45 +83,19 @@ namespace MonoTests.System.Resources {
public ResXDataNode GetNodeEmdeddedIcon ()
{
Stream input = typeof (ResXDataNodeTest).Assembly.
GetManifestResourceStream ("32x32.ico");
Icon ico = new Icon (input);
Icon ico = new Icon (TestResourceHelper.GetStreamOfResource ("Test/resources/32x32.ico"));
ResXDataNode node = new ResXDataNode ("test", ico);
return node;
}
public ResXDataNode GetNodeFileRefToIcon ()
{
tempFileWithIcon = Path.GetTempFileName (); // remember to delete file in teardown
Path.ChangeExtension (tempFileWithIcon, "ico");
WriteEmbeddedResource ("32x32.ico", tempFileWithIcon);
ResXFileRef fileRef = new ResXFileRef (tempFileWithIcon, typeof (Icon).AssemblyQualifiedName);
ResXFileRef fileRef = new ResXFileRef (TestResourceHelper.GetFullPathOfResource ("Test/resources/32x32.ico"), typeof (Icon).AssemblyQualifiedName);
ResXDataNode node = new ResXDataNode ("test", fileRef);
return node;
}
void WriteEmbeddedResource (string name, string filename)
{
const int size = 512;
byte [] buffer = new byte [size];
int count = 0;
Stream input = typeof (ResXDataNodeTest).Assembly.
GetManifestResourceStream (name);
Stream output = File.Open (filename, FileMode.Create);
try {
while ((count = input.Read (buffer, 0, size)) > 0) {
output.Write (buffer, 0, count);
}
} finally {
output.Close ();
}
}
public ResXDataNode GetNodeEmdeddedBytes1To10 ()
{
byte [] someBytes = new byte [] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
@ -166,11 +141,6 @@ namespace MonoTests.System.Resources {
[TearDown]
protected virtual void TearDown ()
{
if (tempFileWithIcon != null) {
File.Delete (tempFileWithIcon);
tempFileWithIcon = null;
}
if (tempFileWithSerializable != null) {
File.Delete (tempFileWithSerializable);
tempFileWithSerializable = null;