Additional tests

baseTwo · baseTwo · commit 6beff415374a · 2025-09-23T20:47:34.000+02:00
diff --git a/Cql/CoreTests/CqlDateTests.cs b/Cql/CoreTests/CqlDateTests.cs
@@ -24,4 +24,112 @@ public void CqlDate_Subtract_Months_From_Year()
         Assert.AreEqual(2011, result.Value.Year);
         Assert.AreEqual(DateTimePrecision.Year, result.Precision);
     }
+
+    [TestMethod]
+    public void Add_Years()
+    {
+        var date = new CqlDate(2020, 1, 1);
+        var quantity = new CqlQuantity(2, "year");
+        var result = date.Add(quantity);
+        Assert.AreEqual(new CqlDate(2022, 1, 1), result);
+    }
+
+    [TestMethod]
+    public void Add_Months()
+    {
+        var date = new CqlDate(2020, 1, 31);
+        var quantity = new CqlQuantity(1, "month");
+        var result = date.Add(quantity);
+        Assert.AreEqual(new CqlDate(2020, 2, 29), result); // Leap year
+    }
+
+    [TestMethod]
+    public void Add_Days()
+    {
+        var date = new CqlDate(2020, 2, 27);
+        var quantity = new CqlQuantity(2, "day");
+        var result = date.Add(quantity);
+        Assert.AreEqual(new CqlDate(2020, 2, 29), result);
+    }
+
+    [TestMethod]
+    public void Subtract_Years()
+    {
+        var date = new CqlDate(2020, 1, 1);
+        var quantity = new CqlQuantity(5, "year");
+        var result = date.Subtract(quantity);
+        Assert.AreEqual(new CqlDate(2015, 1, 1), result);
+    }
+
+    [TestMethod]
+    public void Subtract_Months()
+    {
+        var date = new CqlDate(2020, 3, 31);
+        var quantity = new CqlQuantity(1, "month");
+        var result = date.Subtract(quantity);
+        Assert.AreEqual(new CqlDate(2020, 2, 29), result); // Leap year
+    }
+
+    [TestMethod]
+    public void Subtract_Days()
+    {
+        var date = new CqlDate(2020, 3, 1);
+        var quantity = new CqlQuantity(1, "day");
+        var result = date.Subtract(quantity);
+        Assert.AreEqual(new CqlDate(2020, 2, 29), result);
+    }
+
+    [TestMethod]
+    public void Operator_Addition()
+    {
+        var date = new CqlDate(2021, 12, 31);
+        var quantity = new CqlQuantity(1, "day");
+        var result = date + quantity;
+        Assert.AreEqual(new CqlDate(2022, 1, 1), result);
+    }
+
+    [TestMethod]
+    public void Operator_Subtraction()
+    {
+        var date = new CqlDate(2022, 1, 1);
+        var quantity = new CqlQuantity(1, "day");
+        var result = date - quantity;
+        Assert.AreEqual(new CqlDate(2021, 12, 31), result);
+    }
+
+    [TestMethod]
+    public void Add_NullQuantity_ReturnsNull()
+    {
+        var date = new CqlDate(2020, 1, 1);
+        CqlQuantity? quantity = null;
+        var result = date.Add(quantity);
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    public void Subtract_NullQuantity_ReturnsNull()
+    {
+        var date = new CqlDate(2020, 1, 1);
+        CqlQuantity? quantity = null;
+        var result = date.Subtract(quantity);
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    public void Operator_Addition_NullDate_ReturnsNull()
+    {
+        CqlDate? date = null;
+        var quantity = new CqlQuantity(1, "day");
+        var result = date + quantity;
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    public void Operator_Subtraction_NullDate_ReturnsNull()
+    {
+        CqlDate? date = null;
+        var quantity = new CqlQuantity(1, "day");
+        var result = date - quantity;
+        Assert.IsNull(result);
+    }
 }
diff --git a/Cql/CoreTests/CqlDateTimeTests.cs b/Cql/CoreTests/CqlDateTimeTests.cs
@@ -257,4 +257,92 @@ public void CqlDateTime_WholeCalendarPeriodsBetween_Months()
         Assert.AreEqual(16, boundariesBetween);
 
     }
+
+    [TestMethod]
+    public void Add_Years_OperatorAndMethod()
+    {
+        var dt = new CqlDateTime(2020, 1, 1, 0, 0, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(2, "year");
+
+        var resultMethod = dt.Add(quantity);
+        var resultOperator = dt + quantity;
+
+        Assert.IsNotNull(resultMethod);
+        Assert.IsNotNull(resultOperator);
+        Assert.AreEqual(2022, resultMethod.Value.Year);
+        Assert.AreEqual(2022, resultOperator.Value.Year);
+        Assert.AreEqual(dt.Value.Month, resultMethod.Value.Month);
+        Assert.AreEqual(dt.Value.Day, resultMethod.Value.Day);
+    }
+
+    [TestMethod]
+    public void Subtract_Years_OperatorAndMethod()
+    {
+        var dt = new CqlDateTime(2020, 1, 1, 0, 0, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(3, "year");
+
+        var resultMethod = dt.Subtract(quantity);
+        var resultOperator = dt - quantity;
+
+        Assert.IsNotNull(resultMethod);
+        Assert.IsNotNull(resultOperator);
+        Assert.AreEqual(2017, resultMethod.Value.Year);
+        Assert.AreEqual(2017, resultOperator.Value.Year);
+        Assert.AreEqual(dt.Value.Month, resultMethod.Value.Month);
+        Assert.AreEqual(dt.Value.Day, resultMethod.Value.Day);
+    }
+
+    [TestMethod]
+    public void Add_Months()
+    {
+        var dt = new CqlDateTime(2021, 5, 15, 0, 0, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(7, "month");
+
+        var result = dt.Add(quantity);
+
+        Assert.IsNotNull(result);
+        Assert.AreEqual(2021, result.Value.Year);
+        Assert.AreEqual(12, result.Value.Month);
+        Assert.AreEqual(15, result.Value.Day);
+    }
+
+    [TestMethod]
+    public void Subtract_Days()
+    {
+        var dt = new CqlDateTime(2021, 1, 10, 0, 0, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(5, "day");
+
+        var result = dt.Subtract(quantity);
+
+        Assert.IsNotNull(result);
+        Assert.AreEqual(2021, result.Value.Year);
+        Assert.AreEqual(1, result.Value.Month);
+        Assert.AreEqual(5, result.Value.Day);
+    }
+
+    [TestMethod]
+    public void Add_NullQuantity_ReturnsNull()
+    {
+        var dt = new CqlDateTime(2021, 1, 1, 0, 0, 0, 0, 0, 0);
+        CqlQuantity? quantity = null;
+
+        var result = dt.Add(quantity);
+        var resultOp = dt + quantity;
+
+        Assert.IsNull(result);
+        Assert.IsNull(resultOp);
+    }
+
+    [TestMethod]
+    public void Operator_NullDateTime_ReturnsNull()
+    {
+        CqlDateTime? dt = null;
+        var quantity = new CqlQuantity(1, "year");
+
+        var resultAdd = dt + quantity;
+        var resultSub = dt - quantity;
+
+        Assert.IsNull(resultAdd);
+        Assert.IsNull(resultSub);
+    }
 }
diff --git a/Cql/CoreTests/CqlTimeTests.cs b/Cql/CoreTests/CqlTimeTests.cs
@@ -0,0 +1,98 @@
+﻿/*
+ * Copyright (c) 2025, Firely, NCQA and contributors
+ * See the file CONTRIBUTORS for details.
+ *
+ * This file is licensed under the BSD 3-Clause license
+ * available at https://raw.githubusercontent.com/FirelyTeam/firely-cql-sdk/main/LICENSE
+ */
+
+#nullable enable
+using Hl7.Cql.Primitives;
+
+namespace CoreTests;
+
+[TestClass]
+[TestCategory("UnitTest")]
+public class CqlTimeTests
+{
+    [TestMethod]
+    public void AdditionOperator_AddsMinutes()
+    {
+        var time = new CqlTime(10, 15, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(5, "minute");
+        var result = time + quantity;
+        Assert.IsNotNull(result);
+        Assert.AreEqual(10, result.Value.Hour);
+        Assert.AreEqual(20, result.Value.Minute);
+        Assert.AreEqual(0, result.Value.Second);
+    }
+
+    [TestMethod]
+    public void AdditionOperator_AddsHours()
+    {
+        var time = new CqlTime(8, 0, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(2, "hour");
+        var result = time + quantity;
+        Assert.IsNotNull(result);
+        Assert.AreEqual(10, result.Value.Hour);
+        Assert.AreEqual(0, result.Value.Minute);
+    }
+
+    [TestMethod]
+    public void SubtractionOperator_SubtractsMinutes()
+    {
+        var time = new CqlTime(12, 30, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(15, "minute");
+        var result = time - quantity;
+        Assert.IsNotNull(result);
+        Assert.AreEqual(12, result.Value.Hour);
+        Assert.AreEqual(15, result.Value.Minute);
+    }
+
+    [TestMethod]
+    public void SubtractionOperator_SubtractsHours()
+    {
+        var time = new CqlTime(14, 0, 0, 0, 0, 0);
+        var quantity = new CqlQuantity(3, "hour");
+        var result = time - quantity;
+        Assert.IsNotNull(result);
+        Assert.AreEqual(11, result.Value.Hour);
+        Assert.AreEqual(0, result.Value.Minute);
+    }
+
+    [TestMethod]
+    public void AdditionOperator_NullQuantity_ReturnsNull()
+    {
+        var time = new CqlTime(10, 0, 0, 0, 0, 0);
+        CqlQuantity? quantity = null;
+        var result = time + quantity;
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    public void SubtractionOperator_NullQuantity_ReturnsNull()
+    {
+        var time = new CqlTime(10, 0, 0, 0, 0, 0);
+        CqlQuantity? quantity = null;
+        var result = time - quantity;
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    public void AdditionOperator_NullTime_ReturnsNull()
+    {
+        CqlTime? time = null;
+        var quantity = new CqlQuantity(1, "hour");
+        var result = time + quantity;
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    public void SubtractionOperator_NullTime_ReturnsNull()
+    {
+        CqlTime? time = null;
+        var quantity = new CqlQuantity(1, "hour");
+        var result = time - quantity;
+        Assert.IsNull(result);
+    }
+}
