From 0d6094c8b10da141d048ec23133df4525befbd44 Mon Sep 17 00:00:00 2001
From: "Andres O. Vela" <andresovela@gmail.com>
Date: Sun, 29 Oct 2023 19:49:52 +0100
Subject: [PATCH 1/3] time: add MockDriver for testing purposes

---
 embassy-time/Cargo.toml         |  3 ++
 embassy-time/src/driver_mock.rs | 73 +++++++++++++++++++++++++++++++++
 embassy-time/src/lib.rs         |  6 +++
 3 files changed, 82 insertions(+)
 create mode 100644 embassy-time/src/driver_mock.rs

diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml
index 62404863..8b5d31ee 100644
--- a/embassy-time/Cargo.toml
+++ b/embassy-time/Cargo.toml
@@ -59,6 +59,9 @@ generic-queue-32 = ["generic-queue"]
 generic-queue-64 = ["generic-queue"]
 generic-queue-128 = ["generic-queue"]
 
+# Create a `MockDriver` that can be manually advanced for testing purposes.
+mock-driver = ["tick-hz-1_000_000"]
+
 # Set the `embassy_time` tick rate.
 #
 # At most 1 `tick-*` feature can be enabled. If none is enabled, a default of 1MHz is used.
diff --git a/embassy-time/src/driver_mock.rs b/embassy-time/src/driver_mock.rs
new file mode 100644
index 00000000..4ae5a2d9
--- /dev/null
+++ b/embassy-time/src/driver_mock.rs
@@ -0,0 +1,73 @@
+use core::cell::Cell;
+
+use critical_section::Mutex as CsMutex;
+
+use crate::driver::{AlarmHandle, Driver};
+use crate::{Duration, Instant};
+
+/// A mock driver that can be manually advanced.
+/// This is useful for testing code that works with [`Instant`] and [`Duration`].
+///
+/// This driver cannot currently be used to test runtime functionality, such as
+/// timers, delays, etc.
+///
+/// # Example
+///
+/// ```ignore
+/// fn has_a_second_passed(reference: Instant) -> bool {
+///     Instant::now().duration_since(reference) > Duration::from_secs(1)
+/// }
+///
+/// fn test_second_passed() {
+///     let driver = embassy_time::MockDriver::get();
+///     let reference = Instant::now();
+///     assert_eq!(false, has_a_second_passed(reference));
+///     driver.advance(Duration::from_secs(1));
+///     assert_eq!(true, has_a_second_passed(reference));
+/// }
+/// ```
+pub struct MockDriver {
+    now: CsMutex<Cell<Instant>>,
+}
+
+crate::time_driver_impl!(static DRIVER: MockDriver = MockDriver {
+    now: CsMutex::new(Cell::new(Instant::from_ticks(0))),
+});
+
+impl MockDriver {
+    /// Gets a reference to the global mock driver.
+    pub fn get() -> &'static MockDriver {
+        &DRIVER
+    }
+
+    /// Sets the current time of the mock driver.
+    pub fn set_current_time(&self, now: Instant) {
+        critical_section::with(|cs| self.now.borrow(cs).set(now))
+    }
+
+    /// Advances the time by the specified [`Duration`].
+    pub fn advance(&self, duration: Duration) {
+        critical_section::with(|cs| {
+            let now = self.now.borrow(cs).get().as_ticks();
+            self.now.borrow(cs).set(Instant::from_ticks(now + duration.as_ticks()));
+        });
+    }
+}
+
+impl Driver for MockDriver {
+    fn now(&self) -> u64 {
+        critical_section::with(|cs| self.now.borrow(cs).get().as_micros() as u64)
+    }
+
+    unsafe fn allocate_alarm(&self) -> Option<AlarmHandle> {
+        unimplemented!("MockDriver does not support runtime features that require an executor");
+    }
+
+    fn set_alarm_callback(&self, _alarm: AlarmHandle, _callback: fn(*mut ()), _ctx: *mut ()) {
+        unimplemented!("MockDriver does not support runtime features that require an executor");
+    }
+
+    fn set_alarm(&self, _alarm: AlarmHandle, _timestamp: u64) -> bool {
+        unimplemented!("MockDriver does not support runtime features that require an executor");
+    }
+}
diff --git a/embassy-time/src/lib.rs b/embassy-time/src/lib.rs
index 8f57eabc..45c1e882 100644
--- a/embassy-time/src/lib.rs
+++ b/embassy-time/src/lib.rs
@@ -15,6 +15,12 @@ pub mod queue;
 mod tick;
 mod timer;
 
+#[cfg(feature = "mock-driver")]
+mod driver_mock;
+
+#[cfg(feature = "mock-driver")]
+pub use driver_mock::MockDriver;
+
 #[cfg(feature = "std")]
 mod driver_std;
 #[cfg(feature = "wasm")]

From f4a78e00a7a6a1e5046c8e6af2cc5c08df9d7bc1 Mon Sep 17 00:00:00 2001
From: "Andres O. Vela" <andresovela@gmail.com>
Date: Sun, 29 Oct 2023 19:52:35 +0100
Subject: [PATCH 2/3] Remove set_current_time API

---
 embassy-time/src/driver_mock.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/embassy-time/src/driver_mock.rs b/embassy-time/src/driver_mock.rs
index 4ae5a2d9..c7cab342 100644
--- a/embassy-time/src/driver_mock.rs
+++ b/embassy-time/src/driver_mock.rs
@@ -40,11 +40,6 @@ impl MockDriver {
         &DRIVER
     }
 
-    /// Sets the current time of the mock driver.
-    pub fn set_current_time(&self, now: Instant) {
-        critical_section::with(|cs| self.now.borrow(cs).set(now))
-    }
-
     /// Advances the time by the specified [`Duration`].
     pub fn advance(&self, duration: Duration) {
         critical_section::with(|cs| {

From 573734008a8a0659e6cfe832db382b9206e3f4f1 Mon Sep 17 00:00:00 2001
From: "Andres O. Vela" <andresovela@gmail.com>
Date: Sun, 29 Oct 2023 20:03:11 +0100
Subject: [PATCH 3/3] Fix test

---
 embassy-time/src/driver_mock.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embassy-time/src/driver_mock.rs b/embassy-time/src/driver_mock.rs
index c7cab342..becb6bfd 100644
--- a/embassy-time/src/driver_mock.rs
+++ b/embassy-time/src/driver_mock.rs
@@ -15,7 +15,7 @@ use crate::{Duration, Instant};
 ///
 /// ```ignore
 /// fn has_a_second_passed(reference: Instant) -> bool {
-///     Instant::now().duration_since(reference) > Duration::from_secs(1)
+///     Instant::now().duration_since(reference) >= Duration::from_secs(1)
 /// }
 ///
 /// fn test_second_passed() {