From 9e3940f8de8b2dffd2550fcf5aa3503b9610e441 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 29 Sep 2020 18:44:39 -0400 Subject: Update agl-vcar to match test expectations The regeneration of the agl-vcar and default plugin signals code broke some expectations of the afb-test and pyagl tests, changes to get things back to a good state: - Add the missing J1939 messages that were in default-signals.cpp before it was regenerated to the agl-vcar signals.json, and then regenerate the affected cpp files; this fixes the J1939 test expectations. An alternative approach would be using the ability to load a different set of signals by configuring a different plugin, but that has been deemed not workable for AGL CI. - Remove the old application-generated.cpp file from the agl-vcar examples directory to avoid confusion. - Update the testFilter01pass.canreplay CAN data file used for the Filter_Test_01/Step_2 test to use the non-FD version of the 0x3D9 CAN message that matches the agl-vcar definition. A new 0x3DA message that is a FD copy of 0x3D9 has been added to the agl-vcar signals.json to allow testing CAN FD messaging, and a new testFilter01pass-FD.canreplay data file has been added that can potentially be used for doing so. Bug-AGL: SPEC-3603 Signed-off-by: Scott Murray Change-Id: I24c960ca33aaf122ac83a2583cb2df0cd6dbd9e3 --- test/afb-test/fixtures/testFilter01pass-FD.canreplay | 8 ++++++++ test/afb-test/fixtures/testFilter01pass.canreplay | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 test/afb-test/fixtures/testFilter01pass-FD.canreplay (limited to 'test/afb-test/fixtures') diff --git a/test/afb-test/fixtures/testFilter01pass-FD.canreplay b/test/afb-test/fixtures/testFilter01pass-FD.canreplay new file mode 100644 index 00000000..dd9772b9 --- /dev/null +++ b/test/afb-test/fixtures/testFilter01pass-FD.canreplay @@ -0,0 +1,8 @@ +(1520951000.000000) can0 3DA##000000050000000 +(1520951000.000000) can0 3DA##000000074000000 +(1520951000.000000) can0 3DA##000000320000000 +(1520951000.000000) can0 3DA##000000194000000 +(1520951000.000000) can0 3DA##000000078000000 +(1520951000.000000) can0 3DA##000000190000000 +(1520951000.000000) can0 3DA##000000090000000 +(1520951001.100000) can0 3DA##000000080000000 diff --git a/test/afb-test/fixtures/testFilter01pass.canreplay b/test/afb-test/fixtures/testFilter01pass.canreplay index 2f6cd861..dfb6b14e 100644 --- a/test/afb-test/fixtures/testFilter01pass.canreplay +++ b/test/afb-test/fixtures/testFilter01pass.canreplay @@ -1,2 +1,8 @@ -(1520951000.000000) can0 3D9##000520090000000 -(1520951001.100000) can0 3D9##000410080000000 +(1520951000.000000) can0 3D9#0000005000000000 +(1520951000.100000) can0 3D9#0000007400000000 +(1520951000.200000) can0 3D9#0000032000000000 +(1520951000.300000) can0 3D9#0000019400000000 +(1520951000.400000) can0 3D9#0000007800000000 +(1520951000.500000) can0 3D9#0000019000000000 +(1520951000.600000) can0 3D9#0000009000000000 +(1520951000.700000) can0 3D9#0000008000000000 -- cgit 1.2.3-korg