ceedling 1.2.2 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (390) hide show
  1. checksums.yaml +4 -4
  2. data/GIT_COMMIT_SHA +1 -1
  3. data/README.md +1 -1
  4. data/assets/fixtures/tests_with_partials_coverage/src/private_macro.c +7 -0
  5. data/assets/fixtures/tests_with_partials_coverage/src/private_macro.h +5 -0
  6. data/assets/fixtures/tests_with_partials_coverage/src/tally.c +13 -0
  7. data/assets/fixtures/tests_with_partials_coverage/src/tally.h +4 -0
  8. data/assets/fixtures/tests_with_partials_coverage/test/test_private_macro.c +10 -0
  9. data/assets/fixtures/tests_with_partials_coverage/test/test_tally.c +9 -0
  10. data/docs/BreakingChanges.md +16 -0
  11. data/docs/Changelog.md +71 -0
  12. data/docs/KnownIssues.md +91 -4
  13. data/examples/wondrous_forest/README.md +29 -1
  14. data/examples/wondrous_forest/src/ForestUnits.h +23 -0
  15. data/examples/wondrous_forest/src/RainGauge.c +59 -0
  16. data/examples/wondrous_forest/src/RainGauge.h +39 -0
  17. data/examples/wondrous_forest/src/RainTipIsr.c +17 -0
  18. data/examples/wondrous_forest/src/RainTipIsr.h +14 -0
  19. data/examples/wondrous_forest/test/TestRainGauge.c +126 -0
  20. data/lib/ceedling/c_extractor/README.md +15 -7
  21. data/lib/ceedling/c_extractor/c_extractor.rb +25 -14
  22. data/lib/ceedling/c_extractor/c_extractor_code_text.rb +84 -54
  23. data/lib/ceedling/c_extractor/c_extractor_constants.rb +18 -7
  24. data/lib/ceedling/c_extractor/c_extractor_declarations.rb +319 -283
  25. data/lib/ceedling/c_extractor/c_extractor_declarator.rb +285 -0
  26. data/lib/ceedling/c_extractor/c_extractor_defined_type.rb +111 -0
  27. data/lib/ceedling/c_extractor/c_extractor_definitions.rb +174 -121
  28. data/lib/ceedling/c_extractor/c_extractor_functions.rb +191 -162
  29. data/lib/ceedling/c_extractor/c_extractor_preprocessing.rb +46 -55
  30. data/lib/ceedling/c_extractor/c_extractor_statement.rb +30 -0
  31. data/lib/ceedling/c_extractor/c_extractor_types.rb +63 -41
  32. data/lib/ceedling/c_extractor/c_module_edits.rb +48 -0
  33. data/lib/ceedling/c_identifier.rb +21 -0
  34. data/lib/ceedling/ceedling.h +8 -0
  35. data/lib/ceedling/config/configurator.rb +4 -3
  36. data/lib/ceedling/config/configurator_builder.rb +17 -0
  37. data/lib/ceedling/config/configurator_setup.rb +29 -5
  38. data/lib/ceedling/constants.rb +5 -1
  39. data/lib/ceedling/defaults.rb +31 -1
  40. data/lib/ceedling/dependencies/CACHE_SCHEMA.md +118 -0
  41. data/lib/ceedling/dependencies/README.md +1 -1
  42. data/lib/ceedling/dependencies/dependency_cache_store.rb +30 -25
  43. data/lib/ceedling/dependencies/dependency_tracker.rb +9 -3
  44. data/lib/ceedling/dependencies/dependinator.rb +13 -1
  45. data/lib/ceedling/diagnostics/DOCTOR.md +142 -0
  46. data/lib/ceedling/diagnostics/README.md +5 -0
  47. data/lib/ceedling/diagnostics/build_step_doctor.rb +110 -0
  48. data/lib/ceedling/diagnostics/duplicate_symbol_specialist.rb +108 -0
  49. data/lib/ceedling/diagnostics/guidance_phrases.rb +30 -0
  50. data/lib/ceedling/diagnostics/header_collision_guidance.rb +56 -0
  51. data/lib/ceedling/diagnostics/header_collision_specialist.rb +152 -0
  52. data/lib/ceedling/diagnostics/include_depth_specialist.rb +132 -0
  53. data/lib/ceedling/diagnostics/missing_symbol_specialist.rb +111 -0
  54. data/lib/ceedling/diagnostics/partial_name_specialist.rb +134 -0
  55. data/lib/ceedling/diagnostics/toolchain_output.rb +44 -0
  56. data/lib/ceedling/filesystem/PATH_HANDLING.md +83 -27
  57. data/lib/ceedling/filesystem/README.md +6 -1
  58. data/lib/ceedling/filesystem/build_roots.rb +105 -0
  59. data/lib/ceedling/filesystem/build_subpath.rb +110 -25
  60. data/lib/ceedling/filesystem/file_finder.rb +76 -110
  61. data/lib/ceedling/filesystem/file_finder_helper.rb +33 -11
  62. data/lib/ceedling/filesystem/file_path_utils.rb +113 -91
  63. data/lib/ceedling/filesystem/file_wrapper.rb +105 -28
  64. data/lib/ceedling/filesystem/path_matcher.rb +21 -0
  65. data/lib/ceedling/filesystem/test_build_layout.rb +114 -0
  66. data/lib/ceedling/filesystem/win_long_paths.rb +153 -0
  67. data/lib/ceedling/filesystem/win_path_limit.rb +83 -0
  68. data/lib/ceedling/filesystem/win_path_prober.rb +52 -0
  69. data/lib/ceedling/generators/generator.rb +27 -64
  70. data/lib/ceedling/generators/generator_helper.rb +0 -44
  71. data/lib/ceedling/generators/generator_mocks.rb +5 -0
  72. data/lib/ceedling/generators/generator_partials.rb +305 -243
  73. data/lib/ceedling/generators/generator_test_runner.rb +5 -8
  74. data/lib/ceedling/generators/partial_header_writer.rb +95 -0
  75. data/lib/ceedling/generators/partial_source_writer.rb +137 -0
  76. data/lib/ceedling/includes/header_search.rb +225 -0
  77. data/lib/ceedling/includes/include_factory.rb +9 -12
  78. data/lib/ceedling/includes/include_pathinator.rb +53 -31
  79. data/lib/ceedling/includes/includes.rb +149 -37
  80. data/lib/ceedling/objects.yml +89 -4
  81. data/lib/ceedling/partials/README.md +110 -16
  82. data/lib/ceedling/partials/carry_plan.rb +71 -0
  83. data/lib/ceedling/partials/definition_head.rb +74 -0
  84. data/lib/ceedling/partials/include_groups.rb +37 -0
  85. data/lib/ceedling/partials/interface_extras.rb +25 -0
  86. data/lib/ceedling/partials/partializer.rb +599 -120
  87. data/lib/ceedling/partials/partializer_config.rb +5 -0
  88. data/lib/ceedling/partials/partializer_helper.rb +851 -145
  89. data/lib/ceedling/partials/partializer_reconciler.rb +174 -0
  90. data/lib/ceedling/partials/partializer_utils.rb +89 -109
  91. data/lib/ceedling/partials/partials.rb +153 -10
  92. data/lib/ceedling/partials/type_macros.rb +126 -0
  93. data/lib/ceedling/preprocess/README.md +43 -33
  94. data/lib/ceedling/preprocess/preprocessinator.rb +100 -186
  95. data/lib/ceedling/preprocess/preprocessinator_code_finder.rb +65 -72
  96. data/lib/ceedling/preprocess/preprocessinator_file_assembler.rb +31 -75
  97. data/lib/ceedling/preprocess/preprocessinator_reconstructor.rb +51 -14
  98. data/lib/ceedling/setupinator.rb +16 -3
  99. data/lib/ceedling/test_invoker/HEADER_COLLISIONS.md +21 -7
  100. data/lib/ceedling/test_invoker/PIPELINE.md +57 -16
  101. data/lib/ceedling/test_invoker/README.md +1 -1
  102. data/lib/ceedling/test_invoker/derived_search_path_notices.rb +45 -0
  103. data/lib/ceedling/test_invoker/mock_locator.rb +116 -9
  104. data/lib/ceedling/test_invoker/partial_files_preprocessinator.rb +181 -0
  105. data/lib/ceedling/test_invoker/partials_manager.rb +265 -308
  106. data/lib/ceedling/test_invoker/standin_headerinator.rb +8 -15
  107. data/lib/ceedling/test_invoker/test_bare_includes_extractinator.rb +26 -3
  108. data/lib/ceedling/test_invoker/test_build_executor.rb +338 -198
  109. data/lib/ceedling/test_invoker/test_build_planner.rb +13 -19
  110. data/lib/ceedling/test_invoker/test_build_setup.rb +26 -6
  111. data/lib/ceedling/test_invoker/test_build_validations.rb +23 -20
  112. data/lib/ceedling/test_invoker/test_derived_search_paths.rb +189 -0
  113. data/lib/ceedling/test_invoker/test_file_preprocessinator.rb +1 -2
  114. data/lib/ceedling/test_invoker/test_includes_reconcilinator.rb +1 -1
  115. data/lib/ceedling/test_invoker/test_invoker_types.rb +28 -20
  116. data/lib/ceedling/test_invoker/test_pipeline_helpers.rb +5 -3
  117. data/lib/ceedling/test_invoker/test_pipeline_manager.rb +25 -8
  118. data/lib/ceedling/test_invoker/test_runner_generatinator.rb +31 -3
  119. data/lib/ceedling/test_invoker/test_search_paths.rb +30 -8
  120. data/lib/ceedling/test_invoker/test_substitutions.rb +72 -0
  121. data/lib/ceedling/tools/shell_quoting.rb +45 -0
  122. data/lib/ceedling/tools/tool_quoting.rb +79 -0
  123. data/lib/ceedling/{tool_validator.rb → tools/tool_validator.rb} +18 -7
  124. data/lib/version.rb +1 -1
  125. data/plugins/bullseye/bullseye.rake +1 -3
  126. data/plugins/bullseye/lib/bullseye.rb +15 -2
  127. data/plugins/command_hooks/lib/command_hooks.rb +1 -1
  128. data/plugins/fff/lib/fff.rb +42 -15
  129. data/plugins/fff/lib/fff_mock_generator.rb +12 -9
  130. data/plugins/fff/spec/fff_cmock_wrapper_spec.rb +134 -0
  131. data/plugins/fff/spec/fff_mock_header_generator_spec.rb +9 -0
  132. data/plugins/fff/spec/fff_mock_source_generator_spec.rb +20 -0
  133. data/plugins/gcov/lib/console_reportinator.rb +25 -19
  134. data/plugins/gcov/lib/reportgenerator_reportinator.rb +2 -1
  135. data/site-local/404.html +2 -2
  136. data/site-local/assets/javascripts/{bundle.c21346df.min.js → bundle.a5f9d56c.min.js} +1 -1
  137. data/site-local/assets/javascripts/{bundle.c21346df.min.js.map → bundle.a5f9d56c.min.js.map} +2 -2
  138. data/site-local/configuration/environment-vars.html +2 -2
  139. data/site-local/configuration/global-collections.html +3 -3
  140. data/site-local/configuration/index.html +2 -2
  141. data/site-local/configuration/loading.html +2 -2
  142. data/site-local/configuration/mixins.html +2 -2
  143. data/site-local/configuration/parallel-builds.html +2 -2
  144. data/site-local/configuration/project-file.html +2 -2
  145. data/site-local/configuration/reference/cexception.html +2 -2
  146. data/site-local/configuration/reference/cmock.html +5 -2
  147. data/site-local/configuration/reference/defines.html +2 -2
  148. data/site-local/configuration/reference/environment.html +2 -2
  149. data/site-local/configuration/reference/extension.html +2 -2
  150. data/site-local/configuration/reference/files.html +56 -9
  151. data/site-local/configuration/reference/flags.html +2 -2
  152. data/site-local/configuration/reference/index.html +2 -2
  153. data/site-local/configuration/reference/libraries.html +2 -2
  154. data/site-local/configuration/reference/mixins.html +2 -2
  155. data/site-local/configuration/reference/partials.html +84 -2
  156. data/site-local/configuration/reference/paths.html +7 -2
  157. data/site-local/configuration/reference/plugins.html +2 -2
  158. data/site-local/configuration/reference/project.html +247 -5
  159. data/site-local/configuration/reference/release-build.html +2 -2
  160. data/site-local/configuration/reference/test-build.html +2 -2
  161. data/site-local/configuration/reference/test-runner.html +2 -2
  162. data/site-local/configuration/reference/tools.html +49 -4
  163. data/site-local/configuration/reference/unity.html +2 -2
  164. data/site-local/configuration/which-ceedling.html +2 -2
  165. data/site-local/development/index.html +2 -2
  166. data/site-local/development/plugins/configuration.html +2 -2
  167. data/site-local/development/plugins/index.html +2 -2
  168. data/site-local/development/plugins/plugin-subclass.html +5 -4
  169. data/site-local/development/plugins/rake-tasks.html +2 -2
  170. data/site-local/development/releases.html +2 -2
  171. data/site-local/development/workflow.html +2 -2
  172. data/site-local/getting-started/builds.html +2 -2
  173. data/site-local/getting-started/command-line.html +2 -2
  174. data/site-local/getting-started/example-projects/cipher-quest.html +2 -2
  175. data/site-local/getting-started/example-projects/index.html +2 -2
  176. data/site-local/getting-started/example-projects/temp-sensor.html +2 -2
  177. data/site-local/getting-started/example-projects/wondrous-forest.html +10 -2
  178. data/site-local/getting-started/index.html +2 -2
  179. data/site-local/getting-started/installation.html +2 -2
  180. data/site-local/getting-started/quick-start.html +2 -2
  181. data/site-local/help.html +2 -2
  182. data/site-local/index.html +2 -2
  183. data/site-local/overview/build-system.html +2 -2
  184. data/site-local/overview/index.html +2 -2
  185. data/site-local/overview/test-environments.html +2 -2
  186. data/site-local/overview/tools-and-frameworks.html +2 -2
  187. data/site-local/plugins/beep.html +2 -2
  188. data/site-local/plugins/bullseye/index.html +45 -38
  189. data/site-local/plugins/bullseye/licensing.html +2 -2
  190. data/site-local/plugins/command-hooks.html +4 -4
  191. data/site-local/plugins/compile-commands-json-db.html +2 -2
  192. data/site-local/plugins/cppcheck.html +2 -2
  193. data/site-local/plugins/dependencies.html +2 -2
  194. data/site-local/plugins/fff.html +16 -2
  195. data/site-local/plugins/gcov/examples.html +2 -2
  196. data/site-local/plugins/gcov/gcovr.html +8 -2
  197. data/site-local/plugins/gcov/index.html +2 -2
  198. data/site-local/plugins/gcov/overview.html +2 -2
  199. data/site-local/plugins/gcov/reportgenerator.html +18 -14
  200. data/site-local/plugins/gcov/reporting.html +2 -2
  201. data/site-local/plugins/gcov/setup.html +2 -2
  202. data/site-local/plugins/gcov/tool-versions.html +2 -2
  203. data/site-local/plugins/gcov/troubleshooting.html +2 -2
  204. data/site-local/plugins/index.html +2 -2
  205. data/site-local/plugins/module-generator.html +2 -2
  206. data/site-local/plugins/report-build-warnings-log.html +2 -2
  207. data/site-local/plugins/report-tests-gtestlike-stdout.html +2 -2
  208. data/site-local/plugins/report-tests-ide-stdout.html +2 -2
  209. data/site-local/plugins/report-tests-log-factory.html +2 -2
  210. data/site-local/plugins/report-tests-pretty-stdout.html +2 -2
  211. data/site-local/plugins/report-tests-raw-output-log.html +2 -2
  212. data/site-local/plugins/report-tests-teamcity-stdout.html +2 -2
  213. data/site-local/plugins/sanitize.html +2 -2
  214. data/site-local/plugins/valgrind.html +2 -2
  215. data/site-local/project/index.html +2 -2
  216. data/site-local/project/release-history.html +2 -2
  217. data/site-local/project/sbom.html +2 -2
  218. data/site-local/project/upgrade.html +2 -2
  219. data/site-local/reference/build-directives.html +2 -2
  220. data/site-local/reference/command-line.html +2 -2
  221. data/site-local/reference/environment-vars.html +2 -2
  222. data/site-local/reference/gcov-plugin.html +2 -2
  223. data/site-local/reference/global-collections.html +12 -12
  224. data/site-local/reference/index.html +2 -2
  225. data/site-local/reference/partials-macros.html +47 -2
  226. data/site-local/reference/project-configuration.html +2 -2
  227. data/site-local/sitemap.xml.gz +0 -0
  228. data/site-local/snapshot/examples/cipher_quest/index.html +2 -2
  229. data/site-local/snapshot/examples/temp_sensor/index.html +2 -2
  230. data/site-local/snapshot/examples/wondrous_forest/index.html +72 -15
  231. data/site-local/testing-guide/build-directives.html +2 -2
  232. data/site-local/testing-guide/conventions.html +67 -22
  233. data/site-local/testing-guide/frameworks.html +2 -2
  234. data/site-local/testing-guide/index.html +2 -2
  235. data/site-local/testing-guide/partials/configuration.html +31 -4
  236. data/site-local/testing-guide/partials/conventions.html +509 -8
  237. data/site-local/testing-guide/partials/directives.html +4 -3
  238. data/site-local/testing-guide/partials/example.html +2 -2
  239. data/site-local/testing-guide/partials/index.html +2 -2
  240. data/site-local/testing-guide/partials/overview.html +30 -12
  241. data/site-local/testing-guide/partials/variables.html +169 -4
  242. data/site-local/testing-guide/test-cases.html +2 -2
  243. data/site-local/testing-guide/test-sample.html +2 -2
  244. data/site-local/testing-guide/test-suite-anatomy.html +2 -2
  245. data/spec/integration/build_step_doctor_spec.rb +270 -0
  246. data/spec/integration/c_extractor_composition_spec.rb +254 -4
  247. data/spec/integration/includes_extraction_spec.rb +27 -14
  248. data/spec/integration/nested_test_artifacts_spec.rb +1 -1
  249. data/spec/integration/partial_files_preprocessing_spec.rb +128 -0
  250. data/spec/integration/partials_carry_spec.rb +520 -0
  251. data/spec/integration/partials_declarations_spec.rb +655 -0
  252. data/spec/integration/partials_fallback_preprocessing_spec.rb +65 -0
  253. data/spec/integration/partials_function_pointers_spec.rb +277 -0
  254. data/spec/integration/partials_header_composition_spec.rb +268 -35
  255. data/spec/integration/partials_macro_decorators_spec.rb +267 -0
  256. data/spec/integration/partials_module_resolution_spec.rb +26 -19
  257. data/spec/integration/partials_symbol_linkage_spec.rb +13 -0
  258. data/spec/integration/path_length_reporting_spec.rb +64 -0
  259. data/spec/integration/path_scenarios_spec.rb +80 -3
  260. data/spec/integration/quote_include_isolator_spec.rb +56 -0
  261. data/spec/integration/test_build_parallel_barrier_spec.rb +1 -1
  262. data/spec/integration/test_includes_extractinator_spec.rb +70 -5
  263. data/spec/integration/test_naming_spec.rb +6 -3
  264. data/spec/integration/test_source_file_checks_spec.rb +5 -3
  265. data/spec/integration/tool_executor_spec.rb +1 -1
  266. data/spec/integration/tool_validator_spec.rb +2 -2
  267. data/spec/integration/win_long_paths_probe_spec.rb +46 -0
  268. data/spec/integration/win_path_limit_spec.rb +53 -0
  269. data/spec/integration/windows_registry_query_tool_spec.rb +41 -0
  270. data/spec/support/integration/configurator_integration_helper.rb +8 -3
  271. data/spec/support/integration/partial_files_harness.rb +181 -0
  272. data/spec/support/integration/partials_generation_integration_helper.rb +237 -141
  273. data/spec/support/integration/path_scenario_harness.rb +4 -2
  274. data/spec/support/integration/spec_integration_helper.rb +8 -3
  275. data/spec/support/integration/test_includes_harness.rb +56 -35
  276. data/spec/support/integration/tool_executor_integration_helper.rb +14 -2
  277. data/spec/system/bullseye_deployment_spec.rb +2 -0
  278. data/spec/system/delta_builds_spec.rb +26 -12
  279. data/spec/system/encoding_stress_spec.rb +4 -4
  280. data/spec/system/example_wondrous_forest_spec.rb +2 -2
  281. data/spec/system/gcov_deployment_spec.rb +2 -0
  282. data/spec/system/header_include_path_validation_spec.rb +4 -4
  283. data/spec/system/header_search_paths_spec.rb +1083 -0
  284. data/spec/system/mock_include_folders_spec.rb +121 -0
  285. data/spec/system/mockable_header_reassembly_spec.rb +184 -0
  286. data/spec/system/partials_carry_spec.rb +581 -0
  287. data/spec/system/partials_delta_builds_spec.rb +280 -0
  288. data/spec/system/partials_function_pointers_spec.rb +106 -0
  289. data/spec/system/partials_macro_decorators_spec.rb +127 -0
  290. data/spec/system/partials_module_disambiguation_spec.rb +125 -0
  291. data/spec/system/path_handling_probes_spec.rb +16 -12
  292. data/spec/system/pinned_thread_count_spec.rb +4 -4
  293. data/spec/system/preprocessing_fallback_conditionals_spec.rb +1 -1
  294. data/spec/system/short_build_paths_spec.rb +87 -0
  295. data/spec/system/sibling_header_collision_spec.rb +30 -6
  296. data/spec/system/support/bullseye_common_test_cases.rb +42 -0
  297. data/spec/system/support/common_test_cases.rb +2 -2
  298. data/spec/system/support/gcov_partials_test_cases.rb +48 -0
  299. data/spec/system/test_build_layout_spec.rb +209 -0
  300. data/spec/system/test_source_file_directive_spec.rb +35 -5
  301. data/spec/units/c_extractor/c_extractor_code_text_spec.rb +67 -10
  302. data/spec/units/c_extractor/c_extractor_declarations_spec.rb +501 -4
  303. data/spec/units/c_extractor/c_extractor_declarator_spec.rb +245 -0
  304. data/spec/units/c_extractor/c_extractor_defined_type_spec.rb +45 -0
  305. data/spec/units/c_extractor/c_extractor_definitions_spec.rb +163 -3
  306. data/spec/units/c_extractor/c_extractor_functions_spec.rb +462 -21
  307. data/spec/units/c_extractor/c_extractor_preprocessing_spec.rb +39 -0
  308. data/spec/units/c_extractor/c_extractor_spec.rb +4 -4
  309. data/spec/units/c_extractor/c_extractor_types_spec.rb +163 -0
  310. data/spec/units/c_identifier_spec.rb +35 -0
  311. data/spec/units/config/configurator_builder_spec.rb +24 -0
  312. data/spec/units/config/configurator_setup_spec.rb +72 -4
  313. data/spec/units/config/configurator_spec.rb +27 -1
  314. data/spec/units/dependencies/dependency_cache_store_spec.rb +68 -3
  315. data/spec/units/dependencies/dependency_tracker_spec.rb +25 -0
  316. data/spec/units/dependencies/dependinator_spec.rb +17 -2
  317. data/spec/units/diagnostics/build_step_doctor_spec.rb +170 -0
  318. data/spec/units/diagnostics/duplicate_symbol_specialist_spec.rb +117 -0
  319. data/spec/units/diagnostics/header_collision_specialist_spec.rb +267 -0
  320. data/spec/units/diagnostics/include_depth_specialist_spec.rb +137 -0
  321. data/spec/units/diagnostics/missing_symbol_specialist_spec.rb +154 -0
  322. data/spec/units/diagnostics/partial_name_specialist_spec.rb +129 -0
  323. data/spec/units/diagnostics/toolchain_output_spec.rb +86 -0
  324. data/spec/units/encodinator_spec.rb +3 -4
  325. data/spec/units/filesystem/build_roots_spec.rb +131 -0
  326. data/spec/units/filesystem/build_subpath_spec.rb +113 -0
  327. data/spec/units/filesystem/file_finder_helper_spec.rb +80 -0
  328. data/spec/units/filesystem/file_finder_spec.rb +242 -58
  329. data/spec/units/filesystem/file_path_utils_spec.rb +251 -118
  330. data/spec/units/filesystem/file_wrapper_spec.rb +191 -6
  331. data/spec/units/filesystem/path_matcher_spec.rb +36 -0
  332. data/spec/units/filesystem/test_build_layout_spec.rb +216 -0
  333. data/spec/units/filesystem/win_long_paths_spec.rb +204 -0
  334. data/spec/units/filesystem/win_path_prober_spec.rb +158 -0
  335. data/spec/units/generators/generator_helper_spec.rb +0 -60
  336. data/spec/units/generators/generator_mocks_spec.rb +13 -0
  337. data/spec/units/generators/generator_partials_spec.rb +656 -55
  338. data/spec/units/generators/generator_spec.rb +26 -0
  339. data/spec/units/generators/generator_test_runner_spec.rb +9 -5
  340. data/spec/units/generators/partial_source_writer_spec.rb +129 -0
  341. data/spec/units/includes/header_search_spec.rb +406 -0
  342. data/spec/units/includes/include_factory_spec.rb +22 -5
  343. data/spec/units/includes/include_pathinator_spec.rb +77 -13
  344. data/spec/units/includes/include_spec.rb +14 -0
  345. data/spec/units/includes/includes_spec.rb +176 -19
  346. data/spec/units/loginator_spec.rb +31 -0
  347. data/spec/units/mock_locator_spec.rb +199 -5
  348. data/spec/units/partials/include_groups_spec.rb +42 -0
  349. data/spec/units/partials/partializer_config_spec.rb +25 -0
  350. data/spec/units/partials/partializer_helper_carry_spec.rb +661 -0
  351. data/spec/units/partials/partializer_helper_interface_extras_spec.rb +396 -0
  352. data/spec/units/partials/partializer_helper_spec.rb +529 -277
  353. data/spec/units/partials/partializer_reconciler_spec.rb +661 -0
  354. data/spec/units/partials/partializer_spec.rb +1578 -270
  355. data/spec/units/partials/partializer_utils_spec.rb +269 -232
  356. data/spec/units/partials/partials_rename_spec.rb +160 -0
  357. data/spec/units/partials_manager_spec.rb +554 -261
  358. data/spec/units/plugins/bullseye_spec.rb +34 -0
  359. data/spec/units/plugins/console_reportinator_spec.rb +58 -9
  360. data/spec/units/plugins/report_tests_teamcity_stdout_spec.rb +1 -1
  361. data/spec/units/plugins/reportgenerator_reportinator_spec.rb +51 -3
  362. data/spec/units/preprocess/preprocessinator_code_finder_spec.rb +73 -10
  363. data/spec/units/preprocess/preprocessinator_file_assembler_spec.rb +125 -37
  364. data/spec/units/preprocess/preprocessinator_includes_handler_spec.rb +15 -0
  365. data/spec/units/preprocess/preprocessinator_reconstructor_spec.rb +197 -0
  366. data/spec/units/preprocess/preprocessinator_spec.rb +153 -95
  367. data/spec/units/setupinator_spec.rb +51 -0
  368. data/spec/units/standin_headerinator_spec.rb +27 -11
  369. data/spec/units/test_build_executor_spec.rb +780 -166
  370. data/spec/units/test_build_planner_spec.rb +116 -28
  371. data/spec/units/test_build_setup_spec.rb +83 -18
  372. data/spec/units/test_context_extractor_spec.rb +11 -2
  373. data/spec/units/test_derived_search_paths_spec.rb +259 -0
  374. data/spec/units/test_includes_extractinator_spec.rb +56 -8
  375. data/spec/units/test_invoker/objects_wiring_spec.rb +20 -3
  376. data/spec/units/test_invoker/partial_files_preprocessinator_spec.rb +264 -0
  377. data/spec/units/test_invoker/test_substitutions_spec.rb +122 -0
  378. data/spec/units/test_invoker_types_spec.rb +8 -7
  379. data/spec/units/test_pipeline_manager_spec.rb +54 -13
  380. data/spec/units/test_runner_generatinator_spec.rb +93 -1
  381. data/spec/units/test_search_paths_spec.rb +73 -5
  382. data/spec/units/{default_tools_quoting_spec.rb → tools/default_tools_quoting_spec.rb} +39 -5
  383. data/spec/units/tools/shell_quoting_spec.rb +76 -0
  384. data/spec/units/{tool_executor_helper_spec.rb → tools/tool_executor_helper_spec.rb} +1 -1
  385. data/spec/units/{tool_executor_spec.rb → tools/tool_executor_spec.rb} +1 -1
  386. data/spec/units/{tool_validator_spec.rb → tools/tool_validator_spec.rb} +110 -1
  387. data/spec/units/windows_registry_query_tool_spec.rb +53 -0
  388. metadata +161 -16
  389. /data/lib/ceedling/{tool_executor.rb → tools/tool_executor.rb} +0 -0
  390. /data/lib/ceedling/{tool_executor_helper.rb → tools/tool_executor_helper.rb} +0 -0
@@ -10,6 +10,7 @@ require 'rake'
10
10
  require 'ceedling/filename_extension'
11
11
  require 'ceedling/test_invoker/test_build_planner'
12
12
  require 'ceedling/test_invoker/mock_locator'
13
+ require 'ceedling/includes/header_search'
13
14
  require 'ceedling/test_invoker/test_invoker_types'
14
15
  require 'ceedling/includes/includes'
15
16
  require 'ceedling/partials/partializer_config'
@@ -43,9 +44,13 @@ describe TestBuildPlanner do
43
44
  things.each { |k, v| block.call(k, v) }
44
45
  end
45
46
 
46
- # Harmless default -- individual examples needing a specific ordered header
47
- # collection stub this again with a narrower `.with(...)` match.
48
- allow(@include_pathinator).to receive(:ordered_header_files).and_return( [] )
47
+ # Harmless default -- individual examples needing a specific header search stub this
48
+ # again with a narrower `.with(...)` match.
49
+ @header_search = HeaderSearch.new( [], ->(_dir) { [] } )
50
+ allow(@include_pathinator).to receive(:header_search).and_return( @header_search )
51
+ @test_search_paths = double( "TestSearchPaths" )
52
+ allow(@test_search_paths).to receive(:header_paths) { |testable| testable.search_paths }
53
+ allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( false )
49
54
  allow(@include_pathinator).to receive(:prioritized_header_files).and_return( [] )
50
55
  allow(@loginator).to receive(:log)
51
56
 
@@ -73,7 +78,8 @@ describe TestBuildPlanner do
73
78
  :test_source_file_directive_resolver => @test_source_file_directive_resolver,
74
79
  # Real, over the same doubles, so mock resolution expectations stay on FileFinder
75
80
  :mock_locator => MockLocator.new(
76
- configurator: @configurator, include_pathinator: @include_pathinator, file_finder: @file_finder, file_path_utils: @file_path_utils
81
+ configurator: @configurator, include_pathinator: @include_pathinator, test_search_paths: @test_search_paths,
82
+ file_finder: @file_finder, file_path_utils: @file_path_utils
77
83
  )
78
84
  }
79
85
  )
@@ -175,7 +181,7 @@ describe TestBuildPlanner do
175
181
  .with( 'test/TestFoo.c' ).and_return( [mock] )
176
182
  allow(@configurator).to receive(:cmock_mock_prefix).and_return( 'Mock' )
177
183
  allow(@file_finder).to receive(:resolve_mock)
178
- .with( 'MockFoo.h', collection: [], complain: :error ).and_return( ['src/drivers/foo.h', 'drivers'] )
184
+ .with( 'MockFoo.h', collection: @header_search, complain: :error ).and_return( ['src/drivers/foo.h', 'drivers'] )
179
185
  allow(@file_path_utils).to receive(:form_preprocessed_file_filepath)
180
186
  .with( 'src/drivers/foo.h', 'a_test' ).and_return( 'build/test/preprocess/files/a_test/full_expansion/foo.h' )
181
187
  end
@@ -214,8 +220,8 @@ describe TestBuildPlanner do
214
220
  .with( 'test/TestFoo.c' ).and_return( [MockInclude.new( 'a/MockFoo.h' ), MockInclude.new( 'b/MockFoo.h' )] )
215
221
  allow(@configurator).to receive(:cmock_mock_prefix).and_return( 'Mock' )
216
222
  allow(@configurator).to receive(:project_use_test_preprocessor_mocks).and_return( false )
217
- allow(@file_finder).to receive(:resolve_mock).with( 'a/MockFoo.h', collection: [], complain: :error ).and_return( ['inc/a/foo.h', ''] )
218
- allow(@file_finder).to receive(:resolve_mock).with( 'b/MockFoo.h', collection: [], complain: :error ).and_return( ['inc/b/foo.h', ''] )
223
+ allow(@file_finder).to receive(:resolve_mock).with( 'a/MockFoo.h', collection: @header_search, complain: :error ).and_return( ['inc/a/foo.h', ''] )
224
+ allow(@file_finder).to receive(:resolve_mock).with( 'b/MockFoo.h', collection: @header_search, complain: :error ).and_return( ['inc/b/foo.h', ''] )
219
225
  allow(@file_path_utils).to receive(:form_preprocessed_file_filepath).and_return( 'unused' )
220
226
 
221
227
  @planner.stage_determine_files( @state )
@@ -224,9 +230,28 @@ describe TestBuildPlanner do
224
230
  expect(@testable.mocks.values.map( &:source )).to contain_exactly( 'inc/a/foo.h', 'inc/b/foo.h' )
225
231
  end
226
232
 
227
- # Nothing in the loop over a test's mocks changes its search paths, so one collection
228
- # serves every mock. Validation lists the whole search paths, mock directories included.
229
- it "builds one mock header collection for all of a test's real mocks" do
233
+ # CMock includes a mock's header by the folder the test named the mock by, which a search
234
+ # path listing the header's own directory doesn't join
235
+ it "records the text the search paths reach a mock's header by where CMock's own reaches nothing" do
236
+ search = HeaderSearch.new( ['src/drivers'], ->(dir) { dir == 'src/drivers' ? ['src/drivers/foo.h'] : [] } )
237
+ allow(@include_pathinator).to receive(:header_search).and_return( search )
238
+ allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
239
+ .with( 'test/TestFoo.c' ).and_return( [MockInclude.new( 'drivers/MockFoo.h' )] )
240
+ allow(@configurator).to receive(:cmock_mock_prefix).and_return( 'Mock' )
241
+ allow(@configurator).to receive(:project_use_test_preprocessor_mocks).and_return( false )
242
+ allow(@configurator).to receive(:get_cmock_config).and_return( {} )
243
+ allow(@file_finder).to receive(:resolve_mock).with( 'drivers/MockFoo.h', collection: search, complain: :error ).and_return( ['src/drivers/foo.h', ''] )
244
+ allow(@file_path_utils).to receive(:form_preprocessed_file_filepath).and_return( 'unused' )
245
+ allow(@file_path_utils).to receive(:form_mock_output_path) { |root, subdir| subdir.to_s.empty? ? root : File.join( root, subdir ) }
246
+
247
+ @planner.stage_determine_files( @state )
248
+
249
+ expect(@testable.mocks.values.map( &:header_include )).to eq( ['foo.h'] )
250
+ end
251
+
252
+ # Nothing in the loop over a test's mocks changes its search paths, so one search serves
253
+ # every mock and the #include validation after them
254
+ it "builds one header search for all of a test's real mocks and its #include validation" do
230
255
  mocks = %w[MockFoo.h MockBar.h MockBaz.h].map { |name| MockInclude.new( name ) }
231
256
  allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list).with( 'test/TestFoo.c' ).and_return( mocks )
232
257
  allow(@configurator).to receive(:cmock_mock_prefix).and_return( 'Mock' )
@@ -238,7 +263,7 @@ describe TestBuildPlanner do
238
263
  @testable.mock_search_paths = ['build/test/mocks/a_test']
239
264
 
240
265
  collections = 0
241
- allow(@include_pathinator).to receive(:ordered_header_files).with( ['src'] ) { collections += 1; ['src/Foo.h'] }
266
+ allow(@include_pathinator).to receive(:header_search) { collections += 1; @header_search }
242
267
 
243
268
  @planner.stage_determine_files( @state )
244
269
 
@@ -246,6 +271,21 @@ describe TestBuildPlanner do
246
271
  expect(collections).to eq( 1 )
247
272
  end
248
273
 
274
+ # A reconciled mock keeps the #include the test wrote, which the compiler joins with each
275
+ # search path in order
276
+ it "resolves a mock through the test's header search when test files are preprocessed" do
277
+ allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( true )
278
+ allow(@configurator).to receive(:project_use_test_preprocessor_mocks).and_return( false )
279
+ allow(@configurator).to receive(:cmock_mock_prefix).and_return( 'Mock' )
280
+ allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list).with( 'test/TestFoo.c' ).and_return( [MockInclude.new( 'hal/MockFoo.h' )] )
281
+ allow(@file_path_utils).to receive(:form_preprocessed_file_filepath).and_return( 'unused' )
282
+ allow(@file_path_utils).to receive(:form_mock_output_path) { |root, subdir| subdir.to_s.empty? ? root : File.join( root, subdir ) }
283
+
284
+ expect(@file_finder).to receive(:resolve_mock).with( 'hal/MockFoo.h', collection: @header_search, complain: :error ).and_return( ['inc/hal/foo.h', 'hal'] )
285
+
286
+ @planner.stage_determine_files( @state )
287
+ end
288
+
249
289
  context "with a Partial mocked header" do
250
290
  before(:each) do
251
291
  mock = MockInclude.new( 'Mockceedling_partial_foo_interface.h' )
@@ -257,17 +297,6 @@ describe TestBuildPlanner do
257
297
  .and_return( 'build/test/partials/a_test/ceedling_partial_foo_interface.h' )
258
298
  end
259
299
 
260
- # A Partial mock has no real header to resolve against, so its directory comes
261
- # from the generated #include rather than from a mirrored source location.
262
- it "builds no mock header collection, having no real header to resolve" do
263
- @testable.search_paths = ['build/test/mocks/a_test', 'src']
264
- @testable.mock_search_paths = ['build/test/mocks/a_test']
265
-
266
- expect(@include_pathinator).to_not receive(:ordered_header_files).with( ['src'] )
267
-
268
- @planner.stage_determine_files( @state )
269
- end
270
-
271
300
  it "stays flat when its generated #include names no directory" do
272
301
  expect(@file_finder).to_not receive(:resolve_mock)
273
302
 
@@ -361,7 +390,7 @@ describe TestBuildPlanner do
361
390
  @planner.stage_flatten_partials_lists( @state )
362
391
 
363
392
  expect(@state.partials_headers).to eq(
364
- [TestInvokerTypes::PartialWork.new( config: header, testable: @testable, directives_only_filepath: nil )]
393
+ [TestInvokerTypes::PartialWork.new( config: header, testable: @testable )]
365
394
  )
366
395
  expect(@state.partials_sources).to eq( [] )
367
396
  end
@@ -374,7 +403,7 @@ describe TestBuildPlanner do
374
403
  @planner.stage_flatten_partials_lists( @state )
375
404
 
376
405
  expect(@state.partials_sources).to eq(
377
- [TestInvokerTypes::PartialWork.new( config: source, testable: @testable, directives_only_filepath: nil )]
406
+ [TestInvokerTypes::PartialWork.new( config: source, testable: @testable )]
378
407
  )
379
408
  expect(@state.partials_headers).to eq( [] )
380
409
  end
@@ -547,6 +576,48 @@ describe TestBuildPlanner do
547
576
  end
548
577
  end
549
578
 
579
+ # A mock of foox.hpp stands in for that header only, so foox.c still builds for foox.h
580
+ context "with a mocked header whose stem a real, unmocked header of the test shares" do
581
+ before(:each) do
582
+ mock = MockInclude.new( 'Mockfoox.hpp' )
583
+ allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
584
+ .with( 'test/TestFoo.c' ).and_return( [mock] )
585
+ allow(@configurator).to receive(:project_use_mocks).and_return( true )
586
+ allow(@test_context_extractor).to receive(:lookup_all_header_includes_list)
587
+ .with( 'test/TestFoo.c' ).and_return( [UserInclude.new( 'drivers/foox.h' ), mock] )
588
+ allow(@file_finder).to receive(:find_build_input_file)
589
+ .with( filepath: 'drivers/foox.h', complain: :ignore, context: :test, test: 'a_test' ).and_return( 'src/foox.c' )
590
+ @testable.mocks = { Mockfoox: TestInvokerTypes::MockDetails.new( name: 'Mockfoox' ) }
591
+ end
592
+
593
+ it "compiles the real header's source beside the mock" do
594
+ @planner.stage_determine_artifacts( @state )
595
+
596
+ expect(@testable.core).to include( 'src/foox.c', 'build/test/mocks/a_test/Mockfoox.c' )
597
+ end
598
+ end
599
+
600
+ # A mock of foox.h stands in for the header foox.c implements, whatever else the test includes
601
+ context "with a mocked .h header whose stem a real header with another extension shares" do
602
+ before(:each) do
603
+ mock = MockInclude.new( 'Mockfoox.h' )
604
+ allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
605
+ .with( 'test/TestFoo.c' ).and_return( [mock] )
606
+ allow(@configurator).to receive(:project_use_mocks).and_return( true )
607
+ allow(@test_context_extractor).to receive(:lookup_all_header_includes_list)
608
+ .with( 'test/TestFoo.c' ).and_return( [UserInclude.new( 'drivers/foox.hpp' ), mock] )
609
+ allow(@file_finder).to receive(:find_build_input_file)
610
+ .with( filepath: 'drivers/foox.hpp', complain: :ignore, context: :test, test: 'a_test' ).and_return( 'src/foox.c' )
611
+ @testable.mocks = { Mockfoox: TestInvokerTypes::MockDetails.new( name: 'Mockfoox' ) }
612
+ end
613
+
614
+ it "leaves that source out of the link" do
615
+ @planner.stage_determine_artifacts( @state )
616
+
617
+ expect(@testable.core).to eq( ['build/test/mocks/a_test/Mockfoox.c'] )
618
+ end
619
+ end
620
+
550
621
  context "when a build-directive source is also a shallow-included source" do
551
622
  before(:each) do
552
623
  allow(@test_source_file_directive_resolver).to receive(:resolve)
@@ -652,19 +723,20 @@ describe TestBuildPlanner do
652
723
  @planner.validate_header_includes( test_filepath: 'test/TestFoo.c', testable: @testable )
653
724
  end
654
725
 
655
- it "resolves an ordinary header against this test's own ordered search-path header collection, hard-erroring only on no match" do
726
+ it "resolves an ordinary header through this test's own header search, hard-erroring only on no match" do
656
727
  allow(@test_context_extractor).to receive(:lookup_nonmock_header_includes_list)
657
728
  .with( 'test/TestFoo.c' ).and_return( [UserInclude.new('drivers/foo.h')] )
658
729
  @testable.search_paths = ['inc', 'src']
659
- allow(@include_pathinator).to receive(:ordered_header_files)
660
- .with( ['inc', 'src'] ).and_return( ['inc/drivers/foo.h'] )
730
+ allow(@include_pathinator).to receive(:header_search).with( ['inc', 'src'], refusals: {} ).and_return( @header_search )
661
731
 
662
- expect(@file_finder).to receive(:find_header_file).with( 'drivers/foo.h', :error, collection: ['inc/drivers/foo.h'] )
732
+ expect(@file_finder).to receive(:find_header_file).with( 'drivers/foo.h', :error, collection: @header_search )
663
733
 
664
734
  @planner.validate_header_includes( test_filepath: 'test/TestFoo.c', testable: @testable )
665
735
  end
666
736
  end
667
737
 
738
+ # A mock of a .h header stands in for its same-named source. A mock of a header with another
739
+ # extension leaves that source in place.
668
740
  describe "#remove_mock_original_headers" do
669
741
  before(:each) do
670
742
  allow(@configurator).to receive(:cmock_mock_prefix).and_return( 'Mock' )
@@ -678,6 +750,22 @@ describe TestBuildPlanner do
678
750
  expect(filelist).to eq( ['src/Bar.c'] )
679
751
  end
680
752
 
753
+ it "removes a source file named with dots whose header is mocked" do
754
+ filelist = ['src/Sensor.44.c', 'src/Sensor.c']
755
+
756
+ @planner.remove_mock_original_headers( filelist, ['MockSensor.44.h'] )
757
+
758
+ expect(filelist).to eq( ['src/Sensor.c'] )
759
+ end
760
+
761
+ it "keeps a source file whose stem a mock of a header with another extension shares" do
762
+ filelist = ['src/foox.c', 'src/Bar.c']
763
+
764
+ @planner.remove_mock_original_headers( filelist, ['Mockfoox.hpp'] )
765
+
766
+ expect(filelist).to eq( ['src/foox.c', 'src/Bar.c'] )
767
+ end
768
+
681
769
  it "leaves the list untouched when none of its files correspond to a mocked header" do
682
770
  filelist = ['src/Bar.c']
683
771
 
@@ -9,6 +9,7 @@ require 'spec_helper'
9
9
  require 'ceedling/test_invoker/test_build_setup'
10
10
  require 'ceedling/test_invoker/test_invoker_types'
11
11
  require 'ceedling/test_invoker/test_search_paths'
12
+ require 'ceedling/includes/header_search'
12
13
  require 'ceedling/test_invoker/mock_locator'
13
14
 
14
15
  describe TestBuildSetup do
@@ -54,9 +55,10 @@ describe TestBuildSetup do
54
55
  # Stage 2's Partials check reads the scanned #includes
55
56
  allow(@test_context_extractor).to receive(:lookup_all_header_includes_list).and_return( [] )
56
57
 
57
- # Harmless default -- individual examples needing a specific ordered header
58
- # collection stub this again with a narrower `.with(...)` match.
59
- allow(@include_pathinator).to receive(:ordered_header_files).and_return( [] )
58
+ # Harmless default -- individual examples needing a specific header search stub this
59
+ # again with a narrower `.with(...)` match.
60
+ @header_search = HeaderSearch.new( [], ->(_dir) { [] } )
61
+ allow(@include_pathinator).to receive(:header_search).and_return( @header_search )
60
62
 
61
63
  # Search path defaults, so tests need not know every source a test's search paths
62
64
  # draw on
@@ -71,10 +73,19 @@ describe TestBuildSetup do
71
73
  @test_source_file_directive_resolver = double( "TestSourceFileDirectiveResolver" )
72
74
  allow(@test_source_file_directive_resolver).to receive(:validate!)
73
75
 
76
+ # Real, over the same doubles, so search path expectations read as paths
77
+ @search_paths = TestSearchPaths.new(
78
+ configurator: @configurator, include_pathinator: @include_pathinator, test_context_extractor: @test_context_extractor
79
+ )
74
80
  @mock_locator = MockLocator.new(
75
- configurator: @configurator, include_pathinator: @include_pathinator, file_finder: @file_finder, file_path_utils: @file_path_utils
81
+ configurator: @configurator, include_pathinator: @include_pathinator, test_search_paths: @search_paths,
82
+ file_finder: @file_finder, file_path_utils: @file_path_utils
76
83
  )
77
84
 
85
+ @test_derived_search_paths = double( "TestDerivedSearchPaths" )
86
+ allow(@test_derived_search_paths).to receive(:collect).and_return( [[], {}] )
87
+ allow(@test_derived_search_paths).to receive(:forget_notices)
88
+
78
89
  @setup = described_class.new(
79
90
  {
80
91
  :configurator => @configurator,
@@ -90,11 +101,9 @@ describe TestBuildSetup do
90
101
  :file_finder => @file_finder,
91
102
  :test_runner_manager => @test_runner_manager,
92
103
  :dependinator => @dependinator,
93
- # Real, over the same doubles, so search path expectations read as paths
94
- :test_search_paths => TestSearchPaths.new(
95
- configurator: @configurator, include_pathinator: @include_pathinator, test_context_extractor: @test_context_extractor
96
- ),
104
+ :test_search_paths => @search_paths,
97
105
  :mock_locator => @mock_locator,
106
+ :test_derived_search_paths => @test_derived_search_paths,
98
107
  :test_source_file_directive_resolver => @test_source_file_directive_resolver
99
108
  }
100
109
  )
@@ -376,8 +385,64 @@ describe TestBuildSetup do
376
385
  end
377
386
  end
378
387
 
388
+ # A mock's header found only through a derived directory needs that directory first
389
+ it "derives a test's search paths before its mock search paths" do
390
+ allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( false )
391
+ expect(@test_derived_search_paths).to receive(:collect).with( @testable ).ordered.and_return( [['src/path/to'], {}] )
392
+ expect(@setup).to receive(:collect_mock_search_paths).with( @testable ).ordered do |testable|
393
+ expect(testable.derived_search_paths).to eq( ['src/path/to'] )
394
+ []
395
+ end
396
+
397
+ @setup.stage_collect_test_context( @state )
398
+ end
399
+
400
+ # One header's mock named two ways would become two mocks that can't both link
401
+ it "keeps one mock per real header in a test's #includes before finding its mock search paths" do
402
+ allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( false )
403
+ @testable.paths = { mocks: 'build/test/mocks/a_test' }
404
+ allow(@test_context_extractor).to receive(:lookup_all_header_includes_list)
405
+ .and_return( [UserInclude.new('unity.h'), MockInclude.new('MockTask.h'), MockInclude.new('drivers/MockTask.h')] )
406
+ allow(@test_context_extractor).to receive(:lookup_source_includes_list).and_return( [UserInclude.new('foo.c')] )
407
+ allow(@file_finder).to receive(:resolve_mock).and_return( ['src/drivers/task.h', 'drivers'] )
408
+
409
+ expect(@test_context_extractor).to receive(:ingest_includes).ordered do |filepath, includes|
410
+ expect(filepath).to eq( 'test/TestFoo.c' )
411
+ expect(includes.map(&:filepath)).to eq( ['unity.h', 'drivers/MockTask.h', 'foo.c'] )
412
+ end
413
+ expect(@setup).to receive(:collect_mock_search_paths).with( @testable ).ordered.and_return( [] )
414
+
415
+ @setup.stage_collect_test_context( @state )
416
+ end
417
+
418
+ it "leaves a test's #includes as they are when each mock names a header of its own" do
419
+ allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( false )
420
+ @testable.paths = { mocks: 'build/test/mocks/a_test' }
421
+ allow(@test_context_extractor).to receive(:lookup_all_header_includes_list)
422
+ .and_return( [MockInclude.new('MockTask.h'), MockInclude.new('other/MockTask.h')] )
423
+ allow(@file_finder).to receive(:resolve_mock) { |query, **| query == 'MockTask.h' ? ['rtos/include/task.h', 'include'] : ['rtos/other/task.h', 'other'] }
424
+ allow(@setup).to receive(:collect_mock_search_paths).and_return( [] )
425
+
426
+ expect(@test_context_extractor).to_not receive(:ingest_includes)
427
+
428
+ @setup.stage_collect_test_context( @state )
429
+ end
430
+
431
+ # A header lookup that fails later explains itself with the refusal
432
+ it "keeps a test's search path refusals for its header lookups" do
433
+ allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( false )
434
+ allow(@test_derived_search_paths).to receive(:collect).with( @testable ).and_return( [[], { 'socket.h' => 'why' }] )
435
+ expect(@setup).to receive(:collect_mock_search_paths).with( @testable ) do |testable|
436
+ expect(testable.search_path_refusals).to eq( 'socket.h' => 'why' )
437
+ []
438
+ end
439
+
440
+ @setup.stage_collect_test_context( @state )
441
+ end
442
+
379
443
  # Only a scan without test preprocessing caches TEST_SOURCE_FILE() entries, so switching
380
444
  # modes must rescan rather than recall a cache missing them
445
+
381
446
  it "caches build directives against the test preprocessing mode that scanned them" do
382
447
  [true, false].each do |preprocessing|
383
448
  allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( preprocessing )
@@ -445,15 +510,15 @@ describe TestBuildSetup do
445
510
  bar_mock = MockInclude.new('MockBar.h')
446
511
  allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
447
512
  .with('test/TestFoo.c').and_return( [foo_mock, bar_mock] )
448
- allow(@file_finder).to receive(:resolve_mock).with('MockFoo.h', collection: [], complain: :error).and_return( ['src/drivers/foo.h', 'drivers'] )
449
- allow(@file_finder).to receive(:resolve_mock).with('MockBar.h', collection: [], complain: :error).and_return( ['src/drivers/bar.h', 'drivers'] )
513
+ allow(@file_finder).to receive(:resolve_mock).with('MockFoo.h', collection: @header_search, complain: :error).and_return( ['src/drivers/foo.h', 'drivers'] )
514
+ allow(@file_finder).to receive(:resolve_mock).with('MockBar.h', collection: @header_search, complain: :error).and_return( ['src/drivers/bar.h', 'drivers'] )
450
515
 
451
516
  result = @setup.collect_mock_search_paths( @testable )
452
517
 
453
518
  expect(result).to eq(['build/test/mocks/a_test/drivers'])
454
519
  end
455
520
 
456
- it "resolves each mock's real header against this test's own TEST_INCLUDE_PATH()-then-configured-root ordering, with no mock_search_paths yet (that's what this call is computing)" do
521
+ it "resolves each mock's real header through this test's own TEST_INCLUDE_PATH()-then-configured-root ordering, without its generated directories" do
457
522
  allow(@include_pathinator).to receive(:lookup_test_directive_include_paths)
458
523
  .with('test/TestFoo.c').and_return( ['other_inc'] )
459
524
  allow(@configurator).to receive(:collection_paths_include).and_return( ['src'] )
@@ -462,10 +527,10 @@ describe TestBuildSetup do
462
527
  allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
463
528
  .with('test/TestFoo.c').and_return( [foo_mock] )
464
529
 
465
- expect(@include_pathinator).to receive(:ordered_header_files)
466
- .with( ['build/test/mocks/a_test', 'other_inc', 'src'] ).and_return( ['other_inc/foo.h'] )
530
+ search = HeaderSearch.new( ['other_inc', 'src'], ->(_dir) { [] } )
531
+ expect(@include_pathinator).to receive(:header_search).with( ['other_inc', 'src'], refusals: {} ).and_return( search )
467
532
  expect(@file_finder).to receive(:resolve_mock)
468
- .with('MockFoo.h', collection: ['other_inc/foo.h'], complain: :error).and_return( ['other_inc/foo.h', ''] )
533
+ .with('MockFoo.h', collection: search, complain: :error).and_return( ['other_inc/foo.h', ''] )
469
534
 
470
535
  @setup.collect_mock_search_paths( @testable )
471
536
  end
@@ -474,7 +539,7 @@ describe TestBuildSetup do
474
539
  foo_mock = MockInclude.new('MockFoo.h')
475
540
  allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
476
541
  .with('test/TestFoo.c').and_return( [foo_mock] )
477
- allow(@file_finder).to receive(:resolve_mock).with('MockFoo.h', collection: [], complain: :error).and_return( ['src/foo.h', ''] )
542
+ allow(@file_finder).to receive(:resolve_mock).with('MockFoo.h', collection: @header_search, complain: :error).and_return( ['src/foo.h', ''] )
478
543
 
479
544
  result = @setup.collect_mock_search_paths( @testable )
480
545
 
@@ -499,8 +564,8 @@ describe TestBuildSetup do
499
564
  allow(@configurator).to receive(:project_use_test_preprocessor_tests).and_return( true )
500
565
  allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
501
566
  .with('test/TestFoo.c').and_return( [MockInclude.new('MockHw1.h'), MockInclude.new('MockFoo.h')] )
502
- allow(@file_finder).to receive(:resolve_mock).with('MockHw1.h', collection: [], complain: :silent).and_return( [nil, nil] )
503
- allow(@file_finder).to receive(:resolve_mock).with('MockFoo.h', collection: [], complain: :silent).and_return( ['src/drivers/foo.h', 'drivers'] )
567
+ allow(@file_finder).to receive(:resolve_mock).with('MockHw1.h', collection: @header_search, complain: :silent).and_return( [nil, nil] )
568
+ allow(@file_finder).to receive(:resolve_mock).with('MockFoo.h', collection: @header_search, complain: :silent).and_return( ['src/drivers/foo.h', 'drivers'] )
504
569
 
505
570
  expect(@setup.collect_mock_search_paths( @testable )).to eq( ['build/test/mocks/a_test/drivers'] )
506
571
  end
@@ -508,7 +573,7 @@ describe TestBuildSetup do
508
573
  it "stops the build over a mock whose header is missing when test preprocessing is off" do
509
574
  allow(@test_context_extractor).to receive(:lookup_mock_header_includes_list)
510
575
  .with('test/TestFoo.c').and_return( [MockInclude.new('MockHw1.h')] )
511
- allow(@file_finder).to receive(:resolve_mock).with('MockHw1.h', collection: [], complain: :error)
576
+ allow(@file_finder).to receive(:resolve_mock).with('MockHw1.h', collection: @header_search, complain: :error)
512
577
  .and_raise( CeedlingException.new( 'Found no file `Hw1.h` in search paths.' ) )
513
578
 
514
579
  expect { @setup.collect_mock_search_paths( @testable ) }.to raise_error( CeedlingException, /Hw1\.h/ )
@@ -10,6 +10,7 @@ require 'ceedling/filename_extension'
10
10
  require 'ceedling/test_context_extractor'
11
11
  require 'ceedling/includes/includes'
12
12
  require 'ceedling/includes/include_factory'
13
+ require 'ceedling/filesystem/test_build_layout'
13
14
  require 'ceedling/parsing_parcels'
14
15
  require 'ceedling/exceptions'
15
16
  require 'ceedling/c_extractor/c_extractor_code_text'
@@ -36,8 +37,9 @@ describe TestContextExtractor do
36
37
 
37
38
  ## Concrete injected dependencies
38
39
  @parsing_parcels = ParsingParcels.new()
39
- @include_factory = IncludeFactory.new( {:configurator => @configurator} )
40
- @file_path_utils = FilePathUtils.new( {:configurator => @configurator, :file_wrapper => @file_wrapper } )
40
+ layout = TestBuildLayout.new( {:configurator => @configurator, :file_wrapper => @file_wrapper} )
41
+ @include_factory = IncludeFactory.new( {:configurator => @configurator, :test_build_layout => layout} )
42
+ @file_path_utils = FilePathUtils.new( {:configurator => @configurator, :file_wrapper => @file_wrapper, :test_build_layout => layout } )
41
43
 
42
44
  code_text = CExtractorCodeText.new
43
45
  c_extractor_preprocessing = CExtractorPreprocessing.new({ c_extractor_code_text: code_text })
@@ -193,6 +195,13 @@ describe TestContextExtractor do
193
195
  expect( @extractor.lookup_mock_header_includes_list( "test/test_c.c" ) ).to eq( [MockInclude.new( 'x/mock_foo.h' )] )
194
196
  end
195
197
 
198
+ # The two can mock different headers, which stage 2 tells apart through the search paths
199
+ it "keeps a pathless mock #include beside a same-named one with a folder" do
200
+ @extractor.collect_context( "test/test_c.c", StringIO.new( "#include \"mock_task.h\"\n#include \"other/mock_task.h\"\n" ), TestContextExtractor::Context::INCLUDES )
201
+
202
+ expect( @extractor.lookup_mock_header_includes_list( "test/test_c.c" ).map(&:filepath) ).to eq( ['mock_task.h', 'other/mock_task.h'] )
203
+ end
204
+
196
205
  it "keeps a non-mock #include that climbs with `..`, resolved against the test file's directory" do
197
206
  @extractor.collect_context( "test/test_c.c", StringIO.new( "#include \"../inc/x/foo.h\"\n" ), TestContextExtractor::Context::INCLUDES )
198
207