Rename files

1 files changed, 0 insertions, 185 deletions

diff --git a/tests/tier1_i2c.rs b/tests/tier1_i2c.rs
deleted file mode 100644
index b91575e..0000000
--- a/tests/tier1_i2c.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-#[macro_use(block)]
-extern crate nb;
-extern crate embedded_hal;
-extern crate embedded_hal_mock as hal;
-use hal::i2c::Transaction as I2cTrans;
-extern crate ads1x1x;
-use ads1x1x::{ channel, DataRate12Bit, DataRate16Bit, Error };
-
-#[macro_use]
-mod common;
-use common::{ new_ads1013, destroy_ads1013, new_ads1113, destroy_ads1113,
-              DEVICE_ADDRESS as DEV_ADDR, Register, BitFlags, Config };
-
-macro_rules! measure_tests {
-    ($IC:ident, $create:ident, $destroy:ident, $expected:expr) => {
-        mod $IC {
-            use embedded_hal::adc::OneShot;
-            use super::*;
-
-            mod would_block {
-                use super::*;
-
-                #[test]
-                fn read_if_measurement_in_progress() {
-                    let config = Config::default().with_low(BitFlags::OS);
-                    let transactions = [ I2cTrans::write_read(DEV_ADDR, vec![Register::CONFIG], vec![config.msb(), config.lsb()] ) ];
-                    let mut dev = $create(&transactions);
-                    assert_would_block!(dev.read(&mut channel::DifferentialA0A1));
-                    $destroy(dev);
-                }
-            }
-
-            #[test]
-            fn can_measure() {
-                let default_config = Config::default();
-                let config_with_os = Config::default().with_high(BitFlags::OS);
-                let transactions = [ I2cTrans::write_read(DEV_ADDR, vec![Register::CONFIG], vec![default_config.msb(), default_config.lsb()]),
-                                    I2cTrans::write(DEV_ADDR, vec![Register::CONFIG, config_with_os.msb(), config_with_os.lsb()]),
-                                    I2cTrans::write_read(DEV_ADDR, vec![Register::CONFIG], vec![config_with_os.msb(), config_with_os.lsb()]),
-                                    I2cTrans::write_read(DEV_ADDR, vec![Register::CONVERSION], vec![0x80, 0x00] ) ];
-                let mut dev = $create(&transactions);
-                let measurement = block!(dev.read(&mut channel::DifferentialA0A1)).unwrap();
-                assert_eq!($expected, measurement);
-                $destroy(dev);
-            }
-
-            #[test]
-            fn can_measure_continuous() {
-                let config = Config::default().with_low(BitFlags::OP_MODE);
-                let transactions = [ I2cTrans::write(DEV_ADDR, vec![Register::CONFIG, config.msb(), config.lsb()]),
-                                    I2cTrans::write_read(DEV_ADDR, vec![Register::CONVERSION], vec![0x80, 0x00] ) ];
-                let dev = $create(&transactions);
-                let mut dev = dev.into_continuous().unwrap();
-                dev.start().unwrap();
-                let measurement = dev.read().unwrap();
-                assert_eq!($expected, measurement);
-                $destroy(dev);
-            }
-        }
-    }
-}
-
-measure_tests!(ads1013, new_ads1013, destroy_ads1013,  -2048);
-measure_tests!(ads1113, new_ads1113, destroy_ads1113, -32768);
-
-
-mod data_rate_12bit {
-    macro_rules! test {
-        ($name:ident, $variant:ident, $config:expr) => {
-            #[test]
-            fn $name() {
-                let transactions = [ I2cTrans::write(DEV_ADDR, vec![Register::CONFIG, $config.msb(), $config.lsb()]) ];
-                let mut dev = new_ads1013(&transactions);
-                dev.set_data_rate(DataRate12Bit::$variant).unwrap();
-                destroy_ads1013(dev);
-            }
-        }
-    }
-
-    use super::*;
-    test!(sps128,  Sps128,  Config::default().with_low( BitFlags::DR2).with_low( BitFlags::DR1).with_low( BitFlags::DR0));
-    test!(sps250,  Sps250,  Config::default().with_low( BitFlags::DR2).with_low( BitFlags::DR1).with_high(BitFlags::DR0));
-    test!(sps490,  Sps490,  Config::default().with_low( BitFlags::DR2).with_high(BitFlags::DR1).with_low( BitFlags::DR0));
-    test!(sps920,  Sps920,  Config::default().with_low( BitFlags::DR2).with_high(BitFlags::DR1).with_high(BitFlags::DR0));
-    test!(sps1600, Sps1600, Config::default().with_high(BitFlags::DR2).with_low( BitFlags::DR1).with_low( BitFlags::DR0));
-    test!(sps2400, Sps2400, Config::default().with_high(BitFlags::DR2).with_low( BitFlags::DR1).with_high(BitFlags::DR0));
-    test!(sps3300, Sps3300, Config::default().with_high(BitFlags::DR2).with_high(BitFlags::DR1).with_low( BitFlags::DR0));
-}
-
-mod data_rate_16bit {
-    macro_rules! test {
-        ($name:ident, $variant:ident, $config:expr) => {
-            #[test]
-            fn $name() {
-                let transactions = [ I2cTrans::write(DEV_ADDR, vec![Register::CONFIG, $config.msb(), $config.lsb()]) ];
-                let mut dev = new_ads1113(&transactions);
-                dev.set_data_rate(DataRate16Bit::$variant).unwrap();
-                destroy_ads1113(dev);
-            }
-        }
-    }
-
-    use super::*;
-    test!(sps8,   Sps8,   Config::default().with_low( BitFlags::DR2).with_low( BitFlags::DR1).with_low( BitFlags::DR0));
-    test!(sps16,  Sps16,  Config::default().with_low( BitFlags::DR2).with_low( BitFlags::DR1).with_high(BitFlags::DR0));
-    test!(sps32,  Sps32,  Config::default().with_low( BitFlags::DR2).with_high(BitFlags::DR1).with_low( BitFlags::DR0));
-    test!(sps64,  Sps64,  Config::default().with_low( BitFlags::DR2).with_high(BitFlags::DR1).with_high(BitFlags::DR0));
-    test!(sps128, Sps128, Config::default().with_high(BitFlags::DR2).with_low( BitFlags::DR1).with_low( BitFlags::DR0));
-    test!(sps250, Sps250, Config::default().with_high(BitFlags::DR2).with_low( BitFlags::DR1).with_high(BitFlags::DR0));
-    test!(sps475, Sps475, Config::default().with_high(BitFlags::DR2).with_high(BitFlags::DR1).with_low( BitFlags::DR0));
-    test!(sps860, Sps860, Config::default().with_high(BitFlags::DR2).with_high(BitFlags::DR1).with_high(BitFlags::DR0));
-}
-
-#[test]
-fn can_read_measurement_in_progress() {
-    let config_os = Config::default().with_low(BitFlags::OS);
-    let transactions = [ I2cTrans::write_read(DEV_ADDR, vec![Register::CONFIG], vec![config_os.msb(), config_os.lsb()]) ];
-    let mut dev = new_ads1013(&transactions);
-    assert!(dev.is_measurement_in_progress().unwrap());
-    destroy_ads1013(dev);
-}
-
-#[test]
-fn can_read_measurement_not_in_progress() {
-    let config_os = Config::default().with_high(BitFlags::OS);
-    let transactions = [ I2cTrans::write_read(DEV_ADDR, vec![Register::CONFIG], vec![config_os.msb(), config_os.lsb()]) ];
-    let mut dev = new_ads1013(&transactions);
-    assert!(!dev.is_measurement_in_progress().unwrap());
-    destroy_ads1013(dev);
-}
-
-#[test]
-fn can_convert_to_continuous() {
-    let dev = new_ads1013(&[]);
-    let dev = dev.into_continuous().unwrap();
-    destroy_ads1013(dev);
-}
-
-#[test]
-fn can_convert_to_one_shot() {
-    let config_os = Config::default();
-    let transactions = [ I2cTrans::write(DEV_ADDR, vec![Register::CONFIG, config_os.msb(),   config_os.lsb()]) ];
-    let dev = new_ads1013(&transactions);
-    let dev = dev.into_continuous().unwrap();
-    let dev = dev.into_one_shot().unwrap();
-    destroy_ads1013(dev);
-}
-
-mod continuous {
-    use super::*;
-    #[test]
-    fn can_start() {
-        let config = Config::default().with_low(BitFlags::OP_MODE);
-        let transactions = [ I2cTrans::write(DEV_ADDR, vec![Register::CONFIG, config.msb(), config.lsb()]) ];
-        let dev = new_ads1013(&transactions);
-        let mut dev = dev.into_continuous().unwrap();
-        dev.start().unwrap();
-        destroy_ads1013(dev);
-    }
-
-    fn assert_not_started<T, E>(result: Result<T, Error<E>>) {
-        match result {
-            Err(Error::NotStarted) => (),
-            _ => panic!("Error::NotStarted not returned.")
-        }
-    }
-    #[test]
-    fn check_assert_matches() {
-        assert_not_started::<(), ()>(Err(Error::NotStarted));
-    }
-
-    #[test]
-    #[should_panic]
-    fn check_assert_fails() {
-        assert_not_started::<(), ()>(Ok(()));
-    }
-
-    #[test]
-    fn cannot_read_if_not_started() {
-        let dev = new_ads1013(&[]);
-        let mut dev = dev.into_continuous().unwrap();
-        assert_not_started(dev.read());
-        destroy_ads1013(dev);
-    }
-}