read_rec() füllte den Puffer bisher mit memset(0) statt mit nl_settings_defaults() vor, bevor die tatsächlich vorhandenen hdr.length Bytes darübergeschrieben werden. Ein gekürzter Record, dessen Länge vor fade_in_ms/fade_out_ms endet, aber token noch enthält, lief damit mit fade_in_ms=0/fade_out_ms=0 statt der spezifizierten 500 ms - genau der Fall, für den die Längentoleranz gedacht war. Die davor eingebaute "leerer Record" Sonderbehandlung in nl_settings_load() (fade_in_ms==0 && fade_out_ms==0 && token[0]=='\0' -> volle Defaults) ist dadurch überflüssig geworden und entfernt. test_load_accepts_shorter_record kürzt jetzt bis vor fade_in_ms und prüft explizit auf die echten Defaults (500/500/0) statt nur auf Felder vor dem gekürzten Bereich. test_load_rejects_longer_record verzichtet auf die tote CRC-Neuberechnung, da read_rec() zu lange Records schon anhand der Länge verwirft, bevor Payload oder CRC gelesen werden.
160 lines
5.1 KiB
C
160 lines
5.1 KiB
C
#include <stddef.h>
|
|
#include <string.h>
|
|
#include "unity.h"
|
|
#include "fake_flash.h"
|
|
#include "config/nl_flash_layout.h"
|
|
#include "config/nl_settings.h"
|
|
#include "light/nl_light_types.h"
|
|
#include "util/nl_crc.h"
|
|
|
|
void setUp(void)
|
|
{
|
|
fake_flash_reset();
|
|
nl_settings_init(NL_FL_SETTINGS_A, NL_FL_SETTINGS_B);
|
|
}
|
|
|
|
void tearDown(void)
|
|
{
|
|
TEST_ASSERT_EQUAL_UINT(0, fake_flash_dirty_writes);
|
|
}
|
|
|
|
static nl_settings_t sample(const char *name)
|
|
{
|
|
nl_settings_t s;
|
|
nl_settings_defaults(&s);
|
|
strcpy(s.wifi_ssid, "ninHome");
|
|
strcpy(s.wifi_pass, "secret");
|
|
strcpy(s.name, name);
|
|
s.auth_all = 1;
|
|
s.power_on_behaviour = NL_POB_ON;
|
|
s.fade_in_ms = 1200;
|
|
return s;
|
|
}
|
|
|
|
static void test_defaults(void)
|
|
{
|
|
nl_settings_t s;
|
|
TEST_ASSERT_FALSE(nl_settings_load(&s));
|
|
TEST_ASSERT_EQUAL_STRING("", s.wifi_ssid);
|
|
TEST_ASSERT_EQUAL_STRING("aabbccddeeff0011223344", s.token);
|
|
TEST_ASSERT_EQUAL_STRING("", s.name);
|
|
TEST_ASSERT_EQUAL_UINT8(0, s.auth_all);
|
|
TEST_ASSERT_EQUAL_UINT8(NL_POB_LAST, s.power_on_behaviour);
|
|
TEST_ASSERT_EQUAL_UINT16(500, s.fade_in_ms);
|
|
TEST_ASSERT_EQUAL_UINT16(500, s.fade_out_ms);
|
|
}
|
|
|
|
static void test_save_and_load(void)
|
|
{
|
|
nl_settings_t in = sample("Wohnzimmer"), out;
|
|
TEST_ASSERT_EQUAL_INT(0, nl_settings_save(&in));
|
|
TEST_ASSERT_TRUE(nl_settings_load(&out));
|
|
TEST_ASSERT_EQUAL_MEMORY(&in, &out, sizeof in);
|
|
}
|
|
|
|
static void test_alternates_slots(void)
|
|
{
|
|
nl_settings_t s, out;
|
|
s = sample("a"); nl_settings_save(&s);
|
|
s = sample("b"); nl_settings_save(&s);
|
|
s = sample("c"); nl_settings_save(&s);
|
|
TEST_ASSERT_EQUAL_UINT(2, fake_flash_erases[0]);
|
|
TEST_ASSERT_EQUAL_UINT(1, fake_flash_erases[1]);
|
|
TEST_ASSERT_TRUE(nl_settings_load(&out));
|
|
TEST_ASSERT_EQUAL_STRING("c", out.name);
|
|
}
|
|
|
|
static void test_power_loss_keeps_previous(void)
|
|
{
|
|
nl_settings_t s = sample("old"), out;
|
|
nl_settings_save(&s);
|
|
s = sample("new");
|
|
fake_flash_fail_after(50);
|
|
TEST_ASSERT_NOT_EQUAL(0, nl_settings_save(&s));
|
|
fake_flash_fail_after(-1);
|
|
TEST_ASSERT_TRUE(nl_settings_load(&out));
|
|
TEST_ASSERT_EQUAL_STRING("old", out.name);
|
|
}
|
|
|
|
static void test_corrupt_newest_falls_back(void)
|
|
{
|
|
nl_settings_t s, out;
|
|
s = sample("first"); nl_settings_save(&s); /* slot A */
|
|
s = sample("second"); nl_settings_save(&s); /* slot B */
|
|
fake_flash_mem[NL_FL_SETTINGS_B + 40] ^= 0x01;
|
|
TEST_ASSERT_TRUE(nl_settings_load(&out));
|
|
TEST_ASSERT_EQUAL_STRING("first", out.name);
|
|
}
|
|
|
|
static void test_load_accepts_shorter_record(void)
|
|
{
|
|
nl_settings_t in, out;
|
|
uint32_t crc;
|
|
/* simulate a record written by a firmware that predates fade_in_ms/fade_out_ms/
|
|
* ota_pending: length ends right before fade_in_ms. Those fields must come back as
|
|
* their real defaults (500 ms / 0), not as zero just because the record didn't carry
|
|
* them - that's the whole point of the length tolerance. */
|
|
in = sample("alt");
|
|
nl_settings_save(&in);
|
|
{
|
|
uint16_t shorter = (uint16_t)offsetof(nl_settings_t, fade_in_ms);
|
|
memcpy(&fake_flash_mem[NL_FL_SETTINGS_A + 6], &shorter, 2); /* header.length */
|
|
crc = nl_crc32(0, &fake_flash_mem[NL_FL_SETTINGS_A], 12 + shorter);
|
|
memcpy(&fake_flash_mem[NL_FL_SETTINGS_A + 12 + shorter], &crc, 4);
|
|
}
|
|
TEST_ASSERT_TRUE(nl_settings_load(&out));
|
|
TEST_ASSERT_EQUAL_STRING("alt", out.name);
|
|
TEST_ASSERT_EQUAL_STRING("ninHome", out.wifi_ssid);
|
|
TEST_ASSERT_EQUAL_UINT16(500, out.fade_in_ms);
|
|
TEST_ASSERT_EQUAL_UINT16(500, out.fade_out_ms);
|
|
TEST_ASSERT_EQUAL_UINT8(0, out.ota_pending);
|
|
}
|
|
|
|
static void test_load_rejects_longer_record(void)
|
|
{
|
|
nl_settings_t in = sample("x"), out;
|
|
uint16_t longer = (uint16_t)(sizeof(nl_settings_t) + 1);
|
|
nl_settings_save(&in);
|
|
/* read_rec() rejects hdr.length > sizeof(nl_settings_t) outright, before it even reads
|
|
* the payload or the CRC - so the stored CRC is irrelevant here and deliberately left
|
|
* as whatever nl_settings_save() wrote for the original (shorter) length. */
|
|
memcpy(&fake_flash_mem[NL_FL_SETTINGS_A + 6], &longer, 2); /* header.length */
|
|
TEST_ASSERT_FALSE(nl_settings_load(&out)); /* unknown newer layout -> defaults */
|
|
}
|
|
|
|
static void test_ota_pending_default_and_roundtrip(void)
|
|
{
|
|
nl_settings_t in, out;
|
|
TEST_ASSERT_FALSE(nl_settings_load(&out));
|
|
TEST_ASSERT_EQUAL_UINT8(0, out.ota_pending);
|
|
|
|
in = sample("ota");
|
|
in.ota_pending = 1;
|
|
TEST_ASSERT_EQUAL_INT(0, nl_settings_save(&in));
|
|
TEST_ASSERT_TRUE(nl_settings_load(&out));
|
|
TEST_ASSERT_EQUAL_UINT8(1, out.ota_pending);
|
|
}
|
|
|
|
static void test_erase(void)
|
|
{
|
|
nl_settings_t s = sample("x"), out;
|
|
nl_settings_save(&s);
|
|
TEST_ASSERT_EQUAL_INT(0, nl_settings_erase());
|
|
TEST_ASSERT_FALSE(nl_settings_load(&out));
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
UNITY_BEGIN();
|
|
RUN_TEST(test_defaults);
|
|
RUN_TEST(test_save_and_load);
|
|
RUN_TEST(test_alternates_slots);
|
|
RUN_TEST(test_power_loss_keeps_previous);
|
|
RUN_TEST(test_corrupt_newest_falls_back);
|
|
RUN_TEST(test_load_accepts_shorter_record);
|
|
RUN_TEST(test_load_rejects_longer_record);
|
|
RUN_TEST(test_ota_pending_default_and_roundtrip);
|
|
RUN_TEST(test_erase);
|
|
return UNITY_END();
|
|
}
|