[Nhibernate-commit] SF.net SVN: nhibernate:[4032] trunk/nhibernate/src/NHibernate.Test/ NHSpecificTest/NH1394/Fixture.cs

[<fab...@us...>]

Revision: 4032
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4032&view=rev
Author:   fabiomaulo
Date:     2009-02-04 04:24:02 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Arranged test for Oracle

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1394/Fixture.cs

Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1394/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1394/Fixture.cs	2009-02-04 04:21:16 UTC (rev 4031)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1394/Fixture.cs	2009-02-04 04:24:02 UTC (rev 4032)
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using NHibernate.Criterion;
+using NHibernate.Dialect;
 using NHibernate.Dialect.Function;
 using NUnit.Framework;
 
@@ -80,10 +81,15 @@
 
 				ICriteria c = s.CreateCriteria(typeof (Person)).AddOrder(Order.Asc(Projections.SubQuery(dc)));
 				IList<Person> list = c.List<Person>();
-
-				Assert.AreEqual(list[2].Name, "Tim");
-				Assert.AreEqual(list[3].Name, "Joe");
-				Assert.AreEqual(list[4].Name, "Sally");
+				int nullRelationOffSet = 2;
+				if (Dialect is Oracle8iDialect)
+				{
+					// Oracle order NULL Last (ASC)
+					nullRelationOffSet = 0;
+				}
+				Assert.AreEqual(list[nullRelationOffSet].Name, "Tim");
+				Assert.AreEqual(list[nullRelationOffSet+1].Name, "Joe");
+				Assert.AreEqual(list[nullRelationOffSet+2].Name, "Sally");
 			}
 		}
 
@@ -99,9 +105,15 @@
 				ICriteria c = s.CreateCriteria(typeof (Person)).AddOrder(Order.Desc(Projections.SubQuery(dc)));
 				IList<Person> list = c.List<Person>();
 
-				Assert.AreEqual(list[2].Name, "Tim");
-				Assert.AreEqual(list[1].Name, "Joe");
-				Assert.AreEqual(list[0].Name, "Sally");
+				int nullRelationOffSet = 0;
+				if (Dialect is Oracle8iDialect)
+				{
+					// Oracle order NULL First (DESC)
+					nullRelationOffSet = 2;
+				}
+				Assert.AreEqual(list[nullRelationOffSet+2].Name, "Tim");
+				Assert.AreEqual(list[nullRelationOffSet+1].Name, "Joe");
+				Assert.AreEqual(list[nullRelationOffSet].Name, "Sally");
 			}
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.