[Nhibernate-commit] nhibernate/src/NHibernate.Test/ExpressionTest BaseExpressionFixture.cs,1.5,1.6 BetweenExpressionFixture.cs,1.3,1.4 InExpressionFixture.cs,1.3,1.4 InsensitiveLikeExpressionFixture.cs,1.4,1.5 JunctionFixture.cs,1.4,1.5 LogicalExpressionFixture.cs,1.1,1.2 NotExpressionFixture.cs,1.3,1.4 NotNullExpressionFixture.cs,1.1,1.2 NullExpressionFixture.cs,1.1,1.2 PropertyExpressionFixture.cs,1.1,1.2 QueryByExampleTest.cs,1.3,1.4 SimpleExpressionFixture.cs,1.5,1.6 SQLExpressionFixture.cs,1.3,1.4

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

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

Modified Files:
	BaseExpressionFixture.cs BetweenExpressionFixture.cs 
	InExpressionFixture.cs InsensitiveLikeExpressionFixture.cs 
	JunctionFixture.cs LogicalExpressionFixture.cs 
	NotExpressionFixture.cs NotNullExpressionFixture.cs 
	NullExpressionFixture.cs PropertyExpressionFixture.cs 
	QueryByExampleTest.cs SimpleExpressionFixture.cs 
	SQLExpressionFixture.cs 
Log Message:
Fixed up the QBE portion of NHibernate.Expression.

Index: InExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/InExpressionFixture.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
--- InExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.4
***************
*** 26,32 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression inExpression = NExpression.Expression.In("Count", new int[]{3,4,5});
  
! 			SqlString sqlString = inExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "simple_alias.count_ in (:simple_alias.count__0, :simple_alias.count__1, :simple_alias.count__2)";
--- 26,32 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion inExpression = NExpression.Expression.In("Count", new int[]{3,4,5});
  
! 			SqlString sqlString = inExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "simple_alias.count_ in (:simple_alias.count__0, :simple_alias.count__1, :simple_alias.count__2)";

Index: SQLExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/SQLExpressionFixture.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SQLExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
--- SQLExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.4
***************
*** 21,27 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression sqlExpression = NExpression.Expression.Sql("$alias.address is not null");
  
! 			SqlString sqlString = sqlExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "simple_alias.address is not null";
--- 21,27 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion sqlExpression = NExpression.Expression.Sql("$alias.address is not null");
  
! 			SqlString sqlString = sqlExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "simple_alias.address is not null";
***************
*** 37,43 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression sqlExpression = NExpression.Expression.Sql( new SqlString( "$alias.address is not null") );
  
! 			SqlString sqlString = sqlExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "simple_alias.address is not null";
--- 37,43 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion sqlExpression = NExpression.Expression.Sql( new SqlString( "$alias.address is not null") );
  
! 			SqlString sqlString = sqlExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "simple_alias.address is not null";
***************
*** 63,69 ****
  			builder.Add( firstAndParam );
  
! 			NExpression.Expression sqlExpression = NExpression.Expression.Sql(builder.ToSqlString(), "some address", NHibernateUtil.String );
  
! 			SqlString sqlString = sqlExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			CompareSqlStrings(sqlString, expectedSql, expectedParams);
--- 63,69 ----
  			builder.Add( firstAndParam );
  
! 			NExpression.ICriterion sqlExpression = NExpression.Expression.Sql(builder.ToSqlString(), "some address", NHibernateUtil.String );
  
! 			SqlString sqlString = sqlExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			CompareSqlStrings(sqlString, expectedSql, expectedParams);

Index: SimpleExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/SimpleExpressionFixture.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.5
--- SimpleExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.6
***************
*** 31,37 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression andExpression = NExpression.Expression.Eq("Address", "12 Adress");
  
! 			SqlString sqlString = andExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "simple_alias.address = :simple_alias.address";
--- 31,37 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion andExpression = NExpression.Expression.Eq("Address", "12 Adress");
  
! 			SqlString sqlString = andExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "simple_alias.address = :simple_alias.address";
***************
*** 56,62 ****
  			DateTime now = DateTime.Now;
  
! 			NExpression.Expression andExpression = NExpression.Expression.Eq( "Date", now );
  
! 			SqlString sqlString = andExpression.ToSqlString( factoryImpl, typeof(SimpleComponent), "simp_comp" );
  			string quotedColumn = dialect.QuoteForColumnName( "d[at]e_" );
  			string expectedSql = "simp_comp." + quotedColumn + " = :simp_comp." + quotedColumn;
--- 56,62 ----
  			DateTime now = DateTime.Now;
  
! 			NExpression.ICriterion andExpression = NExpression.Expression.Eq( "Date", now );
  
! 			SqlString sqlString = andExpression.ToSqlString( factoryImpl, typeof(SimpleComponent), "simp_comp", BaseExpressionFixture.EmptyAliasClasses  );
  			string quotedColumn = dialect.QuoteForColumnName( "d[at]e_" );
  			string expectedSql = "simp_comp." + quotedColumn + " = :simp_comp." + quotedColumn;
***************
*** 72,78 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression andExpression = NExpression.Expression.Ge( "Date", DateTime.Now );
  
! 			SqlString sqlString = andExpression.ToSqlString( factoryImpl, typeof(Simple), "simple_alias" );
  
  			string expectedSql = "simple_alias.date_ >= :simple_alias.date_";
--- 72,78 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion andExpression = NExpression.Expression.Ge( "Date", DateTime.Now );
  
! 			SqlString sqlString = andExpression.ToSqlString( factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses  );
  
  			string expectedSql = "simple_alias.date_ >= :simple_alias.date_";

Index: NullExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/NullExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NullExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- NullExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.2
***************
*** 25,31 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression expression = NExpression.Expression.IsNull("Address");
  
! 			SqlString sqlString = expression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "simple_alias.address IS NULL";
--- 25,31 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion expression = NExpression.Expression.IsNull("Address");
  
! 			SqlString sqlString = expression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "simple_alias.address IS NULL";

Index: NotExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NotExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
--- NotExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.4
***************
*** 24,30 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression notExpression = NExpression.Expression.Not(NExpression.Expression.Eq("Address", "12 Adress"));
  
! 			SqlString sqlString = notExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "not simple_alias.address = :simple_alias.address";
--- 24,30 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion notExpression = NExpression.Expression.Not(NExpression.Expression.Eq("Address", "12 Adress"));
  
! 			SqlString sqlString = notExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "not simple_alias.address = :simple_alias.address";

Index: QueryByExampleTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/QueryByExampleTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QueryByExampleTest.cs	9 Apr 2005 12:48:06 -0000	1.3
--- QueryByExampleTest.cs	17 Apr 2005 17:16:05 -0000	1.4
***************
*** 14,29 ****
  	public class QueryByExampleTest : TestCase
  	{
- 		public QueryByExampleTest()
- 		{
- 			//
- 			// TODO: Add constructor logic here
- 			//
- 		}
- 
  		[SetUp]
  		public void SetUp() 
  		{
  			ExportSchema( new string[] { "Componentizable.hbm.xml"});
! 			initData();
  		}
  		
--- 14,22 ----
  	public class QueryByExampleTest : TestCase
  	{
  		[SetUp]
  		public void SetUp() 
  		{
  			ExportSchema( new string[] { "Componentizable.hbm.xml"});
! 			InitData();
  		}
  		
***************
*** 37,41 ****
  				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();
--- 30,34 ----
  				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();
***************
*** 47,51 ****
  
  		[Test]
! 		[Ignore("Test Fails with Exception - do to with Criteria expression/parameter handling")]
  		public void TestJunctionNotExpressionQBE()
  		{
--- 40,44 ----
  
  		[Test]
! 		//[Ignore("Test Fails with Exception - do to with Criteria expression/parameter handling")]
  		public void TestJunctionNotExpressionQBE()
  		{
***************
*** 55,59 ****
  				Componentizable master = GetMaster("hibernate", null, "ope%");
  				ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 				Example ex = Example.create(master).EnableLike();
  
  			
--- 48,52 ----
  				Componentizable master = GetMaster("hibernate", null, "ope%");
  				ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 				Example ex = Example.Create(master).EnableLike();
  
  			
***************
*** 77,81 ****
  				Componentizable master = GetMaster("hibernate", null, "ope%");
  				ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 				Example ex = Example.create(master).EnableLike()
  					.ExcludeProperty("Component.SubComponent");
  				crit.Add(ex);
--- 70,74 ----
  				Componentizable master = GetMaster("hibernate", null, "ope%");
  				ICriteria crit = s.CreateCriteria(typeof(Componentizable));
! 				Example ex = Example.Create(master).EnableLike()
  					.ExcludeProperty("Component.SubComponent");
  				crit.Add(ex);
***************
*** 86,90 ****
  				master = GetMaster("hibernate", "ORM tool", "fake stuff");
  				crit = s.CreateCriteria(typeof(Componentizable));
! 				ex = Example.create(master).EnableLike()
  					.ExcludeProperty("Component.SubComponent.SubName1");
  				crit.Add(ex);
--- 79,83 ----
  				master = GetMaster("hibernate", "ORM tool", "fake stuff");
  				crit = s.CreateCriteria(typeof(Componentizable));
! 				ex = Example.Create(master).EnableLike()
  					.ExcludeProperty("Component.SubComponent.SubName1");
  				crit.Add(ex);
***************
*** 96,100 ****
  		}
  
! 		private void initData()
  		{
  			using( ISession s = sessions.OpenSession() )
--- 89,93 ----
  		}
  
! 		private void InitData()
  		{
  			using( ISession s = sessions.OpenSession() )
***************
*** 120,124 ****
  		}
  
! 		private void deleteData()
  		{
  			using( ISession s = sessions.OpenSession() )
--- 113,117 ----
  		}
  
! 		private void DeleteData()
  		{
  			using( ISession s = sessions.OpenSession() )

Index: BetweenExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/BetweenExpressionFixture.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BetweenExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
--- BetweenExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.4
***************
*** 24,29 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression betweenExpression = NExpression.Expression.Between("Count", 5, 10);
! 			SqlString sqlString = betweenExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  
--- 24,29 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion betweenExpression = NExpression.Expression.Between("Count", 5, 10);
! 			SqlString sqlString = betweenExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  

Index: LogicalExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/LogicalExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogicalExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- LogicalExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.2
***************
*** 29,38 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression orExpression = NExpression.Expression.Or(NExpression.Expression.IsNull("Address"),NExpression.Expression.Between("Count", 5, 10) );
  
  			
! 			SqlString sqlString = orExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
! 			string expectedSql = "((simple_alias.address IS NULL) or (simple_alias.count_ between :simple_alias.count__lo and :simple_alias.count__hi))";
  			
  			CompareSqlStrings(sqlString, expectedSql, 2);
--- 29,38 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion orExpression = NExpression.Expression.Or(NExpression.Expression.IsNull("Address"),NExpression.Expression.Between("Count", 5, 10) );
  
  			
! 			SqlString sqlString = orExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
! 			string expectedSql = "(simple_alias.address IS NULL or simple_alias.count_ between :simple_alias.count__lo and :simple_alias.count__hi)";
  			
  			CompareSqlStrings(sqlString, expectedSql, 2);

Index: InsensitiveLikeExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/InsensitiveLikeExpressionFixture.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InsensitiveLikeExpressionFixture.cs	16 Feb 2005 20:09:18 -0000	1.4
--- InsensitiveLikeExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.5
***************
*** 25,31 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression expression = NExpression.Expression.InsensitiveLike("Address", "12 Adress");
  
! 			SqlString sqlString = expression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  			
  			string expectedSql = "lower(simple_alias.address) like :simple_alias.address";
--- 25,31 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion expression = NExpression.Expression.InsensitiveLike("Address", "12 Adress");
  
! 			SqlString sqlString = expression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  			
  			string expectedSql = "lower(simple_alias.address) like :simple_alias.address";

Index: NotNullExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/NotNullExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NotNullExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- NotNullExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.2
***************
*** 24,30 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression notNullExpression = NExpression.Expression.IsNotNull("Address");
  
! 			SqlString sqlString = notNullExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "simple_alias.address IS NOT NULL";
--- 24,30 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion notNullExpression = NExpression.Expression.IsNotNull("Address");
  
! 			SqlString sqlString = notNullExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "simple_alias.address IS NOT NULL";

Index: BaseExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/BaseExpressionFixture.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BaseExpressionFixture.cs	18 Nov 2004 02:47:00 -0000	1.5
--- BaseExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.6
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using System.Collections;
  using System.Reflection;
  
***************
*** 20,23 ****
--- 21,26 ----
  		protected Dialect.Dialect dialect;
  		
+ 		protected static readonly IDictionary EmptyAliasClasses = new Hashtable();
+ 
  		[SetUp]
  		public virtual void SetUp() 

Index: PropertyExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/PropertyExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PropertyExpressionFixture.cs	2 Aug 2004 04:30:36 -0000	1.1
--- PropertyExpressionFixture.cs	17 Apr 2005 17:16:05 -0000	1.2
***************
*** 26,32 ****
  			ISession session = factory.OpenSession();
  			
! 			NExpression.Expression andExpression = NExpression.Expression.EqProperty("Address", "Name");
  
! 			SqlString sqlString = andExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  
  			string expectedSql = "simple_alias.address = simple_alias.Name";
--- 26,32 ----
  			ISession session = factory.OpenSession();
  			
! 			NExpression.ICriterion andExpression = NExpression.Expression.EqProperty("Address", "Name");
  
! 			SqlString sqlString = andExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  
  			string expectedSql = "simple_alias.address = simple_alias.Name";

Index: JunctionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/JunctionFixture.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JunctionFixture.cs	17 Jan 2005 03:40:51 -0000	1.4
--- JunctionFixture.cs	17 Apr 2005 17:16:05 -0000	1.5
***************
*** 37,41 ****
  		public void SqlString()
  		{
! 			SqlString sqlString = _conjunction.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
  			
  			string expectedSql = "(simple_alias.address IS NULL and simple_alias.count_ between :simple_alias.count__lo and :simple_alias.count__hi)";
--- 37,41 ----
  		public void SqlString()
  		{
! 			SqlString sqlString = _conjunction.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
  			
  			string expectedSql = "(simple_alias.address IS NULL and simple_alias.count_ between :simple_alias.count__lo and :simple_alias.count__hi)";
***************
*** 48,52 ****
  		public void GetTypedValues() 
  		{
! 			TypedValue[] typedValues = _conjunction.GetTypedValues( factoryImpl, typeof(Simple) );
  
  			TypedValue[] expectedTV = new TypedValue[2];
--- 48,52 ----
  		public void GetTypedValues() 
  		{
! 			TypedValue[] typedValues = _conjunction.GetTypedValues( factoryImpl, typeof(Simple), BaseExpressionFixture.EmptyAliasClasses );
  
  			TypedValue[] expectedTV = new TypedValue[2];