Quellcode durchsuchen

TARGET_JVM: add new tests; remove fixed Ignores

svn path=/trunk/mcs/; revision=76776
Konstantin Triger vor 18 Jahren
Ursprung
Commit
85cf761dec

+ 0 - 6
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDateTimeTest.cs

@@ -275,9 +275,6 @@ namespace MonoTests.System.Data.SqlTypes
                 }
 
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7284")]
-#endif
                 public void Parse()
                 {
                         try {
@@ -474,9 +471,6 @@ namespace MonoTests.System.Data.SqlTypes
 		}
 
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7284")]
-#endif
 		public void SqlStringToSqlDateTime()
 		{
 

+ 0 - 9
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs

@@ -141,9 +141,6 @@ namespace MonoTests.System.Data.SqlTypes
 
                 // Test properties
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7285")]
-#endif
                 public void Properties()
                 {
                 	byte[] b = Test1.BinData;
@@ -249,9 +246,6 @@ namespace MonoTests.System.Data.SqlTypes
                 }
 
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7285")]
-#endif
 		public void AdjustScale()
 		{
 			Assert.AreEqual ("6464.646400", SqlDecimal.AdjustScale (Test1, 2, false).Value.ToString (), "#E01");
@@ -266,9 +260,6 @@ namespace MonoTests.System.Data.SqlTypes
 		}
 
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7285")]
-#endif
 		public void ConvertToPrecScale()
 		{
 			Assert.AreEqual (new SqlDecimal(6464.6m).Value, SqlDecimal.ConvertToPrecScale (Test1, 5, 1).Value, "#F01");

+ 0 - 3
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlMoneyTest.cs

@@ -447,9 +447,6 @@ namespace MonoTests.System.Data.SqlTypes
                 }
 		
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7287")]
-#endif
 		public void SqlDecimalToSqlMoney()
 		{
 			SqlDecimal TestDecimal = new SqlDecimal (4000);

+ 7 - 0
mcs/class/System.Data/Test/System.Data.Test20.csproj

@@ -94,11 +94,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="System.Data.Common\DataAdapterTest.cs" />
     <Compile Include="System.Data.Common\DataColumnMappingCollectionTest.cs" />
     <Compile Include="System.Data.Common\DataTableMappingCollectionTest.cs" />
     <Compile Include="System.Data.Common\DbConnectionStringBuilderTest.cs" />
     <Compile Include="System.Data.Common\DBDataPermissionAttributeTest.cs" />
     <Compile Include="System.Data.Common\DbProviderFactoriesConfigurationHandlerTest.cs" />
+    <Compile Include="System.Data.SqlClient\SqlConnectionStringBuilderTest.cs" />
     <Compile Include="System.Data.SqlTypes\SqlBinaryTest.cs" />
     <Compile Include="System.Data.SqlTypes\SqlBooleanTest.cs" />
     <Compile Include="System.Data.SqlTypes\SqlBytesTest.cs" />
@@ -115,6 +117,7 @@
     <Compile Include="System.Data.SqlTypes\SqlSingleTest.cs" />
     <Compile Include="System.Data.SqlTypes\SqlStringTest.cs" />
     <Compile Include="System.Data.Test.Utils\DataProvider.cs" />
+    <Compile Include="System.Data\BinarySerializationTest.cs" />
     <Compile Include="System.Data\ConstraintCollectionTest.cs" />
     <Compile Include="System.Data\ConstraintCollectionTest2.cs" />
     <Compile Include="System.Data\ConstraintExceptionTest.cs" />
@@ -146,10 +149,14 @@
     <Compile Include="System.Data\DataTableCollectionTest2.cs" />
     <Compile Include="System.Data\DataTableLoadRowTest.cs" />
     <Compile Include="System.Data\DataTableReaderTest.cs" />
+    <Compile Include="System.Data\DataTableReadWriteXmlTest.cs" />
+    <Compile Include="System.Data\DataTableReadXmlSchemaTest.cs" />
     <Compile Include="System.Data\DataTableTest.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="System.Data\DataTableTest2.cs" />
+    <Compile Include="System.Data\DataTableTest3.cs" />
+    <Compile Include="System.Data\DataTableTest4.cs" />
     <Compile Include="System.Data\DataViewManagerTest.cs" />
     <Compile Include="System.Data\DataViewTest.cs" />
     <Compile Include="System.Data\DataViewTest2.cs" />

+ 12 - 0
mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs

@@ -113,6 +113,9 @@ public class BinarySerializationTest
 		dt.Rows[1].RejectChanges();
 	}
 	[Test]
+#if TARGET_JVM
+	[Ignore ("Net Binary formatting is not supported for DataSet")]
+#endif
 	public void DataTableSerializationTest2 ()
 	{
 		//Serialize Table
@@ -199,6 +202,9 @@ public class BinarySerializationTest
 			
 	}
 	[Test]
+#if TARGET_JVM
+	[Ignore ("Net Binary formatting is not supported for DataSet")]
+#endif
 	public void Test_With_Null_Values2 ()
 	{
 	 	//Serialize Table
@@ -376,6 +382,9 @@ public class BinarySerializationTest
 		
 	}
 	[Test]
+#if TARGET_JVM
+	[Ignore ("Net Binary formatting is not supported for DataSet")]
+#endif
 	public void DataSetSerializationTest2 ()
 	{
 		DataSet ds = new DataSet ();
@@ -572,6 +581,9 @@ public class BinarySerializationTest
 			Assert.AreEqual (ds.Relations [i].RelationName, ds.Relations [i].RelationName, "#9 Relation : {0} differs", ds.Relations [i]);
 	}
 	[Test]
+#if TARGET_JVM
+	[Ignore ("Net Binary formatting is not supported for DataSet")]
+#endif
 	public void Constraint_Relations_Test2 ()
 	{
 		//Serialize DataSet

+ 0 - 3
mcs/class/System.Data/Test/System.Data/DataSetTest.cs

@@ -173,9 +173,6 @@ namespace MonoTests.System.Data
 		}
 
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7169")]
-#endif
 		public void OwnWriteXmlSchema ()
 		{
 			DataSet ds = new DataSet ("test_dataset");

+ 3 - 0
mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs

@@ -295,6 +295,9 @@ namespace MonoTests.System.Data
         
         [Test]
         [ExpectedException (typeof (NotImplementedException))]
+#if TARGET_JVM
+	[Ignore ("Should review the test")]
+#endif
         public void TestReadXml()
         {
             // For reading, DataTable.ReadXml only supports reading in xml with

+ 0 - 3
mcs/class/System.Data/Test/System.Data/DataViewTest2.cs

@@ -1278,9 +1278,6 @@ namespace MonoTests_System.Data
 		}
 		
 		[Test]
-#if TARGET_JVM
-		[Ignore ("TD #7423")]
-#endif
 		public void ToTableTest_DataValidity ()
 		{              
 			DataTable table = new DataTable();