X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2FTest%2FSystem.Xml.Serialization%2FSoapReflectionImporterTests.cs;h=5eccecf1bbeff2897e74c565f5552530fc56c087;hb=30c28c41d7859b7de6ecd7afb652468517048d12;hp=c515372c49e700cf78ab822afe25f0a2a4ec630d;hpb=a3ea7ceb4d4f5e2cb8ea421313e8939640fb898c;p=mono.git

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapReflectionImporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapReflectionImporterTests.cs
index c515372c49e..5eccecf1bbe 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapReflectionImporterTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapReflectionImporterTests.cs
@@ -65,7 +65,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 		
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestIntTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (int));
@@ -115,7 +114,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestStringTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (string));
@@ -214,7 +212,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestByteTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (byte));
@@ -260,7 +257,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestBoolTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (bool));
@@ -285,7 +281,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestShortTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (short));
@@ -310,7 +305,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestUnsignedShortTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (ushort));
@@ -335,7 +329,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestUIntTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (uint));
@@ -360,7 +353,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestLongTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (long));
@@ -385,7 +377,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestULongTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (ulong));
@@ -410,7 +401,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestFloatTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (float));
@@ -435,7 +425,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestDoubleTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (double));
@@ -460,7 +449,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestDateTimeTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (DateTime));
@@ -510,7 +498,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestGuidTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (Guid));
@@ -560,7 +547,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 		
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestDecimalTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (decimal));
@@ -585,7 +571,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestXmlQualifiedNameTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (XmlQualifiedName));
@@ -635,7 +620,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 		
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestSByteTypeMapping ()
 		{
 			XmlTypeMapping tm = Map (typeof (sbyte));
@@ -685,7 +669,6 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
 		public void TestCharTypeMapping()
 		{
 			XmlTypeMapping tm = Map (typeof (char));
@@ -1053,6 +1036,9 @@ namespace MonoTests.System.XmlSerialization
 		[Test]
 #if ONLY_1_1
 		[Category ("NotDotNet")] // wrong error message is reported in .NET 1.1
+#endif
+#if TARGET_JVM
+		[Ignore ("TD #7458")]
 #endif
 		public void TypeMapping_Attribute_ComplexType ()
 		{
@@ -1095,6 +1081,9 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
+#if TARGET_JVM
+		[Ignore ("TD #7458")]
+#endif
 		public void TypeMapping_Field_Encoded ()
 		{
 			XmlTypeMapping tm = Map (typeof (Field_Encoded));
@@ -1105,6 +1094,9 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
+#if TARGET_JVM
+		[Ignore ("TD #7458")]
+#endif
 		public void TypeMapping_Field_Encoded_DefaultNamespace ()
 		{
 			XmlTypeMapping tm = Map (typeof (Field_Encoded), AnotherNamespace);
@@ -1207,6 +1199,9 @@ namespace MonoTests.System.XmlSerialization
 
 		[Test]
 		[ExpectedException (typeof (InvalidOperationException))]
+#if TARGET_JVM
+		[Ignore ("TD #7461")]
+#endif
 		public void TypeMapping_IEnumerable_Object_NoMatchingAddMethod ()
 		{
 			Map (typeof (ObjectEnumerableNoMatchingAddMethod));
@@ -1214,6 +1209,9 @@ namespace MonoTests.System.XmlSerialization
 
 		[Test]
 		[ExpectedException (typeof (InvalidOperationException))]
+#if TARGET_JVM
+		[Ignore ("TD #7461")]
+#endif
 		public void TypeMapping_IEnumerable_Object_NoMatchingAddMethod_Array ()
 		{
 			Map (typeof (ObjectEnumerableNoMatchingAddMethod[]));
@@ -1403,6 +1401,9 @@ namespace MonoTests.System.XmlSerialization
 		}
 
 		[Test]
+#if TARGET_JVM
+		[Ignore ("TD #7458")]
+#endif
 		public void TypeMapping_InvalidDefault ()
 		{
 			SoapAttributes attrs = new SoapAttributes (typeof (Field_Encoded).GetMember ("Modifiers")[0]);
@@ -1428,10 +1429,10 @@ namespace MonoTests.System.XmlSerialization
 				Assert.Fail ("#B1");
 			} catch (InvalidOperationException ex) {
 				// Enum System.String cannot be converted to MonoTests.System.Xml.TestClasses.MapModifiers
-				Assert.IsNotNull (ex.Message, "#A2");
-				Assert.IsTrue (ex.Message.IndexOf (typeof (string).FullName) != -1, "#A3");
-				Assert.IsTrue (ex.Message.IndexOf (typeof (MapModifiers).FullName) != -1, "#A4");
-				Assert.IsNull (ex.InnerException, "#A5");
+				Assert.IsNotNull (ex.Message, "#B2");
+				Assert.IsTrue (ex.Message.IndexOf (typeof (string).FullName) != -1, "#B3");
+				Assert.IsTrue (ex.Message.IndexOf (typeof (MapModifiers).FullName) != -1, "#B4");
+				Assert.IsNull (ex.InnerException, "#B5");
 			}
 
 			attrs.SoapDefaultValue = EnumDefaultValueNF.e2; // other enum type
@@ -1441,23 +1442,23 @@ namespace MonoTests.System.XmlSerialization
 				Assert.Fail ("#C1");
 			} catch (InvalidOperationException ex) {
 				// Enum MonoTests.System.Xml.TestClasses.EnumDefaultValueNF cannot be converted to MonoTests.System.Xml.TestClasses.MapModifiers
-				Assert.IsNotNull (ex.Message, "#A2");
-				Assert.IsTrue (ex.Message.IndexOf (typeof (EnumDefaultValueNF).FullName) != -1, "#A3");
-				Assert.IsTrue (ex.Message.IndexOf (typeof (MapModifiers).FullName) != -1, "#A4");
-				Assert.IsNull (ex.InnerException, "#A5");
+				Assert.IsNotNull (ex.Message, "#C2");
+				Assert.IsTrue (ex.Message.IndexOf (typeof (EnumDefaultValueNF).FullName) != -1, "#C3");
+				Assert.IsTrue (ex.Message.IndexOf (typeof (MapModifiers).FullName) != -1, "#C4");
+				Assert.IsNull (ex.InnerException, "#C5");
 			}
 
 			attrs.SoapDefaultValue = (MapModifiers) 20; // non-existing enum value
 
 			try {
 				Map (typeof (Field_Encoded), overrides);
-				Assert.Fail ("#C1");
+				Assert.Fail ("#D1");
 			} catch (InvalidOperationException ex) {
 				// Value '20' cannot be converted to MonoTests.System.Xml.TestClasses.MapModifiers
-				Assert.IsNotNull (ex.Message, "#A2");
-				Assert.IsTrue (ex.Message.IndexOf ("'20'") != -1, "#A3");
-				Assert.IsTrue (ex.Message.IndexOf (typeof (MapModifiers).FullName) != -1, "#A4");
-				Assert.IsNull (ex.InnerException, "#A5");
+				Assert.IsNotNull (ex.Message, "#D2");
+				Assert.IsTrue (ex.Message.IndexOf ("'20'") != -1, "#D3");
+				Assert.IsTrue (ex.Message.IndexOf (typeof (MapModifiers).FullName) != -1, "#D4");
+				Assert.IsNull (ex.InnerException, "#D5");
 			}
 		}