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

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTests.cs
View File

@@ -47,7 +47,7 @@ namespace MonoTests.System.Resources {
Assert.IsNotNull (returnedNode, "#A1");
object val = returnedNode.GetValue (new ReturnSerializableSubClassITRS ());
Assert.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A2");
AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A2");
Assert.IsInstanceOfType (typeof (serializable), val, "#A3");
}
@@ -84,7 +84,7 @@ namespace MonoTests.System.Resources {
node = GetNodeFileRefToSerializable ("ser.bbb",true);
object val = node.GetValue (new ReturnSerializableSubClassITRS ());
Assert.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A1");
AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A1");
Assert.IsInstanceOfType (typeof (serializable), val, "#A2");
}

2
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
View File

@@ -90,7 +90,7 @@ namespace MonoTests.System.Resources {
// get value passing no params
object val = returnedNode.GetValue ((ITypeResolutionService) null);
Assert.IsInstanceOfType (typeof (serializable), val, "#A2");
Assert.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A3");
AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A3");
//get value type passing different params
string newType = returnedNode.GetValueTypeName (new ReturnSerializableSubClassITRS ());

6
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
View File

@@ -50,10 +50,10 @@ namespace MonoTests.System.Resources {
object defaultVal = returnedNode.GetValue ((ITypeResolutionService) null);
Assert.IsInstanceOfType (typeof (serializable), defaultVal, "#A2");
Assert.IsNotInstanceOfType (typeof (serializableSubClass), defaultVal, "#A3");
AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), defaultVal, "#A3");
object newVal = returnedNode.GetValue (new ReturnSerializableSubClassITRS ());
Assert.IsNotInstanceOfType (typeof (serializableSubClass), newVal, "#A4");
AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), newVal, "#A4");
Assert.IsInstanceOfType (typeof (serializable), newVal, "#A5");
}
@@ -88,7 +88,7 @@ namespace MonoTests.System.Resources {
// get value passing null params
object val = returnedNode.GetValue ((ITypeResolutionService) null);
// Assert.IsNotInstanceOfType (typeof (serializable), val, "#A5"); this would fail as subclasses are id-ed as instances of parents
// AssertHelper.IsNotInstanceOfType (typeof (serializable), val, "#A5"); this would fail as subclasses are id-ed as instances of parents
Assert.IsInstanceOfType (typeof (serializableSubClass), val, "#A4");
}

2
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeTest.cs
View File

@@ -314,7 +314,7 @@ namespace MonoTests.System.Resources {
object o = node.GetValue ((AssemblyName []) null);
Assert.IsNotInstanceOfType (typeof (serializableSubClass), o, "#A2");
AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), o, "#A2");
Assert.IsInstanceOfType (typeof (serializable), o, "#A3");
rr.Close ();
}

2
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeWriteBehavior.cs
View File

@@ -252,7 +252,7 @@ namespace MonoTests.System.Resources {
Assert.IsNotNull (finalNode, "#A3");
object finalVal = finalNode.GetValue ((ITypeResolutionService) null);
Assert.IsNotInstanceOfType (typeof (serializableSubClass), finalVal, "#A4");
AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), finalVal, "#A4");
Assert.IsInstanceOfType (typeof (serializable), finalVal, "#A5");
}

20
mcs/class/System.Windows.Forms/Test/System.Resources/ResXFileRefTest.cs
View File

@@ -229,6 +229,26 @@ namespace MonoTests.System.Resources
}
}
[Test]
public void ConvertFrom_Type_String_FilePathWithBackslashes ()
{
if (Path.DirectorySeparatorChar == '\\')
// non-windows test
return;
string fileContents = "foobar";
string fileName = "foo.txt";
string filePath = Path.Combine (_tempDirectory, fileName);
File.WriteAllText (filePath, fileContents);
filePath = _tempDirectory + "\\.\\" + fileName;
string fileRef = filePath + ";" + typeof (string).AssemblyQualifiedName;
string result = _converter.ConvertFrom (fileRef) as string;
Assert.IsNotNull (result, "#A1");
Assert.AreEqual (result, fileContents, "#A2");
}
[Test]
public void ConvertFrom_Type_StreamReader ()
{