Fix broken test

Author: maca88

src/NHibernate.Test/Hql/Ast/SqlTranslationFixture.cs

@@ -23,6 +23,16 @@ public void CaseClauseWithMath()
 			Assert.DoesNotThrow(() => GetSql(queryWithoutParen));
 		}
 
+		[Test]
+		public void SimpleCaseClauseWithMath()
+		{
+			const string query = "from SimpleClass s where (case (cast(s.IntValue as long) * :pAValue) when (cast(s.IntValue as long) * :pAValue) then (cast(s.IntValue as long) * :pAValue) else 1 end) > 0";
+			Assert.DoesNotThrow(() => GetSql(query));
+
+			const string queryWithoutParen = "from SimpleClass s where (case cast(s.IntValue as long) * :pAValue when cast(s.IntValue as long) * :pAValue then cast(s.IntValue as long) * :pAValue else 1 end) > 0";
+			Assert.DoesNotThrow(() => GetSql(queryWithoutParen));
+		}
+
 		[Test]
 		public void Union()
 		{

src/NHibernate/Hql/Ast/ANTLR/Hql.g

@@ -533,12 +533,12 @@ caseExpression
 	;
 
 simpleCaseStatement
-	: CASE unaryExpression (simpleCaseWhenClause)+ (elseClause)? END
-		-> ^(CASE2 unaryExpression simpleCaseWhenClause+ elseClause?)
+	: CASE expression (simpleCaseWhenClause)+ (elseClause)? END
+		-> ^(CASE2 expression simpleCaseWhenClause+ elseClause?)
 	;
 
 simpleCaseWhenClause
-	: (WHEN^ unaryExpression THEN! unaryExpression)
+	: (WHEN^ expression THEN! expression)
 	;
 	
 elseClause
@@ -551,7 +551,7 @@ searchedCaseStatement
 	;
 
 searchedCaseWhenClause
-	: (WHEN^ logicalExpression THEN! unaryExpression)
+	: (WHEN^ logicalExpression THEN! expression)
 	;
 	
 quantifiedExpression