1 files changed, 107 insertions, 0 deletions
diff --git a/src/tests/catchy/test_utils.cpp b/src/tests/catchy/test_utils.cpp
index 17c35a678..41eef3e45 100644
--- a/src/tests/catchy/test_utils.cpp
+++ b/src/tests/catchy/test_utils.cpp
@@ -3,5 +3,112 @@
 
 #include "catch.hpp"
 
+#include <botan/calendar.h>
+#include <botan/internal/rounding.h>
+
 using namespace Botan;
 
+TEST_CASE("round_up strictly positive", "[utils]")
+   {
+   CHECK(( round_up( 1, 10) == 10 ));
+   CHECK(( round_up( 3, 10) == 10 ));
+   CHECK(( round_up( 9, 10) == 10 ));
+   CHECK(( round_up(10, 10) == 10 ));
+
+   CHECK(( round_up( 1, 4) ==  4 ));
+   CHECK(( round_up( 3, 4) ==  4 ));
+   CHECK(( round_up( 4, 4) ==  4 ));
+   CHECK(( round_up( 9, 4) == 12 ));
+   CHECK(( round_up(10, 4) == 12 ));
+   }
+
+/*
+This was broken
+
+TEST_CASE("round_up strictly negative", "[utils]")
+   {
+   CHECK(( round_up( -1, 10) ==   0 ));
+   CHECK(( round_up( -3, 10) ==   0 ));
+   CHECK(( round_up( -9, 10) ==   0 ));
+   CHECK(( round_up(-10, 10) == -10 ));
+
+   CHECK(( round_up( -1, 3) ==  0 ));
+   CHECK(( round_up( -3, 3) == -3 ));
+   CHECK(( round_up( -8, 3) == -3 ));
+   CHECK(( round_up( -9, 3) == -9 ));
+   CHECK(( round_up(-10, 3) == -9 ));
+   }
+*/
+
+TEST_CASE("round_up zero", "[utils]")
+   {
+   CHECK(( round_up(0, 2) == 0 ));
+   CHECK(( round_up(0, 10) == 0 ));
+   CHECK(( round_up(0, 1000) == 0 ));
+   CHECK(( round_up(0, 99999) == 0 ));
+   CHECK(( round_up(0, 2222222) == 0 ));
+   }
+
+TEST_CASE("round_up invalid input", "[utils]")
+   {
+   CHECK_THROWS( round_up(3, 0) );
+   CHECK_THROWS( round_up(5, 0) );
+   }
+
+TEST_CASE("calendar_point constructor works", "[utils]")
+   {
+   auto point1 = calendar_point(1988, 04, 23, 14, 37, 28);
+   CHECK(( point1.year == 1988 ));
+   CHECK(( point1.month == 4 ));
+   CHECK(( point1.day == 23 ));
+   CHECK(( point1.hour == 14 ));
+   CHECK(( point1.minutes == 37 ));
+   CHECK(( point1.seconds == 28 ));
+
+   auto point2 = calendar_point(1800, 01, 01, 0, 0, 0);
+   CHECK(( point2.year == 1800 ));
+   CHECK(( point2.month == 1 ));
+   CHECK(( point2.day == 1 ));
+   CHECK(( point2.hour == 0 ));
+   CHECK(( point2.minutes == 0 ));
+   CHECK(( point2.seconds == 0 ));
+
+   auto point3 = calendar_point(2037, 12, 31, 24, 59, 59);
+   CHECK(( point3.year == 2037 ));
+   CHECK(( point3.month == 12 ));
+   CHECK(( point3.day == 31 ));
+   CHECK(( point3.hour == 24 ));
+   CHECK(( point3.minutes == 59 ));
+   CHECK(( point3.seconds == 59 ));
+   }
+
+TEST_CASE("calendar_point to stl timepoint and back", "[utils]")
+   {
+      {
+      auto in = calendar_point(1988, 04, 23, 14, 37, 28);
+      auto out = calendar_value(in.to_std_timepoint());
+      CHECK(( out.year    == 1988 ));
+      CHECK(( out.month   == 4 ));
+      CHECK(( out.day     == 23 ));
+      CHECK(( out.hour    == 14 ));
+      CHECK(( out.minutes == 37 ));
+      CHECK(( out.seconds == 28 ));
+      }
+
+      {
+      auto in = calendar_point(2037, 12, 31, 23, 59, 59);
+      auto out = calendar_value(in.to_std_timepoint());
+      CHECK(( out.year    == 2037 ));
+      CHECK(( out.month   == 12 ));
+      CHECK(( out.day     == 31 ));
+      CHECK(( out.hour    == 23 ));
+      CHECK(( out.minutes == 59 ));
+      CHECK(( out.seconds == 59 ));
+      }
+
+      SECTION("year too early")
+      {
+      auto in = calendar_point(1800, 01, 01, 0, 0, 0);
+      CHECK_THROWS( in.to_std_timepoint() );
+      }
+   }