Merge pull request #364 from BruceCowan-AI/CleanUpTests

Clean up unit tests so they can be used for the Oracle provider and one ...

Author: mythz

src/ServiceStack.OrmLite/OrmLiteWriteExtensions.cs

@@ -371,7 +371,7 @@ internal static int Update<T>(this IDbCommand dbCmd, T obj)
                 OrmLiteConfig.UpdateFilter(dbCmd, obj);
 
             OrmLiteConfig.DialectProvider.PrepareParameterizedUpdateStatement<T>(dbCmd);
-            if (dbCmd.CommandText == null)
+            if (string.IsNullOrEmpty(dbCmd.CommandText))
                 return 0;
 
             OrmLiteConfig.DialectProvider.SetParameterValues<T>(dbCmd, obj);
@@ -397,7 +397,7 @@ internal static int UpdateAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
                 var dialectProvider = OrmLiteConfig.DialectProvider;
 
                 dialectProvider.PrepareParameterizedUpdateStatement<T>(dbCmd);
-                if (dbCmd.CommandText == null)
+                if (string.IsNullOrEmpty(dbCmd.CommandText))
                     return 0;
 
                 foreach (var obj in objs)

tests/ServiceStack.OrmLite.Tests/ApiSqlServerTests.cs

@@ -15,6 +15,7 @@ public class ApiSqlServerTests
         [SetUp]
         public void SetUp()
         {
+            SuppressIfOracle("SQL Server tests");
             db = CreateSqlServerDbFactory().OpenDbConnection();
             db.DropAndCreateTable<Person>();
             db.DropAndCreateTable<PersonWithAutoId>();

tests/ServiceStack.OrmLite.Tests/CustomSqlTests.cs

@@ -75,8 +75,10 @@ public void Can_create_field_with_custom_sql()
                 var createTableSql = db.GetLastSql();
                 createTableSql.Print();
 
-                Assert.That(createTableSql, Is.StringContaining("\"CharColumn\" CHAR(20) null"));
-                Assert.That(createTableSql, Is.StringContaining("\"DecimalColumn\" DECIMAL(18,4) null"));
+                Assert.That(createTableSql, Is.StringContaining("\"CharColumn\" CHAR(20) null")
+                                            .Or.StringContaining("CharColumn CHAR(20) null"));
+                Assert.That(createTableSql, Is.StringContaining("\"DecimalColumn\" DECIMAL(18,4) null")
+                                            .Or.StringContaining("DecimalColumn DECIMAL(18,4) null"));
             }
         }
 
@@ -100,6 +102,8 @@ public void Does_execute_CustomSql_before_table_created()
         [Test]
         public void Does_execute_CustomSql_after_table_created()
         {
+            SuppressIfOracle("For Oracle need wrap multiple SQL statements in an anonymous block");
+
             using (var db = OpenDbConnection())
             {
                 db.DropAndCreateTable<ModelWithSeedDataSql>();
@@ -113,6 +117,8 @@ public void Does_execute_CustomSql_after_table_created()
         [Test]
         public void Does_execute_CustomSql_after_table_created_using_dynamic_attribute()
         {
+            SuppressIfOracle("For Oracle need wrap multiple SQL statements in an anonymous block");
+
             typeof(DynamicAttributeSeedData)
                 .AddAttributes(new PostCreateTableAttribute(
                     "INSERT INTO DynamicAttributeSeedData (Name) VALUES ('Foo');" +

tests/ServiceStack.OrmLite.Tests/DateTimeOffsetTests.cs

@@ -5,12 +5,12 @@
 
 namespace ServiceStack.OrmLite.Tests
 {
-    internal class DateTimeOffsetTests : OrmLiteTestBase
+    public class DateTimeOffsetTests : OrmLiteTestBase
     {
         private IDbConnection db;
 
         [TestFixtureSetUp]
-        public void TestFixtureSetUp()
+        public new void TestFixtureSetUp()
         {
             db = base.OpenDbConnection();
         }
@@ -45,29 +45,32 @@ public void EnsureDateTimeOffsetSaves()
         {
             var dateTime = new DateTimeOffset(2012, 1, 30, 1, 1, 1, new TimeSpan(5, 0, 0));
             var x = InsertAndSelectDateTimeOffset<DateTimeOffsetObject, DateTimeOffset>(db, dateTime);
-            Assert.AreEqual(x.Test, dateTime);
+            Assert.That(x.Test, Is.EqualTo(dateTime));
         }
 
         [Test]
         public void EnsureNullableDateTimeOffsetSaves()
         {
             DateTimeOffset? dateTime = new DateTimeOffset(2012, 1, 30, 1, 1, 1, new TimeSpan(5, 0, 0));
             var x = InsertAndSelectDateTimeOffset<NullableDateTimeOffsetObject, DateTimeOffset?>(db, dateTime);
-            Assert.AreEqual(x.Test, dateTime);
+            Assert.That(x.Test, Is.EqualTo(dateTime));
         }
 
         private class DateTimeOffsetObject : IDateTimeOffsetObject<DateTimeOffset>
         {
+            public int Id { get; set; }
             public DateTimeOffset Test { get; set; }
         }
 
         private class NullableDateTimeOffsetObject : IDateTimeOffsetObject<DateTimeOffset?>
         {
+            public int Id { get; set; }
             public DateTimeOffset? Test { get; set; }
         }
 
         private interface IDateTimeOffsetObject<T>
         {
+            int Id { get; set; }
             T Test { get; set; }
         }
     }

tests/ServiceStack.OrmLite.Tests/EnumTests.cs

@@ -133,7 +133,7 @@ public void Creates_int_field_for_enum_flags()
 
                 db.GetLastSql().Print();
 
-                Assert.That(db.GetLastSql(), Is.StringContaining("\"Flags\" INT"));
+                Assert.That(db.GetLastSql(), Is.StringContaining("\"Flags\" INT").Or.StringContaining("Flags INT"));
             }
         }
 
@@ -149,7 +149,7 @@ public void Updates_enum_flags_with_int_value()
                 db.Insert(new TypeWithFlagsEnum { Id = 3, Flags = FlagsEnum.FlagOne | FlagsEnum.FlagTwo });
 
                 db.Update(new TypeWithFlagsEnum { Id = 1, Flags = FlagsEnum.FlagThree });
-                Assert.That(db.GetLastSql(), Is.StringContaining("=@Flags"));
+                Assert.That(db.GetLastSql(), Is.StringContaining("=@Flags").Or.StringContaining("=:Flags"));
                 db.GetLastSql().Print();
 
                 db.UpdateOnly(new TypeWithFlagsEnum { Id = 1, Flags = FlagsEnum.FlagThree }, q => q.Flags);

tests/ServiceStack.OrmLite.Tests/Expression/ExpressionsTestBase.cs

@@ -59,14 +59,5 @@ protected void EstablishContext(int numberOfRandomObjects, params TestType[] obj
                 }
             }
         }
-
-        protected override string GetFileConnectionString()
-        {
-            var connectionString = Config.SqliteFileDir + this.GetType().Name + ".sqlite";
-            if (File.Exists(connectionString))
-                File.Delete(connectionString);
-
-            return connectionString;
-        }
     }
 }

tests/ServiceStack.OrmLite.Tests/JoinSqlBuilderTests.cs

@@ -4,8 +4,8 @@
 
 namespace ServiceStack.OrmLite.Tests
 {
-	[TestFixture ()]
-	public class JoinSqlBuilderTests
+	[TestFixture]
+	public class JoinSqlBuilderTests : OrmLiteTestBase
 	{
 		[Alias("Users")]
 		public class WithAliasUser 
@@ -50,9 +50,11 @@ public class Address
 		}
 
 
-		[Test ()]
+		[Test]
 		public void FieldNameLeftJoinTest ()
 		{
+            SuppressIfOracle("These assert comparisons don't work with Oracle provider because it doesn't quote every name");
+
 			var joinQuery = new JoinSqlBuilder<User, User> ().LeftJoin<User, Address> (x => x.Id, x => x.UserId).ToSql ();
 			var expected = "SELECT \"User\".\"Id\",\"User\".\"Name\",\"User\".\"Age\" \nFROM \"User\" \n LEFT OUTER JOIN  \"Address\" ON \"User\".\"Id\" = \"Address\".\"UserId\"  \n";
 
@@ -71,10 +73,12 @@ public void FieldNameLeftJoinTest ()
 			Assert.AreEqual (expected, joinQuery);
 		}
 
-		[Test ()]
+		[Test]
 		public void DoubleWhereLeftJoinTest ()
 		{
-			var joinQuery = new JoinSqlBuilder<User, User> ().LeftJoin<User, WithAliasAddress> (x => x.Id, x => x.UserId
+            SuppressIfOracle("These assert comparisons don't work with Oracle provider because it doesn't quote every name");
+
+            var joinQuery = new JoinSqlBuilder<User, User>().LeftJoin<User, WithAliasAddress>(x => x.Id, x => x.UserId
 			                                                                                    , sourceWhere: x => x.Age > 18
 			                                                                                    , destinationWhere: x => x.Country == "Italy").ToSql ();
 			var expected = "SELECT \"User\".\"Id\",\"User\".\"Name\",\"User\".\"Age\" \nFROM \"User\" \n LEFT OUTER JOIN  \"Addresses\" ON \"User\".\"Id\" = \"Addresses\".\"UserId\"  \nWHERE (\"User\".\"Age\" > 18) AND (\"Addresses\".\"Countryalias\" = 'Italy') \n";

tests/ServiceStack.OrmLite.Tests/LoadReferencesTests.cs

@@ -74,6 +74,8 @@ public void TestFixtureTearDown()
         [Test]
         public void Does_not_include_complex_reference_type_in_sql()
         {
+            SuppressIfOracle("These assert comparisons don't work with Oracle provider because it doesn't quote every name");
+
             db.Select<Customer>();
             Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"Name\" FROM \"Customer\""));
         }

tests/ServiceStack.OrmLite.Tests/LocalizationTests.cs

@@ -3,20 +3,17 @@
 using System.Threading;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
-using ServiceStack.OrmLite.Sqlite;
-using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests
 {
 	[TestFixture]
-	public class LocalizationTests
-		: OrmLiteTestBase
+	public class LocalizationTests : OrmLiteTestBase
 	{
 		private readonly CultureInfo CurrentCulture = Thread.CurrentThread.CurrentCulture;
 		private readonly CultureInfo CurrentUICulture = Thread.CurrentThread.CurrentUICulture;
 
 		[SetUp]
-		public void TestFixtureSetUp()
+		public void TestSetUp()
 		{
 			Thread.CurrentThread.CurrentCulture = new CultureInfo("vi-VN");
 			Thread.CurrentThread.CurrentUICulture = new CultureInfo("vi-VN");

tests/ServiceStack.OrmLite.Tests/MockAllApiTests.cs

@@ -405,6 +405,8 @@ public void Can_hijack_References_Apis()
                 i += 2; db.Save(customer);
                 Assert.That(sqlStatements.Count, Is.EqualTo(i));
 
+                SuppressIfOracle("This seems wrong here as the save actually goes through to the database in Oracle to get the next number from the sequence");
+
                 i += 1; db.SaveReferences(customer, customer.PrimaryAddress);
                 Assert.That(sqlStatements.Count, Is.EqualTo(i));