[Nhibernate-commit] nhibernate/src/NHibernate.Test FooBarTest.cs,1.42,1.43

[Michael D. <mik...@us...>]

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

Modified Files:
	FooBarTest.cs 
Log Message:
Continued to work on CollectionsInSelect.

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** FooBarTest.cs	13 Jul 2004 06:47:32 -0000	1.42
--- FooBarTest.cs	13 Jul 2004 21:01:01 -0000	1.43
***************
*** 846,850 ****
  
  		[Test]
! 		[Ignore("Test is failing becuase items in Arrays are being deleted.")]
  		public void CollectionsInSelect() 
  		{
--- 846,850 ----
  
  		[Test]
! 		[Ignore("Test is failing because sub selects are not working. http://jira.nhibernate.org:8080/browse/NH-69")]
  		public void CollectionsInSelect() 
  		{
***************
*** 907,913 ****
  				s.Find("select count(*) from Bar as bar, bar.Component.Glarch.ProxyArray as g where g.id in indices(bar.Baz.FooArray)");
  				s.Find("select max( elements(bar.Baz.FooArray) ) from Bar as bar, bar.Component.Glarch.ProxyArray as g where g.id in indices(bar.Baz.FooArray)");
! 				//s.Find("select count(*) from Bar as bar where 1 in (from bar.Component.Glarch.ProxyArray g where g.Name='foo')");
! 				//s.Find("select count(*) from Bar as bar where 1 in (from g in bar.Component.Glarch.ProxyArray.elements where g.Name='foo')");
! 				//s.Find("select count(*) from Bar as bar left outer join bar.Component.Glarch.ProxyArray as pg where 1 in (from g in bar.Component.Glarch.ProxyArray)");
  			}
              
--- 907,913 ----
  				s.Find("select count(*) from Bar as bar, bar.Component.Glarch.ProxyArray as g where g.id in indices(bar.Baz.FooArray)");
  				s.Find("select max( elements(bar.Baz.FooArray) ) from Bar as bar, bar.Component.Glarch.ProxyArray as g where g.id in indices(bar.Baz.FooArray)");
! //				s.Find("select count(*) from Bar as bar where 1 in (from bar.Component.Glarch.ProxyArray g where g.Name='foo')");
! //				s.Find("select count(*) from Bar as bar where 1 in (from g in bar.Component.Glarch.ProxyArray.elements where g.Name='foo')");
! //				s.Find("select count(*) from Bar as bar left outer join bar.Component.Glarch.ProxyArray as pg where 1 in (from g in bar.Component.Glarch.ProxyArray)");
  			}
              
***************
*** 916,920 ****
  			Assert.AreEqual( 2, ((object[])list[0]).Length );
  
- 			//TODO: flush is causing array delete
  			list = s.Find("select baz.Name from Bar bar inner join bar.Baz baz inner join baz.FooSet foo where baz.Name = bar.String");
  			s.Find("SELECT baz.Name FROM Bar AS bar INNER JOIN bar.Baz AS baz INNER JOIN baz.FooSet AS foo WHERE baz.Name = bar.String");
--- 916,919 ----
***************
*** 941,951 ****
  			Assert.AreEqual( 1, s.Find("from Bar bar join bar.Baz.FooArray foo").Count );
  			
! 			//Assert.AreEqual( 0, s.Find("from bar in class Bar, foo in bar.Baz.FooSet.elements").Count );
! 			//Assert.AreEqual( 1, s.Find("from bar in class Bar, foo in elements( bar.Baz.FooArray )").Count );
  
  			s.Delete(bar);
  
- 
- 
  			s.Delete(baz);
  			s.Delete(baz2);
--- 940,948 ----
  			Assert.AreEqual( 1, s.Find("from Bar bar join bar.Baz.FooArray foo").Count );
  			
! 			Assert.AreEqual( 0, s.Find("from bar in class Bar, foo in bar.Baz.FooSet.elements").Count );
! 			Assert.AreEqual( 1, s.Find("from bar in class Bar, foo in elements( bar.Baz.FooArray )").Count );
  
  			s.Delete(bar);
  
  			s.Delete(baz);
  			s.Delete(baz2);