mirror of
https://github.com/alexhopeoconnor/WiFiManager.git
synced 2026-10-17 00:21:31 +10:00
alex
b94f34f06a
- Remove setConfigPortalBlocking() API and _configPortalIsBlocking member variable - Remove blocking while(1) loop from startConfigPortal() - Change startConfigPortal() return type from boolean to void - Change stopConfigPortal() return type from bool to void - Make stopConfigPortal() immediately shutdown portal (call shutdownConfigPortal() directly) - Remove unused portalAbortResult and portalTimeoutResult variables - Update all comments to remove blocking mode references - Simplify debug messages (remove 'non-blocking' references) - Update tests to remove setConfigPortalBlocking() calls - All 43 tests passing The config portal is now always non-blocking, requiring users to call process() periodically in their main loop. This aligns with the async web server architecture and simplifies the API.
90 lines
2.5 KiB
C++
90 lines
2.5 KiB
C++
#include <unity.h>
|
|
#include <Arduino.h>
|
|
#include <WiFiManager.h>
|
|
|
|
// Test static IP configuration
|
|
// Test AP static IP configuration - verifies IP is actually applied
|
|
void test_set_ap_static_ip_config() {
|
|
Serial.println("[TEST] Testing setAPStaticIPConfig()...");
|
|
|
|
WiFiManager wm;
|
|
|
|
IPAddress ip(192, 168, 4, 1);
|
|
IPAddress gw(192, 168, 4, 1);
|
|
IPAddress sn(255, 255, 255, 0);
|
|
|
|
// Set AP static IP
|
|
wm.setAPStaticIPConfig(ip, gw, sn);
|
|
|
|
wm.setConfigPortalTimeout(10);
|
|
|
|
// Start portal and verify IP is actually set
|
|
wm.startConfigPortal("TestAP");
|
|
TEST_ASSERT_TRUE(wm.getConfigPortalActive());
|
|
|
|
delay(200); // Give time for IP to be configured
|
|
|
|
// Verify AP IP matches what we configured
|
|
IPAddress apIP = WiFi.softAPIP();
|
|
TEST_ASSERT_EQUAL(ip, apIP);
|
|
|
|
wm.stopConfigPortal();
|
|
|
|
Serial.println("[TEST] setAPStaticIPConfig() test completed successfully");
|
|
}
|
|
|
|
// Test STA static IP configuration - consolidated
|
|
void test_sta_static_ip_configuration() {
|
|
Serial.println("[TEST] Testing STA static IP configuration...");
|
|
|
|
WiFiManager wm;
|
|
|
|
IPAddress ip(192, 168, 1, 100);
|
|
IPAddress gw(192, 168, 1, 1);
|
|
IPAddress sn(255, 255, 255, 0);
|
|
IPAddress dns(8, 8, 8, 8);
|
|
|
|
// Test setSTAStaticIPConfig without DNS
|
|
wm.setSTAStaticIPConfig(ip, gw, sn);
|
|
|
|
// Test setSTAStaticIPConfig with DNS
|
|
wm.setSTAStaticIPConfig(ip, gw, sn, dns);
|
|
|
|
// Verify no crash
|
|
TEST_ASSERT_TRUE_MESSAGE(true, "STA static IP configuration setters executed without crash");
|
|
|
|
Serial.println("[TEST] STA static IP configuration test completed successfully");
|
|
}
|
|
|
|
// Note: test_show_static_fields and test_show_dns_fields removed -
|
|
// already covered in test_configuration_setters() in test_configuration.cpp
|
|
|
|
void test_ap_static_ip_application() {
|
|
Serial.println("[TEST] Testing AP static IP application...");
|
|
|
|
WiFiManager wm;
|
|
|
|
IPAddress customIP(10, 0, 1, 1);
|
|
IPAddress customGW(10, 0, 1, 1);
|
|
IPAddress customSN(255, 255, 255, 0);
|
|
|
|
wm.setAPStaticIPConfig(customIP, customGW, customSN);
|
|
|
|
wm.setConfigPortalTimeout(10);
|
|
|
|
wm.startConfigPortal("TestAP");
|
|
TEST_ASSERT_TRUE(wm.getConfigPortalActive());
|
|
|
|
delay(200); // Give time for AP to configure
|
|
|
|
IPAddress apIP = WiFi.softAPIP();
|
|
|
|
// AP should have the configured IP
|
|
TEST_ASSERT_EQUAL(customIP, apIP);
|
|
|
|
wm.stopConfigPortal();
|
|
|
|
Serial.println("[TEST] AP static IP application test completed successfully");
|
|
}
|
|
|