Add QTPOKIT_BEFRIEND_TEST macro

So friend classes are only declared when QT_TESTLIB_LIB is also.
pcolby · Dec 28, 2024 · 139df90 · 139df90
1 parent c3e649c
commit 139df90
Show file tree

Hide file tree

Showing 33 changed files with 46 additions and 32 deletions.
diff --git a/include/qtpokit/abstractpokitservice.h b/include/qtpokit/abstractpokitservice.h
@@ -55,7 +55,7 @@ class QTPOKIT_EXPORT AbstractPokitService : public QObject
 private:
     Q_DECLARE_PRIVATE(AbstractPokitService)
     Q_DISABLE_COPY(AbstractPokitService)
-    friend class TestAbstractPokitService;
+    QTPOKIT_BEFRIEND_TEST(AbstractPokitService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/calibrationservice.h b/include/qtpokit/calibrationservice.h
@@ -58,7 +58,7 @@ class QTPOKIT_EXPORT CalibrationService : public AbstractPokitService
 private:
     Q_DECLARE_PRIVATE(CalibrationService)
     Q_DISABLE_COPY(CalibrationService)
-    friend class TestCalibrationService;
+    QTPOKIT_BEFRIEND_TEST(CalibrationService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/dataloggerservice.h b/include/qtpokit/dataloggerservice.h
@@ -127,7 +127,7 @@ class QTPOKIT_EXPORT DataLoggerService : public AbstractPokitService
 private:
     Q_DECLARE_PRIVATE(DataLoggerService)
     Q_DISABLE_COPY(DataLoggerService)
-    friend class TestDataLoggerService;
+    QTPOKIT_BEFRIEND_TEST(DataLoggerService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/deviceinfoservice.h b/include/qtpokit/deviceinfoservice.h
@@ -90,7 +90,7 @@ class QTPOKIT_EXPORT DeviceInfoService : public AbstractPokitService
 private:
     Q_DECLARE_PRIVATE(DeviceInfoService)
     Q_DISABLE_COPY(DeviceInfoService)
-    friend class TestDeviceInfoService;
+    QTPOKIT_BEFRIEND_TEST(DeviceInfoService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/dsoservice.h b/include/qtpokit/dsoservice.h
@@ -126,7 +126,7 @@ class QTPOKIT_EXPORT DsoService : public AbstractPokitService
 private:
     Q_DECLARE_PRIVATE(DsoService)
     Q_DISABLE_COPY(DsoService)
-    friend class TestDsoService;
+    QTPOKIT_BEFRIEND_TEST(DsoService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/multimeterservice.h b/include/qtpokit/multimeterservice.h
@@ -108,7 +108,7 @@ class QTPOKIT_EXPORT MultimeterService : public AbstractPokitService
 private:
     Q_DECLARE_PRIVATE(MultimeterService)
     Q_DISABLE_COPY(MultimeterService)
-    friend class TestMultimeterService;
+    QTPOKIT_BEFRIEND_TEST(MultimeterService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/pokitdevice.h b/include/qtpokit/pokitdevice.h
@@ -62,7 +62,7 @@ public Q_SLOTS:
 private:
     Q_DECLARE_PRIVATE(PokitDevice)
     Q_DISABLE_COPY(PokitDevice)
-    friend class TestPokitDevice;
+    QTPOKIT_BEFRIEND_TEST(PokitDevice)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/pokitdiscoveryagent.h b/include/qtpokit/pokitdiscoveryagent.h
@@ -47,7 +47,7 @@ public Q_SLOTS:
 private:
     Q_DECLARE_PRIVATE(PokitDiscoveryAgent)
     Q_DISABLE_COPY(PokitDiscoveryAgent)
-    friend class TestPokitDiscoveryAgent;
+    QTPOKIT_BEFRIEND_TEST(PokitDiscoveryAgent)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/include/qtpokit/qtpokit_global.h b/include/qtpokit/qtpokit_global.h
@@ -55,6 +55,18 @@
   #define QTPOKIT_END_NAMESPACE
 #endif
 
+/*!
+ * \def QTPOKIT_BEFRIEND_TEST
+ *
+ * Macro for befriending a related unit test class, but only when QT_TESTLIB_LIB is defined.
+ */
+
+#ifdef QT_TESTLIB_LIB
+  #define QTPOKIT_BEFRIEND_TEST(Class) friend class Test##Class;
+#else
+  #define QTPOKIT_BEFRIEND_TEST(Class)
+#endif
+
 /// \endcond
 
 #endif // QTPOKIT_GLOBAL_H
diff --git a/include/qtpokit/statusservice.h b/include/qtpokit/statusservice.h
@@ -192,7 +192,7 @@ class QTPOKIT_EXPORT StatusService : public AbstractPokitService
 private:
     Q_DECLARE_PRIVATE(StatusService)
     Q_DISABLE_COPY(StatusService)
-    friend class TestStatusService;
+    QTPOKIT_BEFRIEND_TEST(StatusService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/cli/abstractcommand.h b/src/cli/abstractcommand.h
@@ -4,6 +4,8 @@
 #ifndef DOKIT_ABSTRACTCOMMAND_H
 #define DOKIT_ABSTRACTCOMMAND_H
 
+#include <qtpokit/qtpokit_global.h>
+
 #include <QBluetoothDeviceInfo>
 #include <QCommandLineParser>
 #include <QLoggingCategory>
@@ -47,7 +49,7 @@ protected slots:
     virtual void deviceDiscovered(const QBluetoothDeviceInfo &info) = 0;
     virtual void deviceDiscoveryFinished() = 0;
 
-    friend class TestAbstractCommand;
+    QTPOKIT_BEFRIEND_TEST(AbstractCommand)
 };
 
 #endif // DOKIT_ABSTRACTCOMMAND_H
diff --git a/src/cli/calibratecommand.h b/src/cli/calibratecommand.h
@@ -31,5 +31,5 @@ protected slots:
 private slots:
     void temperatureCalibrated();
 
-    friend class TestCalibrateCommand;
+    QTPOKIT_BEFRIEND_TEST(CalibrateCommand)
 };
diff --git a/src/cli/devicecommand.h b/src/cli/devicecommand.h
@@ -46,7 +46,7 @@ private slots:
     void deviceDiscovered(const QBluetoothDeviceInfo &info) override;
     void deviceDiscoveryFinished() override;
 
-    friend class TestDeviceCommand;
+    QTPOKIT_BEFRIEND_TEST(DeviceCommand)
 };
 
 #endif // DOKIT_DEVICECOMMAND_H
diff --git a/src/cli/dsocommand.h b/src/cli/dsocommand.h
@@ -43,5 +43,5 @@ private slots:
     void metadataRead(const DsoService::Metadata &data);
     void outputSamples(const DsoService::Samples &samples);
 
-    friend class TestDsoCommand;
+    QTPOKIT_BEFRIEND_TEST(DsoCommand)
 };
diff --git a/src/cli/flashledcommand.h b/src/cli/flashledcommand.h
@@ -30,5 +30,5 @@ protected slots:
 private slots:
     void deviceLedFlashed();
 
-    friend class TestFlashLedCommand;
+    QTPOKIT_BEFRIEND_TEST(FlashLedCommand)
 };
diff --git a/src/cli/infocommand.h b/src/cli/infocommand.h
@@ -27,5 +27,5 @@ protected slots:
 private:
     DeviceInfoService * service { nullptr }; ///< Bluetooth service this command interracts with.
 
-    friend class TestInfoCommand;
+    QTPOKIT_BEFRIEND_TEST(InfoCommand)
 };
diff --git a/src/cli/loggerfetchcommand.h b/src/cli/loggerfetchcommand.h
@@ -29,5 +29,5 @@ private slots:
     void metadataRead(const DataLoggerService::Metadata &data);
     void outputSamples(const DataLoggerService::Samples &samples);
 
-    friend class TestLoggerFetchCommand;
+    QTPOKIT_BEFRIEND_TEST(LoggerFetchCommand)
 };
diff --git a/src/cli/loggerstartcommand.h b/src/cli/loggerstartcommand.h
@@ -38,5 +38,5 @@ protected slots:
 private slots:
     void settingsWritten();
 
-    friend class TestLoggerStartCommand;
+    QTPOKIT_BEFRIEND_TEST(LoggerStartCommand)
 };
diff --git a/src/cli/loggerstopcommand.h b/src/cli/loggerstopcommand.h
@@ -24,5 +24,5 @@ protected slots:
 private slots:
     void settingsWritten();
 
-    friend class TestLoggerStopCommand;
+    QTPOKIT_BEFRIEND_TEST(LoggerStopCommand)
 };
diff --git a/src/cli/metercommand.h b/src/cli/metercommand.h
@@ -39,5 +39,5 @@ private slots:
     void settingsWritten();
     void outputReading(const MultimeterService::Reading &reading);
 
-    friend class TestMeterCommand;
+    QTPOKIT_BEFRIEND_TEST(MeterCommand)
 };
diff --git a/src/cli/scancommand.h b/src/cli/scancommand.h
@@ -39,5 +39,5 @@ protected slots:
     static QString toString(const QBluetoothDeviceInfo::MajorDeviceClass &majorClass);
     static QString toString(const QBluetoothDeviceInfo::MajorDeviceClass &majorClass, const quint8 minorClass);
 
-    friend class TestScanCommand;
+    QTPOKIT_BEFRIEND_TEST(ScanCommand)
 };
diff --git a/src/cli/setnamecommand.h b/src/cli/setnamecommand.h
@@ -31,5 +31,5 @@ protected slots:
 private slots:
     void deviceNameWritten();
 
-    friend class TestSetNameCommand;
+    QTPOKIT_BEFRIEND_TEST(SetNameCommand)
 };
diff --git a/src/cli/settorchcommand.h b/src/cli/settorchcommand.h
@@ -31,5 +31,5 @@ protected slots:
 private slots:
     void torchStatusWritten();
 
-    friend class TestSetTorchCommand;
+    QTPOKIT_BEFRIEND_TEST(SetTorchCommand)
 };
diff --git a/src/cli/statuscommand.h b/src/cli/statuscommand.h
@@ -29,5 +29,5 @@ protected slots:
 
     void outputDeviceStatus(const StatusService::DeviceCharacteristics &chrs);
 
-    friend class TestStatusCommand;
+    QTPOKIT_BEFRIEND_TEST(StatusCommand)
 };
diff --git a/src/lib/abstractpokitservice_p.h b/src/lib/abstractpokitservice_p.h
@@ -71,7 +71,7 @@ protected Q_SLOTS:
 private:
     Q_DECLARE_PUBLIC(AbstractPokitService)
     Q_DISABLE_COPY(AbstractPokitServicePrivate)
-    friend class TestAbstractPokitService;
+    QTPOKIT_BEFRIEND_TEST(AbstractPokitService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/calibrationservice_p.h b/src/lib/calibrationservice_p.h
@@ -31,7 +31,7 @@ class QTPOKIT_EXPORT CalibrationServicePrivate : public AbstractPokitServicePriv
 private:
     Q_DECLARE_PUBLIC(CalibrationService)
     Q_DISABLE_COPY(CalibrationServicePrivate)
-    friend class TestCalibrationService;
+    QTPOKIT_BEFRIEND_TEST(CalibrationService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/dataloggerservice_p.h b/src/lib/dataloggerservice_p.h
@@ -39,7 +39,7 @@ class QTPOKIT_EXPORT DataLoggerServicePrivate : public AbstractPokitServicePriva
 private:
     Q_DECLARE_PUBLIC(DataLoggerService)
     Q_DISABLE_COPY(DataLoggerServicePrivate)
-    friend class TestDataLoggerService;
+    QTPOKIT_BEFRIEND_TEST(DataLoggerService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/deviceinfoservice_p.h b/src/lib/deviceinfoservice_p.h
@@ -29,7 +29,7 @@ class QTPOKIT_EXPORT DeviceInfoServicePrivate : public AbstractPokitServicePriva
 private:
     Q_DECLARE_PUBLIC(DeviceInfoService)
     Q_DISABLE_COPY(DeviceInfoServicePrivate)
-    friend class TestDeviceInfoService;
+    QTPOKIT_BEFRIEND_TEST(DeviceInfoService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/dsoservice_p.h b/src/lib/dsoservice_p.h
@@ -38,7 +38,7 @@ class QTPOKIT_EXPORT DsoServicePrivate : public AbstractPokitServicePrivate
 private:
     Q_DECLARE_PUBLIC(DsoService)
     Q_DISABLE_COPY(DsoServicePrivate)
-    friend class TestDsoService;
+    QTPOKIT_BEFRIEND_TEST(DsoService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/multimeterservice_p.h b/src/lib/multimeterservice_p.h
@@ -37,7 +37,7 @@ class QTPOKIT_EXPORT MultimeterServicePrivate : public AbstractPokitServicePriva
 private:
     Q_DECLARE_PUBLIC(MultimeterService)
     Q_DISABLE_COPY(MultimeterServicePrivate)
-    friend class TestMultimeterService;
+    QTPOKIT_BEFRIEND_TEST(MultimeterService)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/pokitdevice_p.h b/src/lib/pokitdevice_p.h
@@ -70,7 +70,7 @@ public Q_SLOTS:
 private:
     Q_DECLARE_PUBLIC(PokitDevice)
     Q_DISABLE_COPY(PokitDevicePrivate)
-    friend class TestPokitDevice;
+    QTPOKIT_BEFRIEND_TEST(PokitDevice)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/pokitdiscoveryagent_p.h b/src/lib/pokitdiscoveryagent_p.h
@@ -43,7 +43,7 @@ public Q_SLOTS:
 private:
     Q_DECLARE_PUBLIC(PokitDiscoveryAgent)
     Q_DISABLE_COPY(PokitDiscoveryAgentPrivate)
-    friend class TestPokitDiscoveryAgent;
+    QTPOKIT_BEFRIEND_TEST(PokitDiscoveryAgent)
 };
 
 QTPOKIT_END_NAMESPACE

diff --git a/src/lib/statusservice_p.h b/src/lib/statusservice_p.h
@@ -38,7 +38,7 @@ class QTPOKIT_EXPORT StatusServicePrivate : public AbstractPokitServicePrivate
 private:
     Q_DECLARE_PUBLIC(StatusService)
     Q_DISABLE_COPY(StatusServicePrivate)
-    friend class TestStatusService;
+    QTPOKIT_BEFRIEND_TEST(StatusService)
 };
 
 QTPOKIT_END_NAMESPACE