4 files changed, 11 insertions, 63 deletions
diff --git a/src/drivers/test/test_battery.cpp b/src/drivers/test/test_battery.cpp
index f0006336..4a52300d 100644
--- a/src/drivers/test/test_battery.cpp
+++ b/src/drivers/test/test_battery.cpp
@@ -7,12 +7,12 @@
 namespace drivers {
 
 TEST_CASE("battery measurement", "[integration]") {
-  REQUIRE(drivers::init_adc() == ESP_OK);
+  Battery battery;
 
   SECTION("voltage is within range") {
-    uint32_t voltage = read_battery_voltage();
-    REQUIRE(voltage <= 2200);  // Plugged in, no battery.
-    REQUIRE(voltage >= 1000);
+    uint32_t mv = battery.Millivolts();
+    REQUIRE(mv <= 2200);  // Plugged in, no battery.
+    REQUIRE(mv >= 1000);
   }
 }
 
diff --git a/src/drivers/test/test_dac.cpp b/src/drivers/test/test_dac.cpp
index fab258e4..01583e34 100644
--- a/src/drivers/test/test_dac.cpp
+++ b/src/drivers/test/test_dac.cpp
@@ -13,7 +13,9 @@ namespace drivers {
 TEST_CASE("dac configuration", "[integration]") {
   I2CFixture i2c;
   GpioExpander expander;
-  std::unique_ptr<AudioDac> dac = AudioDac::create(&expander).value();
+  cpp::result<AudioDac*, AudioDac::Error> dac_res = AudioDac::create(&expander);
+  REQUIRE(dac_res.has_value());
+  std::unique_ptr<AudioDac> dac(dac_res.value());
 
   auto power_state = dac->ReadPowerState();
 
diff --git a/src/drivers/test/test_gpio_expander.cpp b/src/drivers/test/test_gpio_expander.cpp
index 7bf44d28..791c0a71 100644
--- a/src/drivers/test/test_gpio_expander.cpp
+++ b/src/drivers/test/test_gpio_expander.cpp
@@ -13,41 +13,13 @@ TEST_CASE("gpio expander", "[integration]") {
   SECTION("with() writes when ") {
     // Initial value.
     expander.Read();
-    REQUIRE(expander.get_input(GpioExpander::GPIO_1) == true);
+    REQUIRE(expander.get_input(GpioExpander::KEY_DOWN) == true);
 
     expander.with(
-        [&](auto& gpio) { gpio.set_pin(GpioExpander::GPIO_1, false); });
+        [&](auto& gpio) { gpio.set_pin(GpioExpander::KEY_DOWN, false); });
 
     expander.Read();
-    REQUIRE(expander.get_input(GpioExpander::GPIO_1) == false);
-  }
-
-  SECTION("setting individual pins") {
-    expander.set_pin(GpioExpander::GPIO_1, true);
-    expander.set_pin(GpioExpander::GPIO_2, false);
-    expander.set_pin(GpioExpander::GPIO_3, false);
-    expander.set_pin(GpioExpander::GPIO_4, true);
-
-    expander.Write();
-    expander.Read();
-
-    REQUIRE(expander.get_input(GpioExpander::GPIO_1) == true);
-    REQUIRE(expander.get_input(GpioExpander::GPIO_2) == false);
-    REQUIRE(expander.get_input(GpioExpander::GPIO_3) == false);
-    REQUIRE(expander.get_input(GpioExpander::GPIO_4) == true);
-
-    expander.set_pin(GpioExpander::GPIO_1, false);
-    expander.set_pin(GpioExpander::GPIO_2, true);
-    expander.set_pin(GpioExpander::GPIO_3, true);
-    expander.set_pin(GpioExpander::GPIO_4, false);
-
-    expander.Write();
-    expander.Read();
-
-    REQUIRE(expander.get_input(GpioExpander::GPIO_1) == false);
-    REQUIRE(expander.get_input(GpioExpander::GPIO_2) == true);
-    REQUIRE(expander.get_input(GpioExpander::GPIO_3) == true);
-    REQUIRE(expander.get_input(GpioExpander::GPIO_4) == false);
+    REQUIRE(expander.get_input(GpioExpander::KEY_DOWN) == false);
   }
 }
 
diff --git a/src/drivers/test/test_storage.cpp b/src/drivers/test/test_storage.cpp
index 627fa615..54f9a467 100644
--- a/src/drivers/test/test_storage.cpp
+++ b/src/drivers/test/test_storage.cpp
@@ -26,7 +26,7 @@ TEST_CASE("sd card storage", "[integration]") {
   GpioExpander expander;
 
   {
-    std::unique_ptr<SdStorage> result = SdStorage::create(&expander).value();
+    std::unique_ptr<SdStorage> result(SdStorage::create(&expander).value());
 
     SECTION("write to a file") {
       {
@@ -70,30 +70,4 @@ TEST_CASE("sd card storage", "[integration]") {
   }
 }
 
-// Failing due to hardware issue. Re-enable in R2.
-TEST_CASE("sd card mux", "[integration][!mayfail]") {
-  I2CFixture i2c;
-  SpiFixture spi;
-  GpioExpander expander;
-
-  SECTION("accessible when switched on") {
-    expander.with([&](auto& gpio) {
-      gpio.set_pin(GpioExpander::SD_MUX_SWITCH, GpioExpander::SD_MUX_ESP);
-    });
-
-    auto result = SdStorage::create(&expander);
-    REQUIRE(result.has_value());
-  }
-
-  SECTION("inaccessible when switched off") {
-    expander.with([&](auto& gpio) {
-      gpio.set_pin(GpioExpander::SD_MUX_SWITCH, GpioExpander::SD_MUX_USB);
-    });
-
-    auto result = SdStorage::create(&expander);
-    REQUIRE(result.has_error());
-    REQUIRE(result.error() == SdStorage::FAILED_TO_READ);
-  }
-}
-
 }  // namespace drivers