Enable some tests involving substring() for Firebird, as it should now work (following fix for NH-3587, related to NH-3409).

Author: oskarb

src/NHibernate.Test/Hql/HQLFunctions.cs

@@ -253,19 +253,16 @@ public void SubStringTwoParameters()
 
 				// In the where clause.
 				hql = "from Animal a where substring(a.Description, 4) = 'def'";
-				var result = (Animal)s.CreateQuery(hql).UniqueResult();
+				var result = (Animal) s.CreateQuery(hql).UniqueResult();
 				Assert.AreEqual("abcdef", result.Description);
 
 				// With parameters and nested function calls.
-				if (!(Dialect is FirebirdDialect))  // Firebird only supports integer literals for start (and length).
-				{
-					hql = "from Animal a where substring(concat(a.Description, ?), :start) = 'deffoo'";
-					result = (Animal) s.CreateQuery(hql)
-										.SetParameter(0, "foo")
-										.SetParameter("start", 4)
-										.UniqueResult();
-					Assert.AreEqual("abcdef", result.Description);
-				}
+				hql = "from Animal a where substring(concat(a.Description, ?), :start) = 'deffoo'";
+				result = (Animal) s.CreateQuery(hql)
+				                   .SetParameter(0, "foo")
+				                   .SetParameter("start", 4)
+				                   .UniqueResult();
+				Assert.AreEqual("abcdef", result.Description);
 			}
 		}
 
@@ -295,12 +292,6 @@ public void SubString()
 				Assert.AreEqual("abcdef", result.Description);
 
 
-				if (Dialect is FirebirdDialect)
-				{
-					// Firebird only supports integer literals for start (and length).
-					return;
-				}
-
 				// Following tests verify that parameters can be used.
 
 				hql = "from Animal a where substring(a.Description, 2, ?) = 'bcd'";

src/NHibernate.Test/Linq/FunctionTests.cs

@@ -47,25 +47,19 @@ where NHibernate.Test.Linq.FunctionTests.SqlMethods.Like(e.FirstName, "Ma%et")
 		[Test]
 		public void SubstringFunction2()
 		{
-			if (Dialect is FirebirdDialect)
-				Assert.Ignore("Firebird before 2.0 only support integer literals for substring() - NH generates parameters.");
-
 			var query = (from e in db.Employees
-						 where e.FirstName.Substring(0, 2) == "An"
-						 select e).ToList();
+				where e.FirstName.Substring(0, 2) == "An"
+				select e).ToList();
 
 			Assert.That(query.Count, Is.EqualTo(2));
 		}
 
 		[Test]
 		public void SubstringFunction1()
 		{
-			if (Dialect is FirebirdDialect)
-				Assert.Ignore("Firebird before 2.0 only support integer literals for substring() - NH generates parameters.");
-
 			var query = (from e in db.Employees
-						 where e.FirstName.Substring(3) == "rew"
-						 select e).ToList();
+				where e.FirstName.Substring(3) == "rew"
+				select e).ToList();
 
 			Assert.That(query.Count, Is.EqualTo(1));
 			Assert.That(query[0].FirstName, Is.EqualTo("Andrew"));