Fix tests.

This commit is contained in:
Dario Nieuwenhuis 2023-05-29 19:46:28 +02:00
parent cc23129456
commit 46961cfdf7
10 changed files with 24 additions and 26 deletions

View File

@ -2,13 +2,12 @@
//! //!
//! # Example (nrf52) //! # Example (nrf52)
//! //!
//! ```rust //! ```rust,ignore
//! use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; //! use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
//! use embassy_sync::blocking_mutex::{NoopMutex, raw::NoopRawMutex}; //! use embassy_sync::blocking_mutex::{NoopMutex, raw::NoopRawMutex};
//! //!
//! static I2C_BUS: StaticCell<NoopMutex<RefCell<Twim<TWISPI0>>>> = StaticCell::new(); //! static I2C_BUS: StaticCell<NoopMutex<RefCell<Twim<TWISPI0>>>> = StaticCell::new();
//! let irq = interrupt::take!(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0); //! let i2c = Twim::new(p.TWISPI0, Irqs, p.P0_03, p.P0_04, Config::default());
//! let i2c = Twim::new(p.TWISPI0, irq, p.P0_03, p.P0_04, Config::default());
//! let i2c_bus = NoopMutex::new(RefCell::new(i2c)); //! let i2c_bus = NoopMutex::new(RefCell::new(i2c));
//! let i2c_bus = I2C_BUS.init(i2c_bus); //! let i2c_bus = I2C_BUS.init(i2c_bus);
//! //!

View File

@ -2,13 +2,12 @@
//! //!
//! # Example (nrf52) //! # Example (nrf52)
//! //!
//! ```rust //! ```rust,ignore
//! use embassy_embedded_hal::shared_bus::blocking::spi::SpiDevice; //! use embassy_embedded_hal::shared_bus::blocking::spi::SpiDevice;
//! use embassy_sync::blocking_mutex::{NoopMutex, raw::NoopRawMutex}; //! use embassy_sync::blocking_mutex::{NoopMutex, raw::NoopRawMutex};
//! //!
//! static SPI_BUS: StaticCell<NoopMutex<RefCell<Spim<SPI3>>>> = StaticCell::new(); //! static SPI_BUS: StaticCell<NoopMutex<RefCell<Spim<SPI3>>>> = StaticCell::new();
//! let irq = interrupt::take!(SPIM3); //! let spi = Spim::new_txonly(p.SPI3, Irqs, p.P0_15, p.P0_18, Config::default());
//! let spi = Spim::new_txonly(p.SPI3, irq, p.P0_15, p.P0_18, Config::default());
//! let spi_bus = NoopMutex::new(RefCell::new(spi)); //! let spi_bus = NoopMutex::new(RefCell::new(spi));
//! let spi_bus = SPI_BUS.init(spi_bus); //! let spi_bus = SPI_BUS.init(spi_bus);
//! //!

View File

@ -458,8 +458,6 @@ mod tests {
#[test] #[test]
fn push_slices() { fn push_slices() {
init();
let mut b = [0; 4]; let mut b = [0; 4];
let rb = RingBuffer::new(); let rb = RingBuffer::new();
unsafe { unsafe {

View File

@ -67,7 +67,7 @@ fn compare_n(n: usize) -> u32 {
1 << (n + 16) 1 << (n + 16)
} }
#[cfg(tests)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;

View File

@ -163,7 +163,7 @@ pub(super) fn get_sector(address: u32, regions: &[&FlashRegion]) -> FlashSector
bank_offset = 0; bank_offset = 0;
} }
if address < region.end() { if address >= region.base && address < region.end() {
let index_in_region = (address - region.base) / region.erase_size; let index_in_region = (address - region.base) / region.erase_size;
return FlashSector { return FlashSector {
bank: region.bank, bank: region.bank,

View File

@ -209,39 +209,39 @@ mod tests {
#[test] #[test]
fn test_compute_dead_time_value() { fn test_compute_dead_time_value() {
struct test_run { struct TestRun {
value: u16, value: u16,
ckd: Ckd, ckd: Ckd,
bits: u8, bits: u8,
} }
let fn_results = [ let fn_results = [
test_run { TestRun {
value: 1, value: 1,
ckd: Ckd::DIV1, ckd: Ckd::DIV1,
bits: 1, bits: 1,
}, },
test_run { TestRun {
value: 125, value: 125,
ckd: Ckd::DIV1, ckd: Ckd::DIV1,
bits: 125, bits: 125,
}, },
test_run { TestRun {
value: 245, value: 245,
ckd: Ckd::DIV1, ckd: Ckd::DIV1,
bits: 64 + 245 / 2, bits: 64 + 245 / 2,
}, },
test_run { TestRun {
value: 255, value: 255,
ckd: Ckd::DIV2, ckd: Ckd::DIV2,
bits: 127, bits: 127,
}, },
test_run { TestRun {
value: 400, value: 400,
ckd: Ckd::DIV1, ckd: Ckd::DIV1,
bits: 32 + (400u16 / 8) as u8, bits: 32 + (400u16 / 8) as u8,
}, },
test_run { TestRun {
value: 600, value: 600,
ckd: Ckd::DIV4, ckd: Ckd::DIV4,
bits: 64 + (600u16 / 8) as u8, bits: 64 + (600u16 / 8) as u8,

View File

@ -169,4 +169,4 @@ wasm-timer = { version = "0.2.5", optional = true }
[dev-dependencies] [dev-dependencies]
serial_test = "0.9" serial_test = "0.9"
critical-section = { version = "1.1", features = ["std"] } critical-section = { version = "1.1", features = ["std"] }
embassy-executor = { version = "0.2.0", path = "../embassy-executor", features = ["nightly"] }

View File

@ -49,7 +49,7 @@
//! fn set_alarm_callback(&self, alarm: AlarmHandle, callback: fn(*mut ()), ctx: *mut ()) { //! fn set_alarm_callback(&self, alarm: AlarmHandle, callback: fn(*mut ()), ctx: *mut ()) {
//! todo!() //! todo!()
//! } //! }
//! fn set_alarm(&self, alarm: AlarmHandle, timestamp: u64) { //! fn set_alarm(&self, alarm: AlarmHandle, timestamp: u64) -> bool {
//! todo!() //! todo!()
//! } //! }
//! } //! }

View File

@ -183,7 +183,6 @@ mod tests {
use serial_test::serial; use serial_test::serial;
use super::InnerQueue;
use crate::driver::{AlarmHandle, Driver}; use crate::driver::{AlarmHandle, Driver};
use crate::queue_generic::QUEUE; use crate::queue_generic::QUEUE;
use crate::Instant; use crate::Instant;
@ -317,14 +316,18 @@ mod tests {
fn setup() { fn setup() {
DRIVER.reset(); DRIVER.reset();
critical_section::with(|cs| *QUEUE.inner.borrow_ref_mut(cs) = None);
QUEUE.inner.lock(|inner| {
*inner.borrow_mut() = InnerQueue::new();
});
} }
fn queue_len() -> usize { fn queue_len() -> usize {
QUEUE.inner.lock(|inner| inner.borrow().queue.iter().count()) critical_section::with(|cs| {
QUEUE
.inner
.borrow_ref(cs)
.as_ref()
.map(|inner| inner.queue.iter().count())
.unwrap_or(0)
})
} }
#[test] #[test]

View File

@ -109,7 +109,6 @@ impl Future for Timer {
/// # #![feature(type_alias_impl_trait)] /// # #![feature(type_alias_impl_trait)]
/// # /// #
/// use embassy_time::{Duration, Ticker}; /// use embassy_time::{Duration, Ticker};
/// use futures::StreamExt;
/// # fn foo(){} /// # fn foo(){}
/// ///
/// #[embassy_executor::task] /// #[embassy_executor::task]