#2174 Added tests for bike power functions

cagnulein · Mar 1, 2024 · 678facc · 678facc
1 parent 9f9ab5c
commit 678facc
Show file tree

Hide file tree

Showing 48 changed files with 634 additions and 45 deletions.
diff --git a/tst/Devices/ApexBike/apexbiketestdata.h b/tst/Devices/ApexBike/apexbiketestdata.h
@@ -1,10 +1,13 @@
 #pragma once
 
-#include "Devices/Bike/biketestdata.h".h"
+#include "Devices/Bike/biketestdata.h"
 #include "devices/apexbike/apexbike.h"
 
 class ApexBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new apexbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     ApexBikeTestData() : BikeTestData("Apex Bike") {
         this->addDeviceName("WLT8266BM", comparison::StartsWithIgnoreCase);

diff --git a/tst/Devices/Bike/biketestdata.h b/tst/Devices/Bike/biketestdata.h
@@ -3,7 +3,21 @@
 #include "Devices/bluetoothdevicetestdata.h"
 #include "devices/bike.h"
 
+class BikeOptions {
+public:
+   double resistanceGain=1.0, resistanceOffset=0.0;
+   bool noResistance=false, noHeartService = false, noVirtualDevice = false;
+
+};
+
 class BikeTestData : public BluetoothDeviceTestData {
+protected:
+    /**
+     * @brief Template function called from createInstance to create an instance of the device class.
+     * @param options
+     * @return
+     */
+    virtual bike* doCreateInstance(const BikeOptions& options) =0;
 
 public:
     BikeTestData(std::string deviceName) : BluetoothDeviceTestData(deviceName) {}
@@ -15,5 +29,18 @@ class BikeTestData : public BluetoothDeviceTestData {
     bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
         return dynamic_cast<bike*>(detectedDevice)!=nullptr;
     }
+
+    /**
+     * @brief (Potentially amongst other things) Calls a protected function to create an instance of the device class.
+     * @param options
+     * @return
+     */
+    bike* createInstance(const BikeOptions& options) {
+        // potentially validate or alter the options
+        auto result = this->doCreateInstance(options);
+
+        // potentially adjust the device object (e.g. connect signals and slots)
+        return result;
+    }
 };
 
diff --git a/tst/Devices/BkoolBike/bkoolbiketestdata.h b/tst/Devices/BkoolBike/bkoolbiketestdata.h
@@ -1,12 +1,15 @@
 #pragma once
 
-#include "Devices/bluetoothdevicetestdata.h"
+#include "Devices/Bike/biketestdata.h"
 #include "devices/bkoolbike/bkoolbike.h"
 
-class BkoolBikeTestData : public BluetoothDeviceTestData {
-
+class BkoolBikeTestData : public BikeTestData {
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new bkoolbike(options.noResistance, options.noHeartService);
+    }
 public:
-    BkoolBikeTestData() : BluetoothDeviceTestData("Bkool Bike") {
+    BkoolBikeTestData() : BikeTestData("Bkool Bike") {
         this->addDeviceName("BKOOLSMARTPRO", comparison::StartsWithIgnoreCase);
     }
 

diff --git a/tst/Devices/CSCBike/cscbiketestdata.h b/tst/Devices/CSCBike/cscbiketestdata.h
@@ -6,6 +6,11 @@
 class CSCBikeTestData : public BikeTestData {
 protected:
     QString cscBikeName;
+
+
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new cscbike(options.noResistance, options.noHeartService, options.noVirtualDevice);
+    }
 public:
     CSCBikeTestData(std::string testName) : BikeTestData(testName) {
         this->cscBikeName = "CyclingSpeedCadenceBike-";

diff --git a/tst/Devices/Chronobike/chronobiketestdata.h b/tst/Devices/Chronobike/chronobiketestdata.h
@@ -4,7 +4,10 @@
 #include "devices/chronobike/chronobike.h"
 
 class ChronobikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new chronobike(options.noResistance, options.noHeartService);
+    }
 public:
     ChronobikeTestData() : BikeTestData("Chronobike") {
         this->addDeviceName("CHRONO ", comparison::StartsWithIgnoreCase);

diff --git a/tst/Devices/CompuTrainer/computrainertestdata.h b/tst/Devices/CompuTrainer/computrainertestdata.h
@@ -5,6 +5,10 @@
 
 class CompuTrainerTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new computrainerbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
+
     bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
         info.computrainer_serial_port = enable ? "X":QString();
         return true;

diff --git a/tst/Devices/DomyosBike/domyosbiketestdata.h b/tst/Devices/DomyosBike/domyosbiketestdata.h
@@ -4,7 +4,10 @@
 #include "devices/domyosbike/domyosbike.h"
 
 class DomyosBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new domyosbike(options.noResistance, options.noHeartService, false, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     DomyosBikeTestData() : BikeTestData("Domyos Bike") {
 

diff --git a/tst/Devices/EchelonConnectSportBike/echelonconnectsportbiketestdata.h b/tst/Devices/EchelonConnectSportBike/echelonconnectsportbiketestdata.h
@@ -6,7 +6,10 @@
 #include "devices/echelonconnectsport/echelonconnectsport.h"
 
 class EchelonConnectSportBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new echelonconnectsport(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     EchelonConnectSportBikeTestData() : BikeTestData("Echelon Connect Sport Bike") {
         this->addDeviceName("ECH", comparison::StartsWith);

diff --git a/tst/Devices/FTMSBike/ftmsbiketestdata.cpp b/tst/Devices/FTMSBike/ftmsbiketestdata.cpp
@@ -1,5 +1,9 @@
 #include "ftmsbiketestdata.h"
 
+#include "Devices/SnodeBike/snodebiketestdata.h"
+#include "Devices/FitPlusBike/fitplusbiketestdata.h"
+#include "Devices/StagesBike/stagesbiketestdata.h"
+
 void FTMSBikeTestData::configureExclusions() {
     this->exclude(new SnodeBike1TestData());
     this->exclude(new SnodeBike2TestData());

diff --git a/tst/Devices/FTMSBike/ftmsbiketestdata.h b/tst/Devices/FTMSBike/ftmsbiketestdata.h
@@ -7,12 +7,12 @@
 
 #include "devices/ftmsbike/ftmsbike.h"
 
-#include "Devices/SnodeBike/snodebiketestdata.h"
-#include "Devices/FitPlusBike/fitplusbiketestdata.h"
-#include "Devices/StagesBike/stagesbiketestdata.h"
 
 class FTMSBikeTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new ftmsbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
     void configureExclusions() override;
 
     FTMSBikeTestData(std::string testName) : BikeTestData(testName)  {

diff --git a/tst/Devices/FakeBike/fakebiketestdata.h b/tst/Devices/FakeBike/fakebiketestdata.h
@@ -9,6 +9,10 @@
 
 class FakeBikeTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new fakebike(options.noResistance, options.noHeartService, options.noVirtualDevice);
+    }
+
     bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
         info.fake_bike = enable;
         return true;

diff --git a/tst/Devices/FitPlusBike/fitplusbiketestdata.h b/tst/Devices/FitPlusBike/fitplusbiketestdata.h
@@ -9,6 +9,10 @@
 
 class FitPlusBikeFSTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new fitplusbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
+
     bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
         info.fitplus_bike = enable;
         return true;
@@ -27,7 +31,10 @@ class FitPlusBikeFSTestData : public BikeTestData {
 };
 
 class FitPlusBikeMRKTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new fitplusbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     FitPlusBikeMRKTestData() : BikeTestData("FitPlus Bike (MRK, no settings)"){
 

diff --git a/tst/Devices/FlywheelBike/flywheelbiketestdata.h b/tst/Devices/FlywheelBike/flywheelbiketestdata.h
@@ -10,6 +10,9 @@
 class FlywheelBikeTestData : public BikeTestData {
 
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new flywheelbike(options.noResistance, options.noHeartService);
+    }
     FlywheelBikeTestData(std::string testName) : BikeTestData(testName) {
     }
 public:

diff --git a/tst/Devices/HorizonGR7Bike/horizongr7biketestdata.h b/tst/Devices/HorizonGR7Bike/horizongr7biketestdata.h
@@ -7,7 +7,10 @@
 
 
 class HorizonGR7BikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new horizongr7bike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     HorizonGR7BikeTestData() : BikeTestData("Horizon GR7 Bike") {
         this->addDeviceName("JFIC", comparison::StartsWithIgnoreCase);

diff --git a/tst/Devices/InspireBike/inspirebiketestdata.h b/tst/Devices/InspireBike/inspirebiketestdata.h
@@ -6,7 +6,10 @@
 
 
 class InspireBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new inspirebike(options.noResistance, options.noHeartService);
+    }
 public:
     InspireBikeTestData() : BikeTestData("Inspire Bike") {
         this->addDeviceName("IC", comparison::StartsWithIgnoreCase, 8);

diff --git a/tst/Devices/KeepBike/keepbiketestdata.h b/tst/Devices/KeepBike/keepbiketestdata.h
@@ -8,7 +8,10 @@
 
 
 class KeepBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new keepbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     KeepBikeTestData() : BikeTestData("Keep Bike") {
         this->addDeviceName("KEEP_BIKE_", comparison::StartsWithIgnoreCase);

diff --git a/tst/Devices/M3IBike/m3ibiketestdata.h b/tst/Devices/M3IBike/m3ibiketestdata.h
@@ -11,6 +11,9 @@ class M3IBikeTestData : public BikeTestData {
 protected:
     void configureBluetoothDeviceInfos(const QBluetoothDeviceInfo& info,  bool enable, std::vector<QBluetoothDeviceInfo>& bluetoothDeviceInfos) const override;
 
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new m3ibike(options.noResistance, options.noHeartService);
+    }
 public:
     M3IBikeTestData() : BikeTestData("M3I Bike") {
         this->addDeviceName("M3", comparison::StartsWith);

diff --git a/tst/Devices/MCFBike/mcfbiketestdata.h b/tst/Devices/MCFBike/mcfbiketestdata.h
@@ -8,7 +8,10 @@
 
 
 class MCFBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new mcfbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     MCFBikeTestData() : BikeTestData("MCF Bike") {
         this->addDeviceName("MCF-", comparison::StartsWithIgnoreCase);

diff --git a/tst/Devices/MepanelBike/mepanelbiketestdata.h b/tst/Devices/MepanelBike/mepanelbiketestdata.h
@@ -9,7 +9,10 @@
 
 
 class MepanelBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new mepanelbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     MepanelBikeTestData() : BikeTestData("Mepanel Bike") {
         this->addDeviceName("MEPANEL", comparison::StartsWithIgnoreCase);

diff --git a/tst/Devices/NPECableBike/npecablebiketestdata.h b/tst/Devices/NPECableBike/npecablebiketestdata.h
@@ -8,6 +8,9 @@
 
 class NPECableBikeTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new npecablebike(options.noResistance, options.noHeartService);
+    }
     NPECableBikeTestData(std::string testName) : BikeTestData(testName) {}
 public:
     deviceType get_expectedDeviceType() const override { return deviceType::NPECableBike; }

diff --git a/tst/Devices/NautilusBike/nautilusbiketestdata.h b/tst/Devices/NautilusBike/nautilusbiketestdata.h
@@ -6,7 +6,10 @@
 
 
 class NautilusBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new nautilusbike(options.noResistance, options.noHeartService, false, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     NautilusBikeTestData(): BikeTestData("Nautilus Bike") {
         this->addDeviceName("NAUTILUS B", comparison::StartsWithIgnoreCase);

diff --git a/tst/Devices/PafersBike/pafersbiketestdata.h b/tst/Devices/PafersBike/pafersbiketestdata.h
@@ -7,6 +7,9 @@
 
 class PafersBikeTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new pafersbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
     bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
         // the treadmill is given priority
         info.pafers_treadmill = !enable;

diff --git a/tst/Devices/ProFormBike/proformbiketestdata.h b/tst/Devices/ProFormBike/proformbiketestdata.h
@@ -7,7 +7,10 @@
 
 
 class ProFormBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new proformbike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     ProFormBikeTestData() : BikeTestData("ProForm Bike") {
         this->addDeviceName("I_EB", comparison::StartsWith);

diff --git a/tst/Devices/ProFormWiFiBike/proformwifibiketestdata.h b/tst/Devices/ProFormWiFiBike/proformwifibiketestdata.h
@@ -8,6 +8,10 @@
 
 class ProFormWiFiBikeTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new proformwifibike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
+
     bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
         info.proformtdf4ip = enable ? this->get_testIP():QString();
         return true;

diff --git a/tst/Devices/RenphoBike/renphobiketestdata.cpp b/tst/Devices/RenphoBike/renphobiketestdata.cpp
@@ -1,4 +1,6 @@
 #include "renphobiketestdata.h"
+#include "Devices/FitPlusBike/fitplusbiketestdata.h"
+#include "Devices/SnodeBike/snodebiketestdata.h"
 
 void RenphoBikeTestData::configureExclusions() {
     this->exclude(new FitPlusBikeFSTestData());

diff --git a/tst/Devices/RenphoBike/renphobiketestdata.h b/tst/Devices/RenphoBike/renphobiketestdata.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include "Devices/Bike/biketestdata.h"
-#include "Devices/FitPlusBike/fitplusbiketestdata.h"
-#include "Devices/SnodeBike/snodebiketestdata.h"
-
 #include "devices/renphobike/renphobike.h"
 
 class RenphoBikeTestData : public BikeTestData {
 protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new renphobike(options.noResistance, options.noHeartService);
+    }
+
     RenphoBikeTestData(std::string testName) : BikeTestData(testName) {
     }
 

diff --git a/tst/Devices/Schwinn170Bike/schwinn170biketestdata.h b/tst/Devices/Schwinn170Bike/schwinn170biketestdata.h
@@ -5,7 +5,10 @@
 
 
 class Schwinn170BikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new schwinn170bike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     Schwinn170BikeTestData() : BikeTestData("Schwinn 170 Bike") {
 

diff --git a/tst/Devices/SchwinnIC4Bike/schwinnic4biketestdata.h b/tst/Devices/SchwinnIC4Bike/schwinnic4biketestdata.h
@@ -6,7 +6,10 @@
 
 
 class SchwinnIC4BikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new schwinnic4bike(options.noResistance, options.noHeartService);
+    }
 public:
     SchwinnIC4BikeTestData() : BikeTestData("Schwinn IC4 Bike") {
 

diff --git a/tst/Devices/SkandikaWiryBike/skandikawirybiketestdata.h b/tst/Devices/SkandikaWiryBike/skandikawirybiketestdata.h
@@ -7,7 +7,10 @@
 
 
 class SkandikaWiryBikeTestData : public BikeTestData {
-
+protected:
+    bike* doCreateInstance(const BikeOptions& options) override {
+        return new skandikawiribike(options.noResistance, options.noHeartService, options.resistanceOffset, options.resistanceGain);
+    }
 public:
     SkandikaWiryBikeTestData() : BikeTestData("Skandika Wiry Bike") {
         this->addDeviceName("BFCP", comparison::StartsWithIgnoreCase);