Fixes for net_2_0 tests run.

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

diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog
index 1acfc83eb514b565542ba0a1a54e8cd84a13902d..2ee3aa46b2e0d9b3407bdfaaa86328b12c7e2aeb 100644 (file)
--- a/mcs/class/System.Data/ChangeLog
+++ b/mcs/class/System.Data/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-17     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-tests.test.disconnected.bat : added usage of app config.
+
 2006-09-12     Boris Kirzner <borisk@mainsoft.com>
        * run-tests.test.connected.bat, run-tests.test.disconnected.bat: 
        small fixes for TARGET_JVM test scrips.

diff --git a/mcs/class/System.Data/Test/ProviderTests/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/ChangeLog
index b8bfc10a94659c354e9c63e25c0281fbad77513d..2980773fb44a39e4bc1cacb3cff4a9b20575a132 100644 (file)
--- a/mcs/class/System.Data/Test/ProviderTests/ChangeLog
+++ b/mcs/class/System.Data/Test/ProviderTests/ChangeLog
@@ -1,3 +1,6 @@
+2006-09-17     Boris Kirzner <borisk@mainsoft.com>
+       * System.Data.OleDb.Tests20.J2EE.vmwcsproj: added KNOW_BUG variable.
+
 2006-09-12     Boris Kirzner <borisk@mainsoft.com>
        * System.Data.OleDb.J2EE.config: changed test server name.
 

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.Tests20.J2EE.vmwcsproj b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.Tests20.J2EE.vmwcsproj
index a24ee66704ce470ce8ef9c81ff5ded4757c538b0..383bfd5068b630e22334451b7b905911ddc8a339 100755 (executable)
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.Tests20.J2EE.vmwcsproj
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.Tests20.J2EE.vmwcsproj
@@ -22,7 +22,7 @@
        <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
                <DebugSymbols>true</DebugSymbols>\r
                <OutputPath>bin\Debug_Java20\</OutputPath>\r
-               <DefineConstants>TRACE;DEBUG;JAVA;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
+               <DefineConstants>TRACE;DEBUG;JAVA;TARGET_JVM;NET_1_1;NET_2_0;KNOWN_BUG</DefineConstants>\r
                <BaseAddress>285212672</BaseAddress>\r
                <DebugType>full</DebugType>\r
                <PlatformTarget>AnyCPU</PlatformTarget>\r

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/ChangeLog
index 4a5d584ed121d663fed97b6b96293553dd52c3a3..45d797498f8c2811c0efe272139a585a3983c241 100644 (file)
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/ChangeLog
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-17     Boris Kirzner <borisk@mainsoft.com>
+
+       * OleDbConnection_ConnectionString.cs: fixed connection string.
+
 2006-05-09  Konstantin Triger <kostat@mainsoft.com>
 
        * OleDbConnection_GetOleDbSchemaTable.cs: in Oracle Database maps to Schema.
\ No newline at end of file

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
index ba1a47afc57802b168fb876c0860cc3ef73cadf7..d45b16035ec0d164d9242897b70154e71eb12660 100755 (executable)
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
@@ -185,7 +185,7 @@ namespace MonoTests.System.Data.OleDb
                                string user = (string)conProps["User Id"];
                                string password = (string)conProps["Password"];
                                string database = (string)conProps["Initial Catalog"];
-                               string jdbcUrlTemplate = "JdbcDriverClassName=com.microsoft.jdbc.sqlserver.SQLServerDriver;JdbcURL=\"jdbc:microsoft:sqlserver://{0};User={1};Password={2};DatabaseName={3}\"";
+                               string jdbcUrlTemplate = "JdbcDriverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver;JdbcURL=\"jdbc:sqlserver://{0};User={1};Password={2};DatabaseName={3}\"";
                                string conStr = string.Format(jdbcUrlTemplate, server, user, password, database);
                                con = new OleDbConnection(conStr);
                                con.Open();

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index 16d401eee9ff233c62031c6a5e67435fe0d1f8db..3a29736ec165f1e5c4b21ffdd3ea75b2fa030442 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-17     Boris Kirzner <borisk@mainsoft.com>
+
+       * DataViewTest.cs : marked not wroker test for TARGET_JVM.
+       * DataSetTest.cs : marked not working net_2_0 tests.
+
 2006-08-31  Gert Driesen <drieseng@users.sourceforge.net>
 
        * DataRelationTest2.cs: Added test for bug #79233, currently marked

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
index d139d475689de44a661735b0d1b599075455ce50..313e5dd8e909055cc792069a681bd96b656c9887 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
@@ -167,6 +167,9 @@ namespace MonoTests.System.Data
                }
 
                [Test]
+#if NET_2_0
+               [Category("NotWorking")]
+#endif
                public void OwnWriteXmlSchema ()
                {
                        DataSet ds = new DataSet ("test_dataset");
@@ -539,7 +542,10 @@ namespace MonoTests.System.Data
                        AssertEquals ("test#15", "</diffgr:diffgram>", TextString);
                }
 
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void WriteXmlSchema ()
                {
                        DataSet ds = new DataSet ();                    
@@ -1031,7 +1037,10 @@ namespace MonoTests.System.Data
                        AssertEquals (xml, sw.ToString ());
                }
 
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void SerializeDataSet ()
                {
                        // see GetReady() for current culture
@@ -1476,7 +1485,10 @@ namespace MonoTests.System.Data
                        AssertEquals (input, sw.ToString ().Replace ("\r\n", "\n"));
                }
 
-               [Test] // bug #60469
+               [Test] // bug #60469\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void WriteXmlSchema2 ()
                {
                        string xml = @"<myDataSet xmlns='NetFrameWork'><myTable><id>0</id><item>item 0</item></myTable><myTable><id>1</id><item>item 1</item></myTable><myTable><id>2</id><item>item 2</item></myTable><myTable><id>3</id><item>item 3</item></myTable><myTable><id>4</id><item>item 4</item></myTable><myTable><id>5</id><item>item 5</item></myTable><myTable><id>6</id><item>item 6</item></myTable><myTable><id>7</id><item>item 7</item></myTable><myTable><id>8</id><item>item 8</item></myTable><myTable><id>9</id><item>item 9</item></myTable></myDataSet>";
@@ -1534,7 +1546,10 @@ namespace MonoTests.System.Data
                }
 
                // bug #66366
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void WriteXmlSchema3 ()
                {
                        string xmlschema = @"<?xml version=""1.0"" encoding=""utf-16""?>
@@ -1577,7 +1592,10 @@ namespace MonoTests.System.Data
                }
 
                // bug #67792.
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void WriteXmlSchema4 ()
                {
                        string xmlschema = @"<?xml version=""1.0"" encoding=""utf-16""?>
@@ -1619,7 +1637,10 @@ namespace MonoTests.System.Data
                }
 
                // bug # 68432
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void WriteXmlSchema5 ()
                {
                        string xmlschema = @"<?xml version=""1.0"" encoding=""utf-16""?>
@@ -1727,7 +1748,10 @@ namespace MonoTests.System.Data
                }
 
                // bug #67793
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void WriteXmlSchema6 ()
                {
                        string xmlschema = @"<?xml version=""1.0"" encoding=""utf-16""?>
@@ -1785,7 +1809,10 @@ namespace MonoTests.System.Data
                }
 
                // bug #61233
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+                       [Category ("NotWorking")]\r
+#endif
                public void WriteXmlExtendedProperties ()
                {
                        string xml = @"<?xml version=""1.0"" encoding=""utf-16""?>
@@ -1819,7 +1846,10 @@ namespace MonoTests.System.Data
                        AssertEquals (xml, result.Replace ("\r\n", "\n"));
                }
 
-               [Test]
+               [Test]\r
+#if NET_2_0\r
+               [Category ("NotWorking")]\r
+#endif
                public void WriteXmlModeSchema ()
                {
                        // This is the MS output of WriteXmlSchema().

diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
index 7fa65d229bb87688c3dd569af9bb6139fc9f9f3e..bd85c9d2f7ab277cea391d1fc1de3e9541e0909e 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
@@ -414,6 +414,9 @@ namespace MonoTests.System.Data
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
+#if TARGET_JVM
+               [Category("NotWorking")] // defect 5446
+#endif
                public void Find_3 ()
                {
                        dataView.Sort = "itemID, itemName";

diff --git a/mcs/class/System.Data/run-tests.test.disconnected.bat b/mcs/class/System.Data/run-tests.test.disconnected.bat
index b16e47884ed47fb8d4aef9ff173de6e00b95ba4c..1b58d566ec04bc897919c4ebc6c189cc5bf50a2b 100644 (file)
--- a/mcs/class/System.Data/run-tests.test.disconnected.bat
+++ b/mcs/class/System.Data/run-tests.test.disconnected.bat
@@ -35,12 +35,15 @@ set RUNNING_FIXTURE=MonoTests.System.Data
 set TEST_SOLUTION=Test\System.Data.Test20.sln\r
 set TEST_ASSEMBLY=System.Data.Test.jar\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
+set APP_CONFIG_FILE=app_test_2.0.config\r
 \r
 \r
 set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
 set TIMEL=%time:~0,2%_%time:~3,2%\r
 set TIMESTAMP=%DATEL%_%TIMEL%\r
 \r
+set NUNIT_OPTIONS=/exclude:NotWorking,ValueAdd,CAS,InetAccess\r
+\r
 \r
 REM ********************************************************\r
 REM @echo Set environment\r
@@ -107,6 +110,7 @@ REM ********************************************************
 REM ********************************************************\r
 \r
 copy %BACK_TO_ROOT_DIR%Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .\r
+copy %APP_CONFIG_FILE% nunit-console.exe.config\r
 \r
 REM @echo on\r
 "%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1\r