Remove reliance on 2.0 profile test assembly

4 files changed, 9 insertions, 10 deletions

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs
index 9c1f44cabeb..172b1c409be 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs
@@ -41,7 +41,7 @@ namespace MonoTests.System.Resources {
 		{
 			ResXDataNode originalNode, returnedNode;
 
-			string aName = "System.Windows.Forms_test_net_2_0, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null";
+			string aName = this.GetType ().Assembly.FullName;
 			AssemblyName [] assemblyNames = new AssemblyName [] { new AssemblyName (aName) };
 
 			originalNode = GetNodeFileRefToSerializable ("ser.bbb", false);
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
index 0bf22aba742..7c13d7a3361 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
@@ -102,8 +102,9 @@ namespace MonoTests.System.Resources {
 			ResXDataNode node = GetNodeFromResXReader (serializedResXSOAP);
 
 			Assert.IsNotNull (node, "#A1");
-			string name = node.GetValueTypeName ((AssemblyName []) null);
-			Assert.AreEqual (typeof (serializable).AssemblyQualifiedName, name, "#A2");
+			// hard coded assembly name value refers to that generated under 2.0 prefix, so use compatible available class
+			string name = node.GetValueTypeName (new AlwaysReturnSerializableSubClassTypeResolutionService ());
+			Assert.AreEqual (typeof (serializableSubClass).AssemblyQualifiedName, name, "#A2");
 		}
 
 		[Test]
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
index 275ba5198e1..8c608c3e649 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
@@ -145,13 +145,10 @@ namespace MonoTests.System.Resources {
 		public void SoapFormattedObject ()
 		{
 			ResXDataNode node = GetNodeFromResXReader (serializedResXSOAP);
-
 			Assert.IsNotNull (node, "#A1");
-			object val = node.GetValue ((AssemblyName []) null);
-			Assert.IsInstanceOfType (typeof (serializable), val, "#A2");
-			serializable ser = (serializable) val;
-			Assert.AreEqual ("aname", ser.name, "#A3");
-			Assert.AreEqual ("avalue", ser.value, "#A4");
+			// hard coded assembly name value refers to that generated under 2.0 prefix, so use compatible available class
+			object val = node.GetValue (new AlwaysReturnSerializableSubClassTypeResolutionService ());
+			Assert.AreEqual ("name=aname;value=avalue", val.ToString (), "#A2");
 		}
 
 		[Test]
@@ -167,6 +164,7 @@ namespace MonoTests.System.Resources {
 		[Test, ExpectedException (typeof (ArgumentException))]
 		public void ErrorWhenAssemblyMissing ()
 		{
+			//FIXME: depends on net_2_0 assembly being available
 			ResXDataNode node = GetNodeFromResXReader (missingSerializableFromMissingAssembly);
 			Assert.IsNotNull (node, "#A1");
 			object val = node.GetValue ((AssemblyName[]) null);
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs
index 11cfd7d9df0..1616cb6241d 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs
@@ -120,7 +120,7 @@ namespace MonoTests.System.Resources
 		[Test]
 		public void CanLoadTypeFromThisAssemblyWithOnlyFullNamePassingAssemblyNames ()
 		{
-			string aName = "System.Windows.Forms_test_net_2_0, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null";
+			string aName = this.GetType ().Assembly.FullName;
 			AssemblyName [] assemblyNames = new AssemblyName [] { new AssemblyName (aName) };
 
 			ResXDataNode node = GetNodeFromResXReader (thisAssemblyConvertableResXWithoutAssemblyName);