Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactored transport/raw/tests (again) to more cleanly handle access to private members of TCPBase #33305

Closed
wants to merge 4 commits into from
Closed

Refactored transport/raw/tests (again) to more cleanly handle access to private members of TCPBase #33305

wants to merge 4 commits into from

Conversation

feasel0
Copy link
Contributor

@feasel0 feasel0 commented May 4, 2024

TestTCP requires access to private members of TCPBase. Previously this was done by friending TCPTest and then putting entire test functions into that class.

As suggested by #33269, I've isolated the 3 operations that require private access and moved them to an accessor class TCPBaseTestAccess in a separate header file that may be used by any future test that also requires this access.

TCPBase now friends TCPBaseTestAccess instead of the less-clearly-named chip::Transport::TCPTest, and thus many of the references to the name TCPTest are now gone. Once src/inet/tests/TestInetLayer.cpp has been refactored to use a new TestAccess class, the similarly named chip::Inet::TCPTest can be removed from src/inet/TCPEndPoint.h, the last place that references that name.

TestUDP.cpp was also refactored so as to match the way TestTCP.cpp defines its fixtures, since the two unit tests are very similar in structure.

@github-actions GitHub Actions
Copy link

github-actions bot commented May 4, 2024 •
edited
Loading

PR #33305: Size comparison from 062e063 to d258ece

Decreases (2 builds for efr32)
platform target config section 062e063 d258ece change % change
efr32 lock-app BRD4338a (read/write) 962060 962052 -8 -0.0
.text 700184 700176 -8 -0.0
window-app BRD4187C (read/write) 1137520 1137512 -8 -0.0
.text 969556 969548 -8 -0.0
Full report (71 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, qpg, stm32, telink)
platform target config section 062e063 d258ece change % change
bl602 lighting-app bl602 (read/write) 1444358 1444358 0 0.0
.bss 85744 85744 0 0.0
.data 9512 9512 0 0.0
.rodata 159200 159200 0 0.0
.text 1109240 1109240 0 0.0
bl602+mfd (read/write) 1458782 1458782 0 0.0
.bss 85912 85912 0 0.0
.data 9488 9488 0 0.0
.rodata 158160 158160 0 0.0
.text 1124558 1124558 0 0.0
bl602+rpc (read/write) 1492006 1492006 0 0.0
.bss 93784 93784 0 0.0
.data 9888 9888 0 0.0
.rodata 166768 166768 0 0.0
.text 1140886 1140886 0 0.0
bl702 lighting-app bl702 (read only) 3478 3478 0 0.0
(read/write) 1210047 1210047 0 0.0
.bss 11185 11185 0 0.0
.data 3704 3704 0 0.0
.rodata 108796 108796 0 0.0
.text 979384 979384 0 0.0
bl702+mfd (read only) 3478 3478 0 0.0
(read/write) 1220887 1220887 0 0.0
.bss 11361 11361 0 0.0
.data 3688 3688 0 0.0
.rodata 107736 107736 0 0.0
.text 991138 991138 0 0.0
bl702+rpc (read only) 3478 3478 0 0.0
(read/write) 1301535 1301535 0 0.0
.bss 19669 19669 0 0.0
.data 4248 4248 0 0.0
.rodata 124168 124168 0 0.0
.text 1054092 1054092 0 0.0
bl706-eth (read/write) 1026469 1026469 0 0.0
.bss 23760 23760 0 0.0
.data 3256 3256 0 0.0
.rodata 101892 101892 0 0.0
.text 769238 769238 0 0.0
bl706-wifi (read/write) 1261922 1261922 0 0.0
.bss 10645 10645 0 0.0
.data 3704 3704 0 0.0
.rodata 122884 122884 0 0.0
.text 1001916 1001916 0 0.0
bl702l lighting-app bl702l (read only) 512 512 0 0.0
(read/write) 1179388 1179388 0 0.0
.bss 16396 16396 0 0.0
.data 5072 5072 0 0.0
.rodata 102800 102800 0 0.0
.text 972238 972238 0 0.0
bl702l+mfd (read/write) 1191296 1191296 0 0.0
.bss 16572 16572 0 0.0
.data 5048 5048 0 0.0
.rodata 101740 101740 0 0.0
.text 984560 984560 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 (read only) 798356 798356 0 0.0
(read/write) 177612 177612 0 0.0
.bss 99556 99556 0 0.0
.data 3588 3588 0 0.0
.rodata 84924 84924 0 0.0
.text 713168 713168 0 0.0
lock-ftd LP_EM_CC1354P10_6 (read only) 813648 813648 0 0.0
(read/write) 188100 188100 0 0.0
.bss 110044 110044 0 0.0
.data 3588 3588 0 0.0
.rodata 78552 78552 0 0.0
.text 734832 734832 0 0.0
lock-mtd LP_EM_CC1354P10_6 (read only) 802932 802932 0 0.0
(read/write) 182220 182220 0 0.0
.bss 104164 104164 0 0.0
.data 3588 3588 0 0.0
.rodata 105828 105828 0 0.0
.text 696840 696840 0 0.0
pump-app LP_EM_CC1354P10_6 (read only) 755212 755212 0 0.0
(read/write) 176588 176588 0 0.0
.bss 98296 98296 0 0.0
.data 3580 3580 0 0.0
.rodata 80580 80580 0 0.0
.text 674368 674368 0 0.0
pump-controller-app LP_EM_CC1354P10_6 (read only) 740900 740900 0 0.0
(read/write) 176796 176796 0 0.0
.bss 98520 98520 0 0.0
.data 3572 3572 0 0.0
.rodata 76364 76364 0 0.0
.text 664272 664272 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL (read only) 605438 605438 0 0.0
(read/write) 209572 209572 0 0.0
.bss 202796 202796 0 0.0
.data 1652 1652 0 0.0
.rodata 89574 89574 0 0.0
.text 513740 513740 0 0.0
lock CC3235SF_LAUNCHXL (read only) 651326 651326 0 0.0
(read/write) 209836 209836 0 0.0
.bss 203200 203200 0 0.0
.data 1516 1516 0 0.0
.rodata 110334 110334 0 0.0
.text 538872 538872 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 571551 571551 0 0.0
.app_xip_area 461437 461437 0 0.0
.bss 64932 64932 0 0.0
.data 760 760 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 553647 553647 0 0.0
.app_xip_area 438861 438861 0 0.0
.bss 69596 69596 0 0.0
.data 768 768 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 574279 574279 0 0.0
.app_xip_area 465661 465661 0 0.0
.bss 63476 63476 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
switch cyw930739m2evb_01 (read/write) 566855 566855 0 0.0
.app_xip_area 455053 455053 0 0.0
.bss 66580 66580 0 0.0
.data 800 800 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4187C (read/write) 1070820 1070820 0 0.0
.bss 180008 180008 0 0.0
.data 3432 3432 0 0.0
.text 887360 887360 0 0.0
lock-app BRD4338a (read/write) 962060 962052 -8 -0.0
.bss 213064 213064 0 0.0
.data 29448 29448 0 0.0
.text 700184 700176 -8 -0.0
window-app BRD4187C (read/write) 1137520 1137512 -8 -0.0
.bss 164608 164608 0 0.0
.data 3336 3336 0 0.0
.text 969556 969548 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1214950 1214950 0 0.0
(read/write) 1751296 1751296 0 0.0
.dram0.bss 74592 74592 0 0.0
.dram0.data 13652 13652 0 0.0
.flash.rodata 253520 253520 0 0.0
.flash.text 1214950 1214950 0 0.0
.iram0.text 75570 75570 0 0.0
m5stack (read only) 1256655 1256655 0 0.0
(read/write) 537708 537708 0 0.0
.dram0.bss 81344 81344 0 0.0
.dram0.data 35196 35196 0 0.0
.flash.rodata 285248 285248 0 0.0
.flash.text 1250491 1250491 0 0.0
.iram0.text 125403 125403 0 0.0
linux air-purifier-app debug (read only) 2713421 2713421 0 0.0
(read/write) 132432 132432 0 0.0
.bss 47720 47720 0 0.0
.data 2272 2272 0 0.0
.data.rel.ro 76440 76440 0 0.0
.dynamic 608 608 0 0.0
.got 4576 4576 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 186352 186352 0 0.0
.text 2344133 2344133 0 0.0
all-clusters-app debug (read only) 6026009 6026009 0 0.0
(read/write) 483976 483976 0 0.0
.bss 136000 136000 0 0.0
.data 4560 4560 0 0.0
.data.rel.ro 335960 335960 0 0.0
.dynamic 624 624 0 0.0
.got 5344 5344 0 0.0
.init 27 27 0 0.0
.init_array 1440 1440 0 0.0
.rodata 353072 353072 0 0.0
.text 5234291 5234291 0 0.0
all-clusters-minimal-app debug (read only) 5309529 5309529 0 0.0
(read/write) 239928 239928 0 0.0
.bss 128864 128864 0 0.0
.data 4464 4464 0 0.0
.data.rel.ro 99496 99496 0 0.0
.dynamic 624 624 0 0.0
.got 5264 5264 0 0.0
.init 27 27 0 0.0
.init_array 1168 1168 0 0.0
.rodata 291978 291978 0 0.0
.text 4777715 4777715 0 0.0
bridge-app debug (read only) 4700153 4700153 0 0.0
(read/write) 220840 220840 0 0.0
.bss 119392 119392 0 0.0
.data 6240 6240 0 0.0
.data.rel.ro 88464 88464 0 0.0
.dynamic 624 624 0 0.0
.got 5232 5232 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 232426 232426 0 0.0
.text 4242307 4242307 0 0.0
chip-tool debug (read only) 1214514 1214514 0 0.0
(read/write) 524288 524288 0 0.0
.bss 95032 95032 0 0.0
.data 5122 5122 0 0.0
.data.rel.ro 416904 416904 0 0.0
.dynamic 624 624 0 0.0
.got 5736 5736 0 0.0
.init 27 27 0 0.0
.init_array 832 832 0 0.0
.rodata 453081 453081 0 0.0
.text 10981427 10981427 0 0.0
chip-tool-ipv6only arm64 (read only) 11473604 11473604 0 0.0
(read/write) 591600 591600 0 0.0
.bss 104008 104008 0 0.0
.data 4520 4520 0 0.0
.data.rel.ro 457000 457000 0 0.0
.dynamic 512 512 0 0.0
.got 17232 17232 0 0.0
.init 24 24 0 0.0
.init_array 280 280 0 0.0
.rodata 357476 357476 0 0.0
.text 1023151 1023151 0 0.0
lighting-app debug+rpc+ui (read only) 5623745 5623745 0 0.0
(read/write) 229640 229640 0 0.0
.bss 120336 120336 0 0.0
.data 4896 4896 0 0.0
.data.rel.ro 96880 96880 0 0.0
.dynamic 672 672 0 0.0
.got 5864 5864 0 0.0
.init 27 27 0 0.0
.init_array 976 976 0 0.0
.rodata 356276 356276 0 0.0
.text 5015619 5015619 0 0.0
lock-app debug (read only) 4767193 4767193 0 0.0
(read/write) 208032 208032 0 0.0
.bss 114664 114664 0 0.0
.data 4192 4192 0 0.0
.data.rel.ro 82472 82472 0 0.0
.dynamic 624 624 0 0.0
.got 5184 5184 0 0.0
.init 27 27 0 0.0
.init_array 880 880 0 0.0
.rodata 258346 258346 0 0.0
.text 4292499 4292499 0 0.0
ota-provider-app debug (read only) 4375033 4375033 0 0.0
(read/write) 196504 196504 0 0.0
.bss 114464 114464 0 0.0
.data 4368 4368 0 0.0
.data.rel.ro 71712 71712 0 0.0
.dynamic 624 624 0 0.0
.got 4552 4552 0 0.0
.init 27 27 0 0.0
.init_array 752 752 0 0.0
.rodata 211178 211178 0 0.0
.text 3966163 3966163 0 0.0
ota-requestor-app debug (read only) 4505737 4505737 0 0.0
(read/write) 200872 200872 0 0.0
.bss 115360 115360 0 0.0
.data 4768 4768 0 0.0
.data.rel.ro 74816 74816 0 0.0
.dynamic 624 624 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 217258 217258 0 0.0
.text 4086243 4086243 0 0.0
shell debug (read only) 2997553 2997553 0 0.0
(read/write) 159408 159408 0 0.0
.bss 63504 63504 0 0.0
.data 1424 1424 0 0.0
.data.rel.ro 88640 88640 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 1112 1112 0 0.0
.rodata 189984 189984 0 0.0
.text 2628610 2628610 0 0.0
thermostat-no-ble arm64 (read only) 4493948 4493948 0 0.0
(read/write) 248008 248008 0 0.0
.bss 122984 122984 0 0.0
.data 3408 3408 0 0.0
.data.rel.ro 105912 105912 0 0.0
.dynamic 512 512 0 0.0
.got 8960 8960 0 0.0
.init 24 24 0 0.0
.init_array 448 448 0 0.0
.rodata 161876 161876 0 0.0
.text 3990872 3990872 0 0.0
tv-app debug (read only) 5823329 5823329 0 0.0
(read/write) 355224 355224 0 0.0
.bss 245136 245136 0 0.0
.data 6560 6560 0 0.0
.data.rel.ro 96248 96248 0 0.0
.dynamic 624 624 0 0.0
.got 5464 5464 0 0.0
.init 27 27 0 0.0
.init_array 1184 1184 0 0.0
.rodata 296554 296554 0 0.0
.text 5280643 5280643 0 0.0
tv-casting-app debug (read only) 9983769 9983769 0 0.0
(read/write) 345632 345632 0 0.0
.bss 159448 159448 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 176208 176208 0 0.0
.dynamic 624 624 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 1216 1216 0 0.0
.rodata 386648 386648 0 0.0
.text 9126275 9126275 0 0.0
mbed lock-app-release cy8cproto_062_4343w (read only) 6224 6224 0 0.0
(read/write) 2536744 2536744 0 0.0
.bss 220768 220768 0 0.0
.data 5216 5216 0 0.0
.text 1499428 1499428 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1060320 1060320 0 0.0
bss 139123 139123 0 0.0
rodata 101552 101552 0 0.0
text 772428 772428 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1237552 1237552 0 0.0
bss 137419 137419 0 0.0
rodata 151384 151384 0 0.0
text 798724 798724 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1008112 1008112 0 0.0
bss 138029 138029 0 0.0
rodata 88808 88808 0 0.0
text 733980 733980 0 0.0
nxp contact k32w0+release (read only) 576508 576508 0 0.0
(read/write) 83164 83164 0 0.0
.bss 67880 67880 0 0.0
.data 2188 2188 0 0.0
.text 575972 575972 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 704004 704004 0 0.0
.bss 71224 71224 0 0.0
.data 2864 2864 0 0.0
.text 590536 590536 0 0.0
light k32w0+release (read only) 610568 610568 0 0.0
(read/write) 82624 82624 0 0.0
.bss 67320 67320 0 0.0
.data 2208 2208 0 0.0
.text 610032 610032 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 795848 795848 0 0.0
.bss 80760 80760 0 0.0
.data 2064 2064 0 0.0
.text 673656 673656 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 826288 826288 0 0.0
(read/write) 1826836 1826836 0 0.0
.bss 204308 204308 0 0.0
.data 2744 2744 0 0.0
.text 1611396 1611396 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 829384 829384 0 0.0
(read/write) 1748108 1748108 0 0.0
.bss 201236 201236 0 0.0
.data 2720 2720 0 0.0
.text 1535764 1535764 0 0.0
light cy8ckit_062s2_43012 (read only) 836104 836104 0 0.0
(read/write) 1666572 1666572 0 0.0
.bss 194700 194700 0 0.0
.data 2536 2536 0 0.0
.text 1460948 1460948 0 0.0
lock cy8ckit_062s2_43012 (read only) 809040 809040 0 0.0
(read/write) 1695220 1695220 0 0.0
.bss 221780 221780 0 0.0
.data 2520 2520 0 0.0
.text 1462532 1462532 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1134164 1134164 0 0.0
.bss 102644 102644 0 0.0
.data 856 856 0 0.0
.text 646544 646544 0 0.0
lock-app qpg6105+debug (read/write) 1094012 1094012 0 0.0
.bss 97316 97316 0 0.0
.data 860 860 0 0.0
.text 606396 606396 0 0.0
stm32 light STM32WB5MM-DK (read/write) 605817 605817 0 0.0
.bss 128492 128492 0 0.0
.data 688 688 0 0.0
.rodata 80516 80516 0 0.0
.text 386376 386376 0 0.0
telink air-quality-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 834066 834066 0 0.0
bss 49876 49876 0 0.0
text 624732 624732 0 0.0
all-clusters-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 1096456 1096456 0 0.0
bss 101544 101544 0 0.0
text 797450 797450 0 0.0
all-clusters-minimal-app tlsr9528a (read only) 47960 47960 0 0.0
(read/write) 1058924 1058924 0 0.0
bss 110040 110040 0 0.0
text 772770 772770 0 0.0
bridge-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 914564 914564 0 0.0
bss 92796 92796 0 0.0
text 656372 656372 0 0.0
contact-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 836418 836418 0 0.0
bss 49920 49920 0 0.0
text 627152 627152 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a (read only) 51584 51584 0 0.0
(read/write) 937240 937240 0 0.0
bss 77532 77532 0 0.0
text 703806 703806 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d (read only) 29122 29122 0 0.0
(read/write) 1090956 1090956 0 0.0
bss 99888 99888 0 0.0
text 794358 794358 0 0.0
lock-app-dfu tlsr9528a (read only) 51584 51584 0 0.0
(read/write) 911536 911536 0 0.0
bss 69200 69200 0 0.0
text 660550 660550 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 933368 933368 0 0.0
bss 92500 92500 0 0.0
text 675358 675358 0 0.0
pump-app tlsr9258a (read only) 52490 52490 0 0.0
(read/write) 833984 833984 0 0.0
bss 58164 58164 0 0.0
text 624158 624158 0 0.0
pump-controller-app tlsr9518adk80d (read only) 31872 31872 0 0.0
(read/write) 800096 800096 0 0.0
bss 56092 56092 0 0.0
text 599060 599060 0 0.0
shell tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 676064 676064 0 0.0
bss 73412 73412 0 0.0
text 461748 461748 0 0.0
smoke_co_alarm-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 844286 844286 0 0.0
bss 51548 51548 0 0.0
text 633820 633820 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d (read only) 32220 32220 0 0.0
(read/write) 858937 858937 0 0.0
bss 59716 59716 0 0.0
text 642600 642600 0 0.0
thermostat tlsr9518adk80d (read only) 31872 31872 0 0.0
(read/write) 825660 825660 0 0.0
bss 56424 56424 0 0.0
text 618622 618622 0 0.0
window-covering tlsr9258a (read only) 52490 52490 0 0.0
(read/write) 838680 838680 0 0.0
bss 58380 58380 0 0.0
text 626426 626426 0 0.0

@feasel0 feasel0 closed this May 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
inet transport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@feasel0