Bind extra comparison policies and add missing unit tests

Author: ll-nick

test/python_bindings.cpp

@@ -8,13 +8,29 @@ namespace py = pybind11;
 
 using namespace util_caching;
 
+struct SomePolicyWithoutParams {
+    SomePolicyWithoutParams() = default;
+    bool operator()(const Time& /*lhs*/, const Time& /*rhs*/) const {
+        return true;
+    }
+};
+
 PYBIND11_MODULE(util_caching_py, mainModule) {
+    using ApproximateNumberT = policies::ApproximateNumber<double>;
+    using ApproximateTimeT = policies::ApproximateTime<Time, std::chrono::milliseconds>;
+    using ApproximateTimeSecondsT = policies::ApproximateTime<Time, std::chrono::seconds>;
+
+    py::class_<SomePolicyWithoutParams, std::shared_ptr<SomePolicyWithoutParams>>(mainModule, "SomePolicyWithoutParams")
+        .def(py::init<>())
+        .def("__call__", &SomePolicyWithoutParams::operator());
+
     py::module numberBased = mainModule.def_submodule("number_based");
     python_api::number_based::bindApproximatePolicy<double>(numberBased);
-    python_api::number_based::bindCache<double, double, policies::ApproximateNumber<double>>(numberBased);
+    python_api::number_based::bindCache<double, double, ApproximateNumberT>(numberBased);
 
     py::module timeBased = mainModule.def_submodule("time_based");
-    python_api::time_based::bindApproximatePolicy<Time, std::chrono::milliseconds>(timeBased);
-    python_api::time_based::bindCache<Time, double, policies::ApproximateTime<Time, std::chrono::milliseconds>>(
+    python_api::time_based::bindApproximatePolicy<Time, std::chrono::milliseconds>(timeBased, "ApproximateTime");
+    python_api::time_based::bindApproximatePolicy<Time, std::chrono::seconds>(timeBased, "ApproximateTimeSeconds");
+    python_api::time_based::bindCache<Time, double, ApproximateTimeT, ApproximateTimeSecondsT, SomePolicyWithoutParams>(
         timeBased);
 }

test/util_caching.py

@@ -2,7 +2,7 @@
 import unittest
 import time
 
-from util_caching_py import number_based, time_based
+from util_caching_py import number_based, time_based, SomePolicyWithoutParams
 
 
 class CacheTest(unittest.TestCase):
@@ -18,7 +18,8 @@ def setUp(self):
         self.cache_by_time = time_based.Cache()
         self.approximate_number_policy = number_based.ApproximateNumber(0.5)
         self.approximate_time_policy = time_based.ApproximateTime(100)
-        self.approximate_time_policy_2 = time_based.ApproximateTime(1000)
+        self.approximate_time_policy_2 = time_based.ApproximateTimeSeconds(1)
+        self.dummy_policy = SomePolicyWithoutParams()
 
     def test_with_number_key(self):
         self.assertIsNone(self.cache_by_number.cached(self.key1))
@@ -70,11 +71,19 @@ def test_with_time_key(self):
         self.assertIsNone(
             self.cache_by_time.cached(self.time3, self.approximate_time_policy)
         )
+        # exactly 1s after rounding to integer
+        self.assertTrue(
+            self.cache_by_time.cached(self.time3, self.approximate_time_policy_2)
+        )
         # expect 2s after rounding to integer which is over threshold
         self.assertIsNone(
             self.cache_by_time.cached(self.time4, self.approximate_time_policy_2)
         )
 
+    def test_with_other_comparison_policy(self):
+        self.cache_by_time.cache(self.time1, 1.0)
+        self.assertTrue(self.cache_by_time.cached(self.time2, self.dummy_policy))
+
 
 if __name__ == "__main__":
     header = "Running " + os.path.basename(__file__)