ceedling 1.0.0 → 1.0.1

data/plugins/module_generator/Rakefile

@@ -27,7 +27,7 @@ def prep_test
 end
 
 def prep_stub(num)
-  FileUtils.cp_r("../assets/stubby#{num}.h","./i/stubby.h")
+  FileUtils.cp_r("../assets/stubby#{num}.h","./i/rev/stubby.h")
 end
 
 def assert_file_exist(path)
@@ -81,6 +81,16 @@ def call_create(cmd)
   end
 end
 
+def call_create_expecting_error(cmd)
+  retval = `#{CEEDLING_CLI_EXEC} module:create[#{cmd}] 2>&1`
+  puts retval # Debug logging
+  if retval.match? /Error/i
+    puts "Received expected error when creating #{cmd}"
+  else
+    raise "Should have received error when creating #{cmd}"
+  end
+end
+
 def call_destroy(cmd)
   retval = `#{CEEDLING_CLI_EXEC} module:destroy[#{cmd}] 2>&1`
   puts retval # Debug logging
@@ -101,6 +111,10 @@ def call_stub(cmd)
   end
 end
 
+def puts_heading(title)
+  puts "\n\n#{title}\n#{"="*title.length}"
+end
+
 desc "Run integration test on example"
 task :integration_test do
   chdir("./example/") do
@@ -111,16 +125,16 @@ task :integration_test do
 
     # Add a module without path. 
     # It should be added to first path on list of each category
-    puts "\nVerifying Default Create:"
+    puts_heading "Verifying Default Create:"
     call_create("a_file")
-    assert_file_exist("s/rev/a_file.c")
-    assert_file_exist("i/rev/a_file.h")
+    assert_file_exist("s/a_file.c")
+    assert_file_exist("i/a_file.h")
     assert_file_exist("sub/t/test_a_file.c")
     assert_test_run_contains("TESTED:  1")
 
     # Make sure that we can add modules properly when the directory
     # pattern is subdirs with src, inc, and test folders each
-    puts "\nVerifying Subdirectory Create:"
+    puts_heading "Verifying Subdirectory Create:"
     call_create("sub:b_file")
     assert_file_exist("sub/s/b_file.c")
     assert_file_exist("sub/i/b_file.h")
@@ -129,7 +143,7 @@ task :integration_test do
 
     # Make sure that we can add modules properly when the directory
     # pattern is subdirs under the src, inc, and test folders
-    puts "\nVerifying Reverse Subdirectory Create:"
+    puts_heading "Verifying Reverse Subdirectory Create:"
     call_create("rev:c_file")
     assert_file_exist("s/rev/c_file.c")
     assert_file_exist("i/rev/c_file.h")
@@ -137,29 +151,29 @@ task :integration_test do
     assert_test_run_contains("TESTED:  3")
 
     # Does our Boilerplate mechanism work?
-    puts "\nVerifying Boilerplate:"
+    puts_heading "Verifying Boilerplate:"
     assert_file_contains("s/rev/c_file.c", "MAY THE SOURCE BE WITH YOU")
     assert_file_contains("i/rev/c_file.h", "feel included")
     assert_file_contains("t/rev/test_c_file.c", "Don't Test Me, Sir")
 
     # Are other essentials being injected
-    puts "\nVerifying Guts:"
-    assert_file_contains("s/rev/a_file.c", "#include \"a_file.h\"")
-    assert_file_contains("i/rev/a_file.h", "#ifndef A_FILE_H")
+    puts_heading "Verifying Guts:"
+    assert_file_contains("s/a_file.c", "#include \"a_file.h\"")
+    assert_file_contains("i/a_file.h", "#ifndef A_FILE_H")
     assert_file_contains("sub/t/test_a_file.c", "test_a_file_NeedToImplement")
 
     # Destroy a module without path. 
     # It should be removed from first path on list of each category
-    puts "\nVerifying Default Destroy:"
+    puts_heading "Verifying Default Destroy:"
     call_destroy("a_file")
-    assert_file_not_exist("s/rev/a_file.c")
-    assert_file_not_exist("i/rev/a_file.h")
+    assert_file_not_exist("s/a_file.c")
+    assert_file_not_exist("i/a_file.h")
     assert_file_not_exist("sub/t/test_a_file.c")
     assert_test_run_contains("TESTED:  2")
 
     # Make sure that we can destroy modules properly when the directory
     # pattern is subdirs with src, inc, and test folders each
-    puts "\nVerifying Subdirectory Destroy:"
+    puts_heading "Verifying Subdirectory Destroy:"
     call_destroy("sub:b_file")
     assert_file_not_exist("sub/s/b_file.c")
     assert_file_not_exist("sub/i/b_file.h")
@@ -168,7 +182,7 @@ task :integration_test do
 
     # Make sure that we can destroy modules properly when the directory
     # pattern is subdirs under the src, inc, and test folders
-    puts "\nVerifying Reverse Subdirectory Destroy:"
+    puts_heading "Verifying Reverse Subdirectory Destroy:"
     call_destroy("rev:c_file")
     assert_file_not_exist("s/rev/c_file.c")
     assert_file_not_exist("i/rev/c_file.h")
@@ -176,28 +190,41 @@ task :integration_test do
     assert_test_run_contains("No tests executed")
 
     # Verify stubbing functionality can make a new source file
-    puts "\nVerifying Stubbing:"
+    puts_heading "Verifying Stubbing:"
     prep_stub(1)
-    call_stub("i:stubby")
+    call_stub("rev:stubby")
     assert_file_contains("s/rev/stubby.c","void shorty")
 
     # Verify stubbing functionality can update a source file
-    puts "\nVerifying Stub Updating:"
+    puts_heading "Verifying Stub Updating:"
     prep_stub(2)
-    call_stub("i:stubby")
+    call_stub("rev:stubby")
     assert_file_contains("s/rev/stubby.c","void shorty")
     assert_file_contains("s/rev/stubby.c","void shrimpy")
     assert_file_contains("s/rev/stubby.c","int tiny")
 
     # Make sure that we can destroy modules properly even when the
     # entire set doesn't exist
-    puts "\nVerifying Partial Destroy:"
-    call_destroy("i:stubby")
+    puts_heading "Verifying Partial Destroy:"
+    call_destroy("rev:stubby")
     assert_file_not_exist("s/rev/stubby.c")
     assert_file_not_exist("i/rev/stubby.h")
-    prep_test
 
-    puts "\nPASSES MODULE SELF-TESTS"
+    # Make sure that it complains about path hints that don't match paths
+    puts_heading "Verifying Matcher Failure Handling:"
+    call_create_expecting_error("bad:stubby")
+    assert_file_not_exist("s/bad/stubby.c")
+    assert_file_not_exist("i/bad/stubby.h")
+
+    # Make sure it allows us to create a subdir if slash used
+    puts_heading "Verifying Default Create:"
+    call_create("slash/d_file")
+    assert_file_exist("s/slash/d_file.c")
+    assert_file_exist("i/slash/d_file.h")
+    assert_file_exist("sub/t/slash/test_d_file.c")
+
+    prep_test
+    puts_heading "PASSES MODULE SELF-TESTS"
 
   end
 end

data/plugins/module_generator/config/module_generator.yml

@@ -6,7 +6,6 @@
 # =========================================================================
 
 :module_generator:
-  :project_root: ./
   :naming: :snake #options: :bumpy, :camel, :caps, or :snake
   :boilerplates: 
     :src: ""

data/plugins/module_generator/example/project.yml

@@ -162,14 +162,13 @@
   :release: []
 
 :module_generator:
-  :project_root: ./
   :naming: :snake #options: :bumpy, :camel, :caps, or :snake
   :boilerplates: 
     :src: "/* MAY THE SOURCE BE WITH YOU */"
     :inc: |
       /* ==================================
       |  It's important to make everyone
-      |  feel included, particularly in 
+      |  feel included, particularly 
       |  when making important decisions.
       ===================================*/
     :tst: "// Don't Test Me, Sir."

data/plugins/module_generator/lib/module_generator.rb

@@ -12,7 +12,7 @@ require 'fileutils'
 
 class ModuleGenerator < Plugin
 
-  attr_reader :config
+  attr_reader :config, :interactionizer
 
   def create(module_name, optz={})
 
@@ -110,10 +110,10 @@ class ModuleGenerator < Plugin
       unity_generator_options[:path_tst] ||= unity_generator_options[:paths_tst][0]
     else
       # A path was specified. Do our best to determine which is the best choice based on this information
-      unity_generator_options[:skeleton_path] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_src], :ignore) || unity_generator_options[:paths_src][0]
-      unity_generator_options[:path_src] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_src], :ignore) || unity_generator_options[:paths_src][0]
-      unity_generator_options[:path_inc] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_inc], :ignore) || unity_generator_options[:paths_inc][0]
-      unity_generator_options[:path_tst] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_tst], :ignore) || unity_generator_options[:paths_tst][0]
+      unity_generator_options[:path_src] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_src], :error, 'source')  || unity_generator_options[:paths_src][0]
+      unity_generator_options[:path_inc] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_inc], :error, 'include') || unity_generator_options[:paths_inc][0]
+      unity_generator_options[:path_tst] = @ceedling[:file_finder_helper].find_best_path_in_collection(optz[:module_root_path], unity_generator_options[:paths_tst], :error, 'test')    || unity_generator_options[:paths_tst][0]
+      unity_generator_options[:skeleton_path] = unity_generator_options[:path_src]
     end
 
     return unity_generator_options

data/spec/gcov/gcov_test_cases_spec.rb

@@ -33,7 +33,7 @@ module GcovTestCases
   end
 
   def prep_project_yml_for_coverage
-    FileUtils.cp test_asset_path("project_as_gem.yml"), "project.yml"
+    FileUtils.cp test_asset_path("project.yml"), "project.yml"
     @c.uncomment_project_yml_option_for_test("- gcov")
     @c.comment_project_yml_option_for_test("- gcovr") unless @gcov_reports.include? :gcovr
     @c.uncomment_project_yml_option_for_test("- ReportGenerator") if @gcov_reports.include? :reportgenerator

data/spec/parsing_parcels_spec.rb

@@ -0,0 +1,66 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'spec_helper'
+require 'ceedling/parsing_parcels'
+
+describe ParsingParcels do
+  before(:each) do
+
+    @parsing_parcels = described_class.new()
+  end
+
+  context "#code_lines" do
+    it "should clean code of encoding problems and comments" do
+      file_contents = <<~CONTENTS
+      /* TEST_SOURCE_FILE("foo.c") */    // Eliminate single line comment block
+      // TEST_SOURCE_FILE("bar.c")       // Eliminate single line comment
+      Some text⛔️
+      /* // /*                           // Eliminate tricky comment block enclosing comments
+        TEST_SOURCE_FILE("boom.c")
+        */   //                          // Eliminate trailing single line comment following block comment
+      More text
+      #define STR1 "/* comment  "        // Strip out (single line) C string containing block comment
+      #define STR2 "  /* comment  "      // Strip out (single line) C string containing block comment
+      CONTENTS
+
+      got = []
+
+      @parsing_parcels.code_lines( StringIO.new( file_contents ) ) do |line|
+        line.strip!
+        got << line if !line.empty?
+      end
+
+      expected = [
+        'Some text', # ⛔️ removed with encoding sanitizing
+        'More text',
+        "#define STR1",
+        "#define STR2"
+      ]
+
+      expect( got ).to eq expected
+    end
+
+    it "should treat continuations as a single line" do
+      file_contents = "// TEST_SOURCE_FILE(\"foo.c\") \\  \nTEST_SOURCE_FILE(\"bar.c\")\nSome text⛔️ \\\nMore text\n"
+      got = []
+
+      @parsing_parcels.code_lines( StringIO.new( file_contents ) ) do |line|
+        line.strip!
+        got << line if !line.empty?
+      end
+
+      expected = [
+        'Some text More text'
+      ]
+
+      expect( got ).to eq expected
+    end
+
+  end
+
+end

data/spec/preprocessinator_extractor_spec.rb

@@ -5,17 +5,28 @@
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
+require 'spec_helper'
 require 'ceedling/preprocessinator_extractor'
+require 'ceedling/parsing_parcels'
 
 describe PreprocessinatorExtractor do
+  before(:each) do
+    @parsing_parcels = ParsingParcels.new()
+    @extractor = described_class.new(
+      {
+        :parsing_parcels => @parsing_parcels
+      }
+    )
+  end
+
   context "#extract_file_as_array_from_expansion" do
     it "should simply extract text of original file from preprocessed expansion" do
-      filepath = "path/to/WANT.c"
+      filepath = "path/do/WANT.c"
       
       file_contents = [
         '# 1 "some/file/we/do/not/care/about.c" 5',
         'some_text_we_do_not_want();',
-        '# 11 "some/file/we/DO/WANT.c" 99999',       # Beginning of block to extract
+        '# 11 "path/do/WANT.c" 99999',               # Beginning of block to extract
         'some_text_we_do_want();',                   #  Line to extract
         '',                                          #  Blank line to extract
         'some_awesome_text_we_want_so_hard();',      #  Line to extract
@@ -32,17 +43,17 @@ describe PreprocessinatorExtractor do
 
       input = StringIO.new( file_contents.join( "\n" ) )
 
-      expect( subject.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
+      expect( @extractor.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
     end
 
     it "should extract text of original file from preprocessed expansion preserving #directives and cleaning up whitespace)" do
       filepath = "this/path/MY_FILE.C"
       
       file_contents = [
-        '# 1 "MY_FILE.C" 99999',                     # Beginning of block to extract
+        '# 1 "./this/path/MY_FILE.C" 99999',         # Beginning of block to extract
         '       ',                                   #  Whitespace collapse & preserve as blank line
-        '#pragma yo sup',                            #  Line to extract -- #pragma is not end-of-block preprocessor directive
-        '#define FOO(...)',                          #  Line to extract -- #define is not end-of-block preprocessor directive
+        '#pragma yo sup',                            #  Line to extract -- #pragma is not end-of-block preprocessor line marker
+        '#define FOO(...)',                          #  Line to extract -- #define is not end-of-block preprocessor line marker
         'void some_function(void) {',                #  Line to extract
         '  do_something();   ',                      #  Line to extract with leading whitespace that should remain
         '  }',                                       #  Line to extract with leading whitespace that should remain
@@ -62,17 +73,17 @@ describe PreprocessinatorExtractor do
 
       input = StringIO.new( file_contents.join( "\n" ) )
 
-      expect( subject.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
+      expect( @extractor.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
     end
 
-    it "should extract text of original file from preprocessed expansion with complex preprocessor directive sequence" do
+    it "should extract text of original file from preprocessed expansion with complex preprocessor line marker sequence" do
       filepath = "dir/our_file.c"
       
       file_contents = [
         '# 1 "dir/our_file.c" 123',                  # Beginning of file / block to extract
         'some_text_we_do_want();',                   #  Line to extract
         'some_awesome_text_we_want_so_hard();',      #  Line to extract
-        '# 987 "some preprocessor directive"',       # End of block to extract (faux preprocessor directive)
+        '# 3 "some preprocessor directive"',         # End of block to extract (a directive that is a faux preprocessor line marker)
         '',
         'some_text_we_do_not_want();',
         '# 15 "dir/our_file.c" 9',                   # Beginning of block to extract
@@ -97,18 +108,68 @@ describe PreprocessinatorExtractor do
 
       input = StringIO.new( file_contents.join( "\n" ) )
 
-      expect( subject.extract_file_as_array_from_expansion(input, filepath) ).to eq expected
+      expect( @extractor.extract_file_as_array_from_expansion(input, filepath) ).to eq expected
+    end
+  
+    it "should extract text of original file from preprocessed expansion ignoring embedded expansions having similar names" do
+      filepath = "dir1/dir2/our_file.c"
+      
+      file_contents = [
+        '# 1 "dir1/dir2/our_file.c" 123',            # Beginning of file / block to extract
+        'some_text_we_do_want();',                   #  Line to extract
+        'some_awesome_text_we_want_so_hard();',      #  Line to extract
+        '# 987 "some preprocessor directive"',       # End of block to extract (a directive that is a faux preprocessor line marker)
+        '',
+        'some_text_we_do_not_want();',
+        '# 15 "dir1/dir2/not_our_file.c" 9',         # Beginning of block we should ignore despite similar filename
+        'more_text_we_want();',                      #  Line to ignore
+        'void some_function(void) { func(); }',      #  Line to ignore
+        '# 9 "dir1/dir2/not_our_file.c" 77',         # Continuation of block to ignore
+        'some code',                                 #  Line to ignore
+        'test statements',                           #  Line to ignore
+        '# 6 "dir1/dir2/not_our_file.c" 19',         # Continuation of block to ignore
+        'some_additional_unwanted_text();',          #  Line to ignore
+        '',
+        'some_more_text_we_do_not_want();',
+        '# 11 "dir11/dir2/our_file.c" 9',            # Beginning of block we should ignore despite similar filepath
+        'more_text_we_want();',                      #  Line to ignore
+        'void some_function(void) { func(); }',      #  Line to ignore
+        '# 9 "dir11/dir2/our_file.c" 2 3',           # Continuation of block to ignore
+        'some code',                                 #  Line to ignore
+        'test statements',                           #  Line to ignore
+        '# 6 "dir11/dir2/our_file.c" 1',             # Continuation of block to ignore
+        'some_further_unwanted_text();',             #  Line to ignore
+        '',
+        'even_more_text_we_do_not_want();',
+        '# 11 "dir2/our_file.c" 9',                  # Beginning of block we should ignore despite similar sub-filepath
+        'more_text_we_want();',                      #  Line to ignore
+        'void some_function(void) { func(); }',      #  Line to ignore
+        '# 9 "dir2/our_file.c" 2 3',                 # Continuation of block to ignore
+        'some code',                                 #  Line to ignore
+        'test statements',                           #  Line to ignore
+        '# 6 "dir2/our_file.c" 1',                   # Continuation of block to ignore
+        'some_further_unwanted_text();'              #  Line to ignore
+      ]                                              # End of file / end of block to extract
+
+      expected = [
+        'some_text_we_do_want();',
+        'some_awesome_text_we_want_so_hard();',
+      ]
+
+      input = StringIO.new( file_contents.join( "\n" ) )
+
+      expect( @extractor.extract_file_as_array_from_expansion(input, filepath) ).to eq expected
     end
   end
 
   context "#extract_file_as_string_from_expansion" do
     it "should simply extract text of original file from preprocessed expansion" do
-      filepath = "path/to/WANT.c"
+      filepath = "path/do/WANT.c"
       
       file_contents = [
         '# 1 "some/file/we/do/not/care/about.c" 5',
         'some_text_we_do_not_want();',
-        '# 11 "some/file/we/DO/WANT.c" 99999',       # Beginning of block to extract
+        '# 11 "./path/do/WANT.c" 99999',             # Beginning of block to extract
         'some_text_we_do_want();',                   #  Line to extract
         '',                                          #  Blank line to extract
         'some_awesome_text_we_want_so_hard();',      #  Line to extract
@@ -125,7 +186,7 @@ describe PreprocessinatorExtractor do
 
       input = StringIO.new( file_contents.join( "\n" ) )
 
-      expect( subject.extract_file_as_string_from_expansion( input, filepath ) ).to eq expected
+      expect( @extractor.extract_file_as_string_from_expansion( input, filepath ) ).to eq expected
     end
   end
 
@@ -146,7 +207,27 @@ describe PreprocessinatorExtractor do
         'TEST_INCLUDE_PATH("hello/there")'
       ]
 
-      expect( subject.extract_test_directive_macro_calls( file_text ) ).to eq expected
+      expect( @extractor.extract_test_directive_macro_calls( file_text ) ).to eq expected
+    end
+  end
+
+  context "#extract_test_directive_macro_calls" do
+    it "should extract only uncommented calls" do
+      file_text = <<~FILE_TEXT
+        TEST_SOURCE_FILE("foo/bar/file.c")//TEST_SOURCE_FILE("yo/data.c")
+
+            TEST_INCLUDE_PATH("some/inc/dir")
+        SOME_MACRO(TEST_INCLUDE_PATH("another/dir")) TEST_INCLUDE_PATH("hello/there")
+      FILE_TEXT
+
+      expected = [
+        'TEST_SOURCE_FILE("foo/bar/file.c")',
+        'TEST_INCLUDE_PATH("some/inc/dir")',
+        'TEST_INCLUDE_PATH("another/dir")',
+        'TEST_INCLUDE_PATH("hello/there")'
+      ]
+
+      expect( @extractor.extract_test_directive_macro_calls( file_text ) ).to eq expected
     end
   end
 
@@ -177,15 +258,15 @@ describe PreprocessinatorExtractor do
       expected = [
         "#pragma pack(1)",
         [
-          "#pragma TOOL command \\",
-          "          with_some_args  \\",
+          "#pragma TOOL command ",
+          "          with_some_args  ",
           "          that wrap"
-        ],
+        ].join,
         "#pragma warning(disable : 4996)",
         "#pragma GCC optimize(\"O3\")"
       ]
 
-      expect( subject.extract_pragmas( file_text ) ).to eq expected
+      expect( @extractor.extract_pragmas( file_text ) ).to eq expected
     end
   end
 
@@ -200,7 +281,7 @@ describe PreprocessinatorExtractor do
         #endif // _HEADER_INCLUDE_GUARD_
       FILE_TEXT
 
-      expect( subject.extract_include_guard( file_text ) ).to eq '_HEADER_INCLUDE_GUARD_'
+      expect( @extractor.extract_include_guard( file_text ) ).to eq '_HEADER_INCLUDE_GUARD_'
     end
 
     it "should extract the first text that looks like an include guard from among file text" do
@@ -216,7 +297,7 @@ describe PreprocessinatorExtractor do
         #endif // HEADER_INCLUDE_GUARD
       FILE_TEXT
 
-      expect( subject.extract_include_guard( file_text ) ).to eq 'HEADER_INCLUDE_GUARD'
+      expect( @extractor.extract_include_guard( file_text ) ).to eq 'HEADER_INCLUDE_GUARD'
     end
 
     it "should not extract an include guard from among file text" do
@@ -229,7 +310,7 @@ describe PreprocessinatorExtractor do
         #endif // SOME_GUARD_NAME
       FILE_TEXT
 
-      expect( subject.extract_include_guard( file_text ) ).to eq nil
+      expect( @extractor.extract_include_guard( file_text ) ).to eq nil
     end
   end
 
@@ -279,26 +360,26 @@ describe PreprocessinatorExtractor do
         "#define SQUARE(x) ((x) * (x))",
         "#define MAX(a, b) ((a) > (b) ? (a) : (b))",
         [
-          "#define MACRO(num, str) {\\",
-          "            printf(\"%d\", num);\\",
-          "            printf(\" is\");            \\",
-          "            printf(\" %s number\", str);\\",
-          "            printf(\"\\n\");\\",
+          "#define MACRO(num, str) {",
+          "            printf(\"%d\", num);",
+          "            printf(\" is\");            ",
+          "            printf(\" %s number\", str);",
+          "            printf(\"\\n\");",
           "           }"
-        ],
+        ].join,
         [
-          "#define LONG_STRING \"This is a very long string that \\",
+          "#define LONG_STRING \"This is a very long string that ",
           "                      continues on the next line\""
-        ],
+        ].join,
         [
-          "#define MULTILINE_MACRO do { \\",
-          "      something(); \\",
-          "      something_else(); \\",
+          "#define MULTILINE_MACRO do { ",
+          "      something(); ",
+          "      something_else(); ",
           "    } while(0)"
-        ]
+        ].join
       ]
 
-      expect( subject.extract_macro_defs( file_text, nil ) ).to eq expected
+      expect( @extractor.extract_macro_defs( file_text, nil ) ).to eq expected
     end
 
     it "should ignore include guard among macro defintions in file text" do
@@ -316,13 +397,10 @@ describe PreprocessinatorExtractor do
 
       expected = [
         "#define PI 3.14159",
-        [
-          "#define LONG_STRING \"This is a very long string that \\",
-          "                      continues on the next line\""
-        ]
+        "#define LONG_STRING \"This is a very long string that                       continues on the next line\""
       ]
 
-      expect( subject.extract_macro_defs( file_text, '_INCLUDE_GUARD_' ) ).to eq expected
+      expect( @extractor.extract_macro_defs( file_text, '_INCLUDE_GUARD_' ) ).to eq expected
     end
 
   end

data/spec/test_context_extractor_spec.rb

@@ -7,11 +7,13 @@
 
 require 'spec_helper'
 require 'ceedling/test_context_extractor'
+require 'ceedling/parsing_parcels'
 require 'ceedling/exceptions'
 
 describe TestContextExtractor do
   before(:each) do
     # Mock injected dependencies
+    @parsing_parcels = ParsingParcels.new()
     @configurator = double( "Configurator" ) # Use double() so we can mock needed methods that are added dynamically at startup
     @file_wrapper = double( "FileWrapper" ) # Not actually exercised in these test cases
     loginator = instance_double( "Loginator" )
@@ -41,6 +43,7 @@ describe TestContextExtractor do
       {
         :configurator => @configurator,
         :file_wrapper => @file_wrapper,
+        :parsing_parcels => @parsing_parcels,
         :loginator => loginator
       }
     )
@@ -94,39 +97,6 @@ describe TestContextExtractor do
     end
   end
 
-  context "#code_lines" do
-    it "should clean code of encoding problems and comments" do
-      file_contents = <<~CONTENTS
-      /* TEST_SOURCE_FILE("foo.c") */    // Eliminate single line comment block
-      // TEST_SOURCE_FILE("bar.c")       // Eliminate single line comment
-      Some text⛔️
-      /* // /*                           // Eliminate tricky comment block enclosing comments
-        TEST_SOURCE_FILE("boom.c")
-        */   //                          // Eliminate trailing single line comment following block comment
-      More text
-      #define STR1 "/* comment  "        // Strip out (single line) C string containing block comment
-      #define STR2 "  /* comment  "      // Strip out (single line) C string containing block comment
-      CONTENTS
-
-      got = []
-
-      @extractor.code_lines( StringIO.new( file_contents ) ) do |line|
-        line.strip!
-        got << line if !line.empty?
-      end
-
-      expected = [
-        'Some text', # ⛔️ removed with encoding sanitizing
-        'More text',
-        "#define STR1",
-        "#define STR2"
-      ]
-
-      expect( got ).to eq expected
-    end
-
-  end
-
   context "#extract_includes" do
     it "should extract #include directives from code" do
       # Complex comments tested in `clean_code_line()` test case