From eeebc61848611fe3f1b8bf35d47ca48b5162a206 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 2 Aug 2024 12:15:31 +1200
Subject: [PATCH 1/2] Add arithmetic function tests

---
 tests/cql/CqlArithmeticFunctionsTest.xml | 76 ++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/tests/cql/CqlArithmeticFunctionsTest.xml b/tests/cql/CqlArithmeticFunctionsTest.xml
index ff1a881..e609a4d 100644
--- a/tests/cql/CqlArithmeticFunctionsTest.xml
+++ b/tests/cql/CqlArithmeticFunctionsTest.xml
@@ -40,6 +40,10 @@
 			<expression>1 + 1</expression>
 			<output>2</output>
 		</test>
+		<test name="Add1L2L">
+			<expression>1L + 2L</expression>
+			<output>3L</output>
+		</test>
 		<test name="Add1D1D">
 			<expression>1.0 + 1.0</expression>
 			<output>2.0</output>
@@ -104,6 +108,10 @@
 			<expression>1 / 1</expression>
 			<output>1.0</output>
 		</test>
+		<test name="Divide1L1L">
+			<expression>1L / 1L</expression>
+			<output>1.0</output>
+		</test>
 		<test name="Divide1d1d">
 			<expression>1.0 / 1.0</expression>
 			<output>1.0</output>
@@ -195,6 +203,10 @@
 			<expression>Round(Exp(1), 8)</expression>
 			<output>2.71828183</output>
 		</test>
+		<test name="Exp1L">
+			<expression>Round(Exp(1L), 8)</expression>
+			<output>2.71828183</output>
+		</test>
 		<test name="ExpNeg1">
 			<expression>Round(Exp(-1), 8)</expression>
 			<output>0.36787944</output>
@@ -225,6 +237,14 @@
 			<expression>HighBoundary(@T10:30, 9)</expression>
 			<output>@T10:30:59.999</output>
 		</test>
+		<test name="HighBoundaryNull">
+			<expression>HighBoundary(null as Decimal, 8)</expression>
+			<output>null</output>
+		</test>
+		<test name="HighBoundaryNullPrecision">
+			<expression>HighBoundary(1.58888, null)</expression>
+			<output>1.58888999</output>
+		</test>
 	</group>
 	<group name="Log">
 		<test name="LogNullNull">
@@ -239,6 +259,10 @@
 			<expression>Log(1, 1)</expression>
 			<output>null</output>
 		</test>
+		<test name="Log2Base1">
+			<expression>Log(2, 1)</expression>
+			<output>null</output>
+		</test>
 		<test name="Log1Base2">
 			<expression>Log(1, 2)</expression>
 			<output>0.0</output>
@@ -247,6 +271,10 @@
 			<expression>Log(1, 100)</expression>
 			<output>0.0</output>
 		</test>
+		<test name="Log1Base100L">
+			<expression>Log(1L, 100L)</expression>
+			<output>0.0</output>
+		</test>
 		<test name="Log16Base2">
 			<expression>Log(16, 2)</expression>
 			<output>4.0</output>
@@ -273,6 +301,14 @@
 			<expression>LowBoundary(@T10:30, 9)</expression>
 			<output>@T10:30:00.000</output>
 		</test>
+		<test name="LowBoundaryNull">
+			<expression>LowBoundary(null as Decimal, 8)</expression>
+			<output>null</output>
+		</test>
+		<test name="LowBoundaryNullPrecision">
+			<expression>LowBoundary(1.58888, null)</expression>
+			<output>1.58888000</output>
+		</test>
 	</group>
 	<group name="Ln">
 		<test name="LnNull">
@@ -291,6 +327,10 @@
 			<expression>Ln(1)</expression>
 			<output>0.0</output>
 		</test>
+		<test name="Ln1L">
+			<expression>Ln(1L)</expression>
+			<output>0.0</output>
+		</test>
 		<test name="LnNeg1">
 			<expression>Ln(-1)</expression>
 			<output>null</output>
@@ -400,6 +440,14 @@
 			<expression>3.5 'cm' mod 3 'cm'</expression>
 			<output>0.5 'cm'</output>
 		</test>
+		<test name="Modulo10By3Quantity">
+			<expression>10.0 'g' mod 3.0 'g'</expression>
+			<output>1.0 'g'</output>
+		</test>
+		<test name="Modulo10By0Quantity">
+			<expression>10.0 'g' mod 0.0 'g'</expression>
+			<output>null</output>
+		</test>
 	</group>
 	<group name="Multiply">
 		<test name="MultiplyNull">
@@ -410,6 +458,10 @@
 			<expression>1 * 1</expression>
 			<output>1</output>
 		</test>
+		<test name="Multiply2LBy3L">
+			<expression>2L * 3L</expression>
+			<output>6L</output>
+		</test>
 		<test name="Multiply1DBy2D">
 			<expression>1.0 * 2.0</expression>
 			<output>2.0</output>
@@ -445,6 +497,14 @@
 			<expression>-1</expression>
 			<output>-1</output>
 		</test>
+		<test name="Negate1L">
+			<expression>-1L</expression>
+			<output>-1L</output>
+		</test>
+		<test name="NegateMaxLong">
+			<expression>-9223372036854775807L</expression>
+			<output>-9223372036854775807L</output>
+		</test>
 		<test name="NegateNeg1">
 			<expression>-(-1)</expression>
 			<output>1</output>
@@ -591,6 +651,10 @@
 			<expression>2^4</expression>
 			<output>16</output>
 		</test>
+		<test name="Power2LTo3L">
+			<expression>2L^3L</expression>
+			<output>8L</output>
+		</test>
 		<test name="Power2DTo4D">
 			<expression>2.0^4.0</expression>
 			<output>16.0</output>
@@ -829,5 +893,17 @@
 			<expression>10.1 'cm' div -3.1 'cm'</expression>
 			<output>-3.0 'cm'</output>
 		</test>
+		<test name="TruncatedDivide10By5DQuantity">
+			<expression>10.0 'g' div 5.0 'g'</expression>
+			<output>2.0 'g'</output>
+		</test>
+		<test name="TruncatedDivide414By206DQuantity">
+			<expression>4.14 'm' div 2.06 'm'</expression>
+			<output>2.0 'm'</output>
+		</test>
+		<test name="TruncatedDivide10By0DQuantity">
+			<expression>10.0 'g' div 0.0 'g'</expression>
+			<output>null</output>
+		</test>
 	</group>
 </tests>

From 4167c67c46f8c15d08d27ccd1d3ba61b3b8c5f3f Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 2 Aug 2024 17:01:49 +1200
Subject: [PATCH 2/2] Separate out new boundary tests

---
 tests/cql/CqlArithmeticFunctionsTest.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tests/cql/CqlArithmeticFunctionsTest.xml b/tests/cql/CqlArithmeticFunctionsTest.xml
index e609a4d..2de2993 100644
--- a/tests/cql/CqlArithmeticFunctionsTest.xml
+++ b/tests/cql/CqlArithmeticFunctionsTest.xml
@@ -237,14 +237,6 @@
 			<expression>HighBoundary(@T10:30, 9)</expression>
 			<output>@T10:30:59.999</output>
 		</test>
-		<test name="HighBoundaryNull">
-			<expression>HighBoundary(null as Decimal, 8)</expression>
-			<output>null</output>
-		</test>
-		<test name="HighBoundaryNullPrecision">
-			<expression>HighBoundary(1.58888, null)</expression>
-			<output>1.58888999</output>
-		</test>
 	</group>
 	<group name="Log">
 		<test name="LogNullNull">
@@ -301,14 +293,6 @@
 			<expression>LowBoundary(@T10:30, 9)</expression>
 			<output>@T10:30:00.000</output>
 		</test>
-		<test name="LowBoundaryNull">
-			<expression>LowBoundary(null as Decimal, 8)</expression>
-			<output>null</output>
-		</test>
-		<test name="LowBoundaryNullPrecision">
-			<expression>LowBoundary(1.58888, null)</expression>
-			<output>1.58888000</output>
-		</test>
 	</group>
 	<group name="Ln">
 		<test name="LnNull">