diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2014-09-26 16:43:36 +0400 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-01-17 07:45:39 +0300 |
| commit | 746650d1b93114b60feb155c2ee778a9e16ccb6d (patch) | |
| tree | f8e1eb791640ba6fd887da5e64cde3a1139b42b0 /mcs/class/Mono.Data.Sqlite/Test | |
| parent | 7d1cd56c5d97683f6dae35cb9143d8789b71c2de (diff) | |
[bcl] Remove more NET_2_0 checks from class libs
Diffstat (limited to 'mcs/class/Mono.Data.Sqlite/Test')
4 files changed, 0 insertions, 34 deletions
diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteCommandUnitTests.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteCommandUnitTests.cs index e19f0c980f3..f10d6ec6fb3 100644 --- a/mcs/class/Mono.Data.Sqlite/Test/SqliteCommandUnitTests.cs +++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteCommandUnitTests.cs @@ -168,11 +168,7 @@ namespace MonoTests.Mono.Data.Sqlite } [Test] -#if NET_2_0 [ExpectedException(typeof(SqliteException))] -#else - [ExpectedException(typeof(SqliteSyntaxException))] -#endif public void InsertWithFailingTransaction() { _conn.Open(); diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteConnectionTest.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteConnectionTest.cs index 62bbcd7f1d4..d65ee3f9ae6 100644 --- a/mcs/class/Mono.Data.Sqlite/Test/SqliteConnectionTest.cs +++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteConnectionTest.cs @@ -44,7 +44,6 @@ namespace MonoTests.Mono.Data.Sqlite readonly static string _connectionString = "URI=file://" + _uri + ", version=3"; SqliteConnection _conn = new SqliteConnection (); -#if NET_2_0 [Test] [ExpectedException (typeof (ArgumentNullException))] public void ConnectionStringTest_Null () @@ -65,29 +64,6 @@ namespace MonoTests.Mono.Data.Sqlite } } -#else - [Test] - [ExpectedException (typeof (InvalidOperationException))] - public void ConnectionStringTest_Empty () - { - _conn.ConnectionString = ""; - } - - [Test] - [ExpectedException (typeof (InvalidOperationException))] - public void ConnectionStringTest_NoURI () - { - _conn.ConnectionString = "version=3"; - } - - // In 2.0 _conn.Database always returns "main" - [Test] - public void ConnectionStringTest_IgnoreSpacesAndTrim () - { - _conn.ConnectionString = "URI=file://xyz , ,,, ,, version=3"; - Assert.AreEqual ("xyz", _conn.Database, "#1 file path is wrong"); - } -#endif // behavior has changed, I guess //[Test] [Ignore ("opening a connection should not create db! though, leave for now")] diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteExceptionUnitTests.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteExceptionUnitTests.cs index fa766e915ea..6a7fdbc487a 100644 --- a/mcs/class/Mono.Data.Sqlite/Test/SqliteExceptionUnitTests.cs +++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteExceptionUnitTests.cs @@ -24,11 +24,7 @@ namespace MonoTests.Mono.Data.Sqlite } [Test] -#if NET_2_0 [ExpectedException(typeof(SqliteException))] -#else - [ExpectedException(typeof(SqliteSyntaxException))] -#endif public void WrongSyntax() { SqliteCommand insertCmd = new SqliteCommand("INSERT INTO t1 VALUES (,')",_conn); diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs index a177bfcc8b6..7f6af225caf 100644 --- a/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs +++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs @@ -78,11 +78,9 @@ namespace MonoTests.Mono.Data.Sqlite Assert.AreEqual(reader["i"], integerP.Value); object compareValue; -#if NET_2_0 if (blobP.Value is byte[]) compareValue = System.Text.Encoding.UTF8.GetString ((byte[])blobP.Value); else -#endif compareValue = blobP.Value; Assert.AreEqual(reader["b"], compareValue); Assert.AreEqual(reader.Read(), false); |