summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFiras Sammoura <fsammoura@google.com>2022-09-22 19:49:13 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-22 22:44:27 +0000
commit9ef40362656a34790c29674abd44f161f4a8435b (patch)
tree8fdccdfc4436da39159c20f83a725b4bd18abcf2
parent2e07bb2896cdc4b905fb8b1463fffe1749bfb025 (diff)
downloadchrome-ec-9ef40362656a34790c29674abd44f161f4a8435b.tar.gz
test: use structs initialized in mock for assertions
Use the structs initialized in rollback_latest_mock.c to test assert the correct outcome from get_latest_rollback function in test/rollback_secret.c. Add extern declaration in rollback_latest_mock.h in order to use these structs in test/rollback_secret.c. BRANCH=None BUG=b:242720910 TEST=make run-rollback_secret TEST=make runhosttests Signed-off-by: Firas Sammoura <fsammoura@google.com> Change-Id: Ieceb267806d9dc56a968757738e5f736e9108983 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3914291 Reviewed-by: Bobby Casey <bobbycasey@google.com>
-rw-r--r--common/mock/rollback_latest_mock.c4
-rw-r--r--include/mock/rollback_latest_mock.h4
-rw-r--r--test/rollback_secret.c21
3 files changed, 11 insertions, 18 deletions
diff --git a/common/mock/rollback_latest_mock.c b/common/mock/rollback_latest_mock.c
index 7931733dea..ab62645a1c 100644
--- a/common/mock/rollback_latest_mock.c
+++ b/common/mock/rollback_latest_mock.c
@@ -23,7 +23,7 @@
struct mock_ctrl_latest_rollback mock_ctrl_latest_rollback =
MOCK_CTRL_DEFAULT_LATEST_ROLLBACK;
-static const struct rollback_data fake_latest_rollback_zeros = {
+const struct rollback_data fake_latest_rollback_zeros = {
.cookie = 0,
.secret = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34,7 +34,7 @@ static const struct rollback_data fake_latest_rollback_zeros = {
.rollback_min_version = 0,
};
-static const struct rollback_data fake_latest_rollback_real = {
+const struct rollback_data fake_latest_rollback_real = {
.cookie = 9,
.secret = {
0xcf, 0xe3, 0x23, 0x76, 0x35, 0x04, 0xc2, 0x0f, 0x0d, 0xb6, 0x02,
diff --git a/include/mock/rollback_latest_mock.h b/include/mock/rollback_latest_mock.h
index b9e32b24dd..82c4c5aadc 100644
--- a/include/mock/rollback_latest_mock.h
+++ b/include/mock/rollback_latest_mock.h
@@ -29,4 +29,8 @@ struct mock_ctrl_latest_rollback {
extern struct mock_ctrl_latest_rollback mock_ctrl_latest_rollback;
+extern const struct rollback_data fake_latest_rollback_zeros;
+
+extern const struct rollback_data fake_latest_rollback_real;
+
#endif /* __MOCK_ROLLBACK_LATEST_MOCK_H */
diff --git a/test/rollback_secret.c b/test/rollback_secret.c
index c3e23e4d11..4813814f19 100644
--- a/test/rollback_secret.c
+++ b/test/rollback_secret.c
@@ -31,17 +31,12 @@ test_static int test_get_rollback_secret_latest_rollback_secret_zeros(void)
{
struct rollback_data test_data;
uint8_t secret[32];
- const uint8_t zeros_secret[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- };
mock_ctrl_latest_rollback.output_type = GET_LATEST_ROLLBACK_ZEROS;
TEST_ASSERT(get_latest_rollback(&test_data) == EC_SUCCESS);
- TEST_ASSERT_ARRAY_EQ(test_data.secret, zeros_secret,
- sizeof(zeros_secret));
+ TEST_ASSERT_ARRAY_EQ(test_data.secret,
+ fake_latest_rollback_zeros.secret,
+ sizeof(fake_latest_rollback_zeros.secret));
TEST_ASSERT(rollback_get_secret(secret) == EC_ERROR_UNKNOWN);
@@ -52,17 +47,11 @@ test_static int test_get_rollback_secret_latest_rollback_secret_succeed(void)
{
struct rollback_data test_data;
uint8_t secret[32];
- const uint8_t real_secret[] = {
- 0xcf, 0xe3, 0x23, 0x76, 0x35, 0x04, 0xc2, 0x0f,
- 0x0d, 0xb6, 0x02, 0xa9, 0x68, 0xba, 0x2a, 0x61,
- 0x86, 0x2a, 0x85, 0xd1, 0xca, 0x09, 0x54, 0x8a,
- 0x6b, 0xe2, 0xe3, 0x38, 0xde, 0x5d, 0x59, 0x14,
- };
mock_ctrl_latest_rollback.output_type = GET_LATEST_ROLLBACK_REAL;
TEST_ASSERT(get_latest_rollback(&test_data) == EC_SUCCESS);
- TEST_ASSERT_ARRAY_EQ(test_data.secret, real_secret,
- sizeof(real_secret));
+ TEST_ASSERT_ARRAY_EQ(test_data.secret, fake_latest_rollback_real.secret,
+ sizeof(fake_latest_rollback_real.secret));
TEST_ASSERT(rollback_get_secret(secret) == EC_SUCCESS);
TEST_ASSERT_ARRAY_EQ(secret, test_data.secret, sizeof(secret));