From cc30ffd4a2c7067d9b3abf1eb2e9ac3d556a03f1 Mon Sep 17 00:00:00 2001 From: Miles Burton Date: Thu, 23 Jan 2025 20:14:49 +0000 Subject: [PATCH 1/3] fix: Restore the next set of unit tests --- test/unit_test_001.cpp.disabled | 81 --------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 test/unit_test_001.cpp.disabled diff --git a/test/unit_test_001.cpp.disabled b/test/unit_test_001.cpp.disabled deleted file mode 100644 index 45c2d09..0000000 --- a/test/unit_test_001.cpp.disabled +++ /dev/null @@ -1,81 +0,0 @@ -// DISABLED AS NOT ALL STD LIBRARIES ARE MOCKED / INCLUDEABLE - -// -// FILE: unit_test_001.cpp -// AUTHOR: Miles Burton / Rob Tillaart -// DATE: 2021-01-10 -// PURPOSE: unit tests for the Arduino-Temperature-Control-Library -// https://github.com/MilesBurton/Arduino-Temperature-Control-Library -// - -// #include -// #include -// #include -// #include - -// // Mock pin for testing -// #define ONE_WIRE_BUS 2 - -// unittest_setup() { -// fprintf(stderr, "VERSION: %s\n", DALLASTEMPLIBVERSION); -// } - -// unittest_teardown() { -// fprintf(stderr, "\n"); -// } - -// // Test constants defined in the library -// unittest(test_models) { -// assertEqual(0x10, DS18S20MODEL); -// assertEqual(0x28, DS18B20MODEL); -// assertEqual(0x22, DS1822MODEL); -// assertEqual(0x3B, DS1825MODEL); -// assertEqual(0x42, DS28EA00MODEL); -// } - -// // Test error codes defined in the library -// unittest(test_error_code) { -// assertEqual(DEVICE_DISCONNECTED_C, -127); -// assertEqual(DEVICE_DISCONNECTED_F, -196.6); -// assertEqual(DEVICE_DISCONNECTED_RAW, -7040); - -// assertEqual(DEVICE_FAULT_OPEN_C, -254); -// assertEqualFloat(DEVICE_FAULT_OPEN_F, -425.2, 0.1); -// assertEqual(DEVICE_FAULT_OPEN_RAW, -32512); - -// assertEqual(DEVICE_FAULT_SHORTGND_C, -253); -// assertEqualFloat(DEVICE_FAULT_SHORTGND_F, -423.4, 0.1); -// assertEqual(DEVICE_FAULT_SHORTGND_RAW, -32384); - -// assertEqual(DEVICE_FAULT_SHORTVDD_C, -252); -// assertEqualFloat(DEVICE_FAULT_SHORTVDD_F, -421.6, 0.1); -// assertEqual(DEVICE_FAULT_SHORTVDD_RAW, -32256); -// } - -// // Test basic initialization and functionality of the DallasTemperature library -// unittest(test_initialization) { -// OneWire oneWire(ONE_WIRE_BUS); -// DallasTemperature sensors(&oneWire); - -// sensors.begin(); - -// // Initially, there should be no devices detected -// assertEqual(0, sensors.getDeviceCount()); -// assertFalse(sensors.isParasitePowerMode()); -// } - -// // Simulate a basic temperature read (mocked) -// unittest(test_temperature_read) { -// OneWire oneWire(ONE_WIRE_BUS); -// DallasTemperature sensors(&oneWire); - -// sensors.begin(); - -// // Mock reading temperature -// float tempC = sensors.getTempCByIndex(0); -// assertEqual(DEVICE_DISCONNECTED_C, tempC); // Simulated no device connected -// } - -// unittest_main() - -// -------- \ No newline at end of file From f65f98e59688983fcf678701bef87aa2d71af00d Mon Sep 17 00:00:00 2001 From: Miles Burton Date: Thu, 23 Jan 2025 20:20:48 +0000 Subject: [PATCH 2/3] fix: Restore the next set of unit tests --- test/unit_test_001.cpp | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 test/unit_test_001.cpp diff --git a/test/unit_test_001.cpp b/test/unit_test_001.cpp new file mode 100644 index 0000000..45c2d09 --- /dev/null +++ b/test/unit_test_001.cpp @@ -0,0 +1,81 @@ +// DISABLED AS NOT ALL STD LIBRARIES ARE MOCKED / INCLUDEABLE + +// +// FILE: unit_test_001.cpp +// AUTHOR: Miles Burton / Rob Tillaart +// DATE: 2021-01-10 +// PURPOSE: unit tests for the Arduino-Temperature-Control-Library +// https://github.com/MilesBurton/Arduino-Temperature-Control-Library +// + +// #include +// #include +// #include +// #include + +// // Mock pin for testing +// #define ONE_WIRE_BUS 2 + +// unittest_setup() { +// fprintf(stderr, "VERSION: %s\n", DALLASTEMPLIBVERSION); +// } + +// unittest_teardown() { +// fprintf(stderr, "\n"); +// } + +// // Test constants defined in the library +// unittest(test_models) { +// assertEqual(0x10, DS18S20MODEL); +// assertEqual(0x28, DS18B20MODEL); +// assertEqual(0x22, DS1822MODEL); +// assertEqual(0x3B, DS1825MODEL); +// assertEqual(0x42, DS28EA00MODEL); +// } + +// // Test error codes defined in the library +// unittest(test_error_code) { +// assertEqual(DEVICE_DISCONNECTED_C, -127); +// assertEqual(DEVICE_DISCONNECTED_F, -196.6); +// assertEqual(DEVICE_DISCONNECTED_RAW, -7040); + +// assertEqual(DEVICE_FAULT_OPEN_C, -254); +// assertEqualFloat(DEVICE_FAULT_OPEN_F, -425.2, 0.1); +// assertEqual(DEVICE_FAULT_OPEN_RAW, -32512); + +// assertEqual(DEVICE_FAULT_SHORTGND_C, -253); +// assertEqualFloat(DEVICE_FAULT_SHORTGND_F, -423.4, 0.1); +// assertEqual(DEVICE_FAULT_SHORTGND_RAW, -32384); + +// assertEqual(DEVICE_FAULT_SHORTVDD_C, -252); +// assertEqualFloat(DEVICE_FAULT_SHORTVDD_F, -421.6, 0.1); +// assertEqual(DEVICE_FAULT_SHORTVDD_RAW, -32256); +// } + +// // Test basic initialization and functionality of the DallasTemperature library +// unittest(test_initialization) { +// OneWire oneWire(ONE_WIRE_BUS); +// DallasTemperature sensors(&oneWire); + +// sensors.begin(); + +// // Initially, there should be no devices detected +// assertEqual(0, sensors.getDeviceCount()); +// assertFalse(sensors.isParasitePowerMode()); +// } + +// // Simulate a basic temperature read (mocked) +// unittest(test_temperature_read) { +// OneWire oneWire(ONE_WIRE_BUS); +// DallasTemperature sensors(&oneWire); + +// sensors.begin(); + +// // Mock reading temperature +// float tempC = sensors.getTempCByIndex(0); +// assertEqual(DEVICE_DISCONNECTED_C, tempC); // Simulated no device connected +// } + +// unittest_main() + +// -------- \ No newline at end of file From 14fc0cf46a6dfa3654bb624af6ecea98e7a1d256 Mon Sep 17 00:00:00 2001 From: Miles Burton Date: Thu, 23 Jan 2025 20:21:40 +0000 Subject: [PATCH 3/3] fix: Restore the next set of unit tests --- test/unit_test_001.cpp | 147 ++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 76 deletions(-) diff --git a/test/unit_test_001.cpp b/test/unit_test_001.cpp index 45c2d09..54fefc2 100644 --- a/test/unit_test_001.cpp +++ b/test/unit_test_001.cpp @@ -1,81 +1,76 @@ -// DISABLED AS NOT ALL STD LIBRARIES ARE MOCKED / INCLUDEABLE - -// // FILE: unit_test_001.cpp // AUTHOR: Miles Burton / Rob Tillaart // DATE: 2021-01-10 // PURPOSE: unit tests for the Arduino-Temperature-Control-Library // https://github.com/MilesBurton/Arduino-Temperature-Control-Library -// - -// #include -// #include -// #include -// #include - -// // Mock pin for testing -// #define ONE_WIRE_BUS 2 - -// unittest_setup() { -// fprintf(stderr, "VERSION: %s\n", DALLASTEMPLIBVERSION); -// } - -// unittest_teardown() { -// fprintf(stderr, "\n"); -// } - -// // Test constants defined in the library -// unittest(test_models) { -// assertEqual(0x10, DS18S20MODEL); -// assertEqual(0x28, DS18B20MODEL); -// assertEqual(0x22, DS1822MODEL); -// assertEqual(0x3B, DS1825MODEL); -// assertEqual(0x42, DS28EA00MODEL); -// } - -// // Test error codes defined in the library -// unittest(test_error_code) { -// assertEqual(DEVICE_DISCONNECTED_C, -127); -// assertEqual(DEVICE_DISCONNECTED_F, -196.6); -// assertEqual(DEVICE_DISCONNECTED_RAW, -7040); - -// assertEqual(DEVICE_FAULT_OPEN_C, -254); -// assertEqualFloat(DEVICE_FAULT_OPEN_F, -425.2, 0.1); -// assertEqual(DEVICE_FAULT_OPEN_RAW, -32512); - -// assertEqual(DEVICE_FAULT_SHORTGND_C, -253); -// assertEqualFloat(DEVICE_FAULT_SHORTGND_F, -423.4, 0.1); -// assertEqual(DEVICE_FAULT_SHORTGND_RAW, -32384); - -// assertEqual(DEVICE_FAULT_SHORTVDD_C, -252); -// assertEqualFloat(DEVICE_FAULT_SHORTVDD_F, -421.6, 0.1); -// assertEqual(DEVICE_FAULT_SHORTVDD_RAW, -32256); -// } - -// // Test basic initialization and functionality of the DallasTemperature library -// unittest(test_initialization) { -// OneWire oneWire(ONE_WIRE_BUS); -// DallasTemperature sensors(&oneWire); - -// sensors.begin(); - -// // Initially, there should be no devices detected -// assertEqual(0, sensors.getDeviceCount()); -// assertFalse(sensors.isParasitePowerMode()); -// } - -// // Simulate a basic temperature read (mocked) -// unittest(test_temperature_read) { -// OneWire oneWire(ONE_WIRE_BUS); -// DallasTemperature sensors(&oneWire); - -// sensors.begin(); - -// // Mock reading temperature -// float tempC = sensors.getTempCByIndex(0); -// assertEqual(DEVICE_DISCONNECTED_C, tempC); // Simulated no device connected -// } - -// unittest_main() - -// -------- \ No newline at end of file + + +#include +#include +#include +#include + +// Mock pin for testing +#define ONE_WIRE_BUS 2 + +unittest_setup() { + fprintf(stderr, "VERSION: %s\n", DALLASTEMPLIBVERSION); +} + +unittest_teardown() { + fprintf(stderr, "\n"); +} + +// Test constants defined in the library +unittest(test_models) { + assertEqual(0x10, DS18S20MODEL); + assertEqual(0x28, DS18B20MODEL); + assertEqual(0x22, DS1822MODEL); + assertEqual(0x3B, DS1825MODEL); + assertEqual(0x42, DS28EA00MODEL); +} + +// Test error codes defined in the library +unittest(test_error_code) { + assertEqual(DEVICE_DISCONNECTED_C, -127); + assertEqual(DEVICE_DISCONNECTED_F, -196.6); + assertEqual(DEVICE_DISCONNECTED_RAW, -7040); + + assertEqual(DEVICE_FAULT_OPEN_C, -254); + assertEqualFloat(DEVICE_FAULT_OPEN_F, -425.2, 0.1); + assertEqual(DEVICE_FAULT_OPEN_RAW, -32512); + + assertEqual(DEVICE_FAULT_SHORTGND_C, -253); + assertEqualFloat(DEVICE_FAULT_SHORTGND_F, -423.4, 0.1); + assertEqual(DEVICE_FAULT_SHORTGND_RAW, -32384); + + assertEqual(DEVICE_FAULT_SHORTVDD_C, -252); + assertEqualFloat(DEVICE_FAULT_SHORTVDD_F, -421.6, 0.1); + assertEqual(DEVICE_FAULT_SHORTVDD_RAW, -32256); +} + +// Test basic initialization and functionality of the DallasTemperature library +unittest(test_initialization) { + OneWire oneWire(ONE_WIRE_BUS); + DallasTemperature sensors(&oneWire); + + sensors.begin(); + + // Initially, there should be no devices detected + assertEqual(0, sensors.getDeviceCount()); + assertFalse(sensors.isParasitePowerMode()); +} + +// Simulate a basic temperature read (mocked) +unittest(test_temperature_read) { + OneWire oneWire(ONE_WIRE_BUS); + DallasTemperature sensors(&oneWire); + + sensors.begin(); + + // Mock reading temperature + float tempC = sensors.getTempCByIndex(0); + assertEqual(DEVICE_DISCONNECTED_C, tempC); // Simulated no device connected +} + +unittest_main() \ No newline at end of file