[Nhibernate-commit] nhibernate/src/NHibernate.Test/ExpressionTest QueryByExampleTest.cs,1.2,1.3

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5861/src/NHibernate.Test/ExpressionTest

Modified Files:
	QueryByExampleTest.cs 
Log Message:
Abort transactions on failure

Index: QueryByExampleTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/QueryByExampleTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryByExampleTest.cs	31 Mar 2005 12:42:39 -0000	1.2
--- QueryByExampleTest.cs	9 Apr 2005 12:48:06 -0000	1.3
***************
*** 32,46 ****
  		public void TestSimpleQBE()
  		{
! 			ISession s = sessions.OpenSession();
! 			ITransaction t = s.BeginTransaction();
! 			Componentizable master = GetMaster("hibernate", null, "ope%");
! 			ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 			Example ex = Example.create(master).EnableLike();
! 			crit.Add(ex);
! 			IList result = crit.List();
! 			Assertion.AssertNotNull(result);
! 			Assertion.AssertEquals(1, result.Count);
! 			t.Commit();
! 			s.Close();
  		}
  
--- 32,47 ----
  		public void TestSimpleQBE()
  		{
! 			using( ISession s = sessions.OpenSession() )
! 			using( ITransaction t = s.BeginTransaction() )
! 			{
! 				Componentizable master = GetMaster("hibernate", null, "ope%");
! 				ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 				Example ex = Example.create(master).EnableLike();
! 				crit.Add(ex);
! 				IList result = crit.List();
! 				Assert.IsNotNull(result);
! 				Assert.AreEqual(1, result.Count);
! 				t.Commit();
! 			}
  		}
  
***************
*** 49,68 ****
  		public void TestJunctionNotExpressionQBE()
  		{
! 			ISession s = sessions.OpenSession();
! 			ITransaction t = s.BeginTransaction();
! 			Componentizable master = GetMaster("hibernate", null, "ope%");
! 			ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 			Example ex = Example.create(master).EnableLike();
  
  			
! 			crit.Add(Expression.Expression.Or(Expression.Expression.Not(ex), ex));
  
! 			IList result = crit.List();
! 			Assertion.AssertNotNull(result);
! //			if (!(GetDialect()
! //			instanceof HSQLDialect) )
! //			assertEquals(2, result.size());
! 			t.Commit();
! 			s.Close();
  		}
  
--- 50,70 ----
  		public void TestJunctionNotExpressionQBE()
  		{
! 			using( ISession s = sessions.OpenSession() )
! 			using( ITransaction t = s.BeginTransaction() )
! 			{
! 				Componentizable master = GetMaster("hibernate", null, "ope%");
! 				ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 				Example ex = Example.create(master).EnableLike();
  
  			
! 				crit.Add(Expression.Expression.Or(Expression.Expression.Not(ex), ex));
  
! 				IList result = crit.List();
! 				Assert.IsNotNull(result);
! //				if (!(GetDialect()
! //					instanceof HSQLDialect) )
! //					assertEquals(2, result.size());
! 				t.Commit();
! 			}
  		}
  
***************
*** 70,119 ****
  		public void TestExcludingQBE()
  		{
! 			ISession s = sessions.OpenSession();
! 			ITransaction t = s.BeginTransaction();
! 			Componentizable master = GetMaster("hibernate", null, "ope%");
! 			ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 			Example ex = Example.create(master).EnableLike()
! 				.ExcludeProperty("Component.SubComponent");
! 			crit.Add(ex);
! 			IList result = crit.List();
! 			Assertion.AssertNotNull(result);
! 			Assertion.AssertEquals(3, result.Count);
  
! 			master = GetMaster("hibernate", "ORM tool", "fake stuff");
! 			crit = s.CreateCriteria(typeof(Componentizable));
! 			ex = Example.create(master).EnableLike()
! 				.ExcludeProperty("Component.SubComponent.SubName1");
! 			crit.Add(ex);
! 			result = crit.List();
! 			Assertion.AssertNotNull(result);
! 			Assertion.AssertEquals(1, result.Count);
! 			t.Commit();
! 			s.Close();
  		}
  
  		private void initData()
  		{
! 			ISession s = sessions.OpenSession();
! 			Componentizable master = GetMaster("hibernate", "ORM tool", "ORM tool1");
! 			s.Save(master);
! 			s.Close();
! 			s = sessions.OpenSession();
! 			master = GetMaster("hibernate", "open source", "open source1");
! 			s.Save(master);
! 			s.Close();
! 			s = sessions.OpenSession();
! 			master = GetMaster("hibernate", null, null);
! 			s.Save(master);
! 			s.Close();
  		}
  
  		private void deleteData()
  		{
! 			ISession s = sessions.OpenSession();
! 			ITransaction t = s.BeginTransaction();
! 			s.Delete("from Componentizable");
! 			t.Commit();
! 			s.Close();
  		}
  
--- 72,131 ----
  		public void TestExcludingQBE()
  		{
! 			using( ISession s = sessions.OpenSession() )
! 			using( ITransaction t = s.BeginTransaction() )
! 			{
! 				Componentizable master = GetMaster("hibernate", null, "ope%");
! 				ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 				Example ex = Example.create(master).EnableLike()
! 					.ExcludeProperty("Component.SubComponent");
! 				crit.Add(ex);
! 				IList result = crit.List();
! 				Assert.IsNotNull(result);
! 				Assert.AreEqual(3, result.Count);
  
! 				master = GetMaster("hibernate", "ORM tool", "fake stuff");
! 				crit = s.CreateCriteria(typeof(Componentizable));
! 				ex = Example.create(master).EnableLike()
! 					.ExcludeProperty("Component.SubComponent.SubName1");
! 				crit.Add(ex);
! 				result = crit.List();
! 				Assert.IsNotNull(result);
! 				Assert.AreEqual(1, result.Count);
! 				t.Commit();
! 			}
  		}
  
  		private void initData()
  		{
! 			using( ISession s = sessions.OpenSession() )
! 			{
! 				Componentizable master = GetMaster("hibernate", "ORM tool", "ORM tool1");
! 				s.Save(master);
! 				s.Flush();
! 			}
! 
! 			using( ISession s = sessions.OpenSession() )
! 			{
! 				Componentizable master = GetMaster("hibernate", "open source", "open source1");
! 				s.Save(master);
! 				s.Flush();
! 			}
! 
! 			using( ISession s = sessions.OpenSession() )
! 			{
! 				Componentizable master = GetMaster("hibernate", null, null);
! 				s.Save(master);
! 				s.Flush();
! 			}
  		}
  
  		private void deleteData()
  		{
! 			using( ISession s = sessions.OpenSession() )
! 			using( ITransaction t = s.BeginTransaction() )
! 			{
! 				s.Delete("from Componentizable");
! 				t.Commit();
! 			}
  		}