* XmlSerializerTests.cs: Fixed build after failed merge (time to call it a

day, I guess)

svn path=/trunk/mcs/; revision=56723

mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog

@@ -1,3 +1,7 @@
+2006-02-09  Gert Driesen  <[email protected]>
+
+	* XmlSerializerTests.cs: Fixed build after failed merge.
+
 2006-02-09  Gert Driesen  <[email protected]>
 
 	* XmlSerializerTests.cs: Added test for bug #77501. Added tests for

mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs

@@ -1304,29 +1304,18 @@ namespace MonoTests.System.XmlSerialization
 			string res = "<ArrayAttributeWithType xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ";
 			res += "at='a b' bin1='AQI= AQI=' bin2='AQI=' />";
 			Assert.AreEqual (Infoset (res), WriterText);
-		}
-		
-		[Test]
-		[ExpectedException (typeof(InvalidOperationException))]
-		public void TestArrayAttributeWithWrongDataType ()
-		{
-			Serialize (new ArrayAttributeWithWrongType ());
-		}
-		
-		[Test]
-		public void TestSubclassElementType ()
-		{
-			SubclassTestContainer c = new SubclassTestContainer ();
-			c.data = new SubclassTestSub ();
-			Serialize (c);
-			
-			string res = "<SubclassTestContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+		}
+
+		[Test]
+		public void TestSubclassElementType ()
+		{
+			SubclassTestContainer c = new SubclassTestContainer ();
+			c.data = new SubclassTestSub ();
+			Serialize (c);
+
+			string res = "<SubclassTestContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
 			res += "<a xsi:type=\"SubclassTestSub\"/></SubclassTestContainer>";
 			Assert.AreEqual (Infoset (res), WriterText);
-		}
-		
-		// Helper methods
-				
 		}
 		
 		[Test]
@@ -1335,7 +1324,7 @@ namespace MonoTests.System.XmlSerialization
 		{
 			Serialize (new ArrayAttributeWithWrongType ());
 		}
-
+		
 		[Test]
 		[Category ("NotWorking")]
 		public void TestSerializePrimitiveTypesContainer ()