ceedling 0.31.1 → 1.0.1

data/spec/support/other_target.yml

@@ -0,0 +1,7 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+

data/spec/support/target.yml

@@ -0,0 +1,7 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+

data/spec/support/test_example.fail

@@ -1,7 +1,8 @@
 ---
 :source:
-  :path: some/place
-  :file: test_example.c
+  :file: some/place/test_example.c
+  :dirname: some/place
+  :basename: test_example.c
 :successes: []
 :failures:
 - :test: test_one

data/spec/support/test_example.pass

@@ -1,7 +1,8 @@
 ---
 :source:
-  :path: some/place
-  :file: test_example.c
+  :file: some/place/test_example.c
+  :dirname: some/place
+  :basename: test_example.c
 :successes:
 - :test: test_one
   :line: 257

data/spec/support/test_example_empty.pass

@@ -1,7 +1,8 @@
 ---
 :source:
-  :path: some/place
-  :file: test_example.c
+  :file: some/place/test_example.c
+  :dirname: some/place
+  :basename: test_example.c
 :successes: []
 :failures: []
 :ignores: []

data/spec/support/test_example_ignore.pass

@@ -1,7 +1,8 @@
 ---
 :source:
-  :path: some/place
-  :file: test_example.c
+  :file: some/place/test_example.c
+  :dirname: some/place
+  :basename: test_example.c
 :successes: []
 :failures: []
 :ignores:

data/spec/support/test_example_mangled.pass

@@ -1,7 +1,8 @@
 ---
 :source:
-  :path: some/place
-  :file: test_example.c
+  :file: some/place/test_example.c
+  :dirname: some/place
+  :basename: test_example.c
 :successes:
 - :test: test_one
   :line: 257

data/spec/support/test_example_with_time.pass

@@ -1,7 +1,8 @@
 ---
 :source:
-  :path: some/place
-  :file: test_example.c
+  :file: some/place/test_example.c
+  :dirname: some/place
+  :basename: test_example.c
 :successes:
 - :test: test_one
   :line: 257

data/spec/system/deployment_as_gem_spec.rb

@@ -0,0 +1,76 @@
+# =========================================================================
+#   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_system_helper'
+
+describe "Ceedling" do
+  include CeedlingTestCases
+
+  before :all do
+    @c = SystemContext.new
+    @c.deploy_gem
+  end
+
+  after :all do
+    FileUtils.rm_rf( 'GIT_COMMIT_SHA' )
+    @c.done!
+  end
+
+  before { @proj_name = "fake_project" }
+  after { @c.with_context { FileUtils.rm_rf @proj_name } }
+
+  describe "deployed as a gem" do
+    before do
+      FileUtils.rm_rf( 'GIT_COMMIT_SHA' )
+      @c.with_context do
+        `bundle exec ruby -S ceedling new #{@proj_name} 2>&1`
+      end
+    end
+
+    it { can_report_version_no_git_commit_sha }
+    it { can_report_version_with_git_commit_sha }
+    it { can_create_projects }
+    it { does_not_contain_a_vendor_directory }
+    it { can_fetch_non_project_help }
+    it { can_fetch_project_help }
+    it { can_test_projects_with_success }
+    it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_test_name_replaced_defines_with_success }
+    it { can_test_projects_unity_parameterized_test_cases_with_success }
+    #it { can_test_projects_unity_parameterized_test_cases_with_preprocessor_with_success }
+    it { can_test_projects_with_preprocessing_for_test_files_symbols_undefined }
+    it { can_test_projects_with_preprocessing_for_test_files_symbols_defined }
+    it { can_test_projects_with_preprocessing_for_mocks_success }
+    it { can_test_projects_with_preprocessing_for_mocks_intentional_build_failure }
+    it { can_test_projects_with_preprocessing_all }
+    it { can_test_projects_with_success_default }
+    it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
+    it { can_test_projects_with_fail }
+    it { can_test_projects_with_fail_alias }
+    it { can_test_projects_with_fail_default }
+    it { can_test_projects_with_compile_error }
+    it { can_test_projects_with_both_mock_and_real_header }
+    it { can_test_projects_with_success_when_space_appears_between_hash_and_include }
+    it { can_test_projects_with_named_verbosity }
+    it { can_test_projects_with_numerical_verbosity }
+    it { uses_report_tests_raw_output_log_plugin }
+    it { test_run_of_projects_fail_because_of_crash_without_report }
+    it { test_run_of_projects_fail_because_of_crash_with_report }
+    it { execute_all_test_cases_from_crashing_test_runner_and_return_test_report_with_failue }
+    it { execute_and_collect_debug_logs_from_crashing_test_case_defined_by_test_case_argument_with_enabled_debug }
+    it { execute_and_collect_debug_logs_from_crashing_test_case_defined_by_exclude_test_case_argument_with_enabled_debug }
+    it { confirm_if_notification_for_cmdline_args_not_enabled_is_disabled }
+    it { can_run_single_test_with_full_test_case_name_from_test_file_with_success }
+    it { can_run_single_test_with_partial_test_case_name_from_test_file_with_success }
+    it { exclude_test_case_name_filter_works_and_only_one_test_case_is_executed }
+    it { none_of_test_is_executed_if_test_case_name_passed_does_not_fit_defined_in_test_file }
+    it { none_of_test_is_executed_if_test_case_name_and_exclude_test_case_name_is_the_same }
+    it { run_one_testcase_from_one_test_file_when_test_case_name_is_passed }
+  end
+
+end

data/spec/system/deployment_as_vendor_spec.rb

@@ -0,0 +1,123 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-24 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'spec_system_helper'
+
+describe "Ceedling" do
+  include CeedlingTestCases
+
+  before :all do
+    @c = SystemContext.new
+    @c.deploy_gem
+  end
+
+  after :all do
+    # Ensure version commit file is cleaned up
+    FileUtils.rm_rf( 'GIT_COMMIT_SHA' )
+    @c.done!
+  end
+
+  before { @proj_name = "fake_project" }
+  after { @c.with_context { FileUtils.rm_rf @proj_name } }
+
+  describe "deployed in a project's `vendor` directory." do
+    before do
+      # Ensure version commit file is cleaned up
+      FileUtils.rm_rf( 'GIT_COMMIT_SHA' )
+      @c.with_context do
+        `bundle exec ruby -S ceedling new --local --docs #{@proj_name} 2>&1`
+      end
+    end
+
+    it { can_report_version_no_git_commit_sha }
+    it { can_report_version_with_git_commit_sha }
+    it { can_create_projects }
+    it { contains_a_vendor_directory }
+    it { contains_documentation }
+    it { can_fetch_non_project_help }
+    it { can_fetch_project_help }
+    it { can_test_projects_with_success }
+    it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_test_name_replaced_defines_with_success }
+    it { can_test_projects_unity_parameterized_test_cases_with_success }
+    #it { can_test_projects_unity_parameterized_test_cases_with_preprocessor_with_success }
+    it { can_test_projects_with_preprocessing_for_test_files_symbols_undefined }
+    it { can_test_projects_with_preprocessing_for_test_files_symbols_defined }
+    it { can_test_projects_with_preprocessing_for_mocks_success }
+    it { can_test_projects_with_preprocessing_for_mocks_intentional_build_failure }
+    it { can_test_projects_with_preprocessing_all }
+    it { can_test_projects_with_success_default }
+    it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
+    it { can_test_projects_with_fail }
+    it { can_test_projects_with_fail_alias }
+    it { can_test_projects_with_fail_default }
+    it { can_test_projects_with_compile_error }
+    it { can_test_projects_with_both_mock_and_real_header }
+    it { can_test_projects_with_success_when_space_appears_between_hash_and_include }
+    it { can_test_projects_with_named_verbosity }
+    it { can_test_projects_with_numerical_verbosity }
+    it { uses_report_tests_raw_output_log_plugin }
+    it { test_run_of_projects_fail_because_of_crash_without_report }
+    it { test_run_of_projects_fail_because_of_crash_with_report }
+    it { execute_all_test_cases_from_crashing_test_runner_and_return_test_report_with_failue }
+    it { execute_and_collect_debug_logs_from_crashing_test_case_defined_by_test_case_argument_with_enabled_debug }
+    it { execute_and_collect_debug_logs_from_crashing_test_case_defined_by_exclude_test_case_argument_with_enabled_debug }
+    it { confirm_if_notification_for_cmdline_args_not_enabled_is_disabled }
+    it { can_run_single_test_with_full_test_case_name_from_test_file_with_success }
+    it { can_run_single_test_with_partial_test_case_name_from_test_file_with_success }
+    it { exclude_test_case_name_filter_works_and_only_one_test_case_is_executed }
+    it { none_of_test_is_executed_if_test_case_name_passed_does_not_fit_defined_in_test_file }
+    it { none_of_test_is_executed_if_test_case_name_and_exclude_test_case_name_is_the_same }
+    it { run_one_testcase_from_one_test_file_when_test_case_name_is_passed }
+  end
+
+  describe "deployed in a project's `vendor` directory with git support." do
+    before do
+      @c.with_context do
+        `bundle exec ruby -S ceedling new --local --docs --gitsupport #{@proj_name} 2>&1`
+      end
+    end
+
+    it { can_create_projects }
+    it { has_git_support }
+    it { contains_a_vendor_directory }
+    it { contains_documentation }
+    it { can_test_projects_with_success }
+  end
+
+  describe "deployed in a project's `vendor` directory without docs." do
+    before do
+      @c.with_context do
+        `bundle exec ruby -S ceedling new --local #{@proj_name} 2>&1`
+      end
+    end
+
+    it { can_create_projects }
+    it { contains_a_vendor_directory }
+    it { does_not_contain_documentation }
+    it { can_fetch_non_project_help }
+    it { can_fetch_project_help }
+    it { can_test_projects_with_success }
+    it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_test_name_replaced_defines_with_success }
+    it { can_test_projects_unity_parameterized_test_cases_with_success }
+    it { can_test_projects_with_preprocessing_for_test_files_symbols_undefined }
+    it { can_test_projects_with_preprocessing_for_test_files_symbols_defined }
+    it { can_test_projects_with_preprocessing_for_mocks_success }
+    it { can_test_projects_with_preprocessing_for_mocks_intentional_build_failure }
+    it { can_test_projects_with_preprocessing_all }
+    it { can_test_projects_with_success_default }
+    it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
+    it { can_test_projects_with_fail }
+    it { can_test_projects_with_fail_alias }
+    it { can_test_projects_with_fail_default }
+    it { can_test_projects_with_compile_error }
+  end
+
+end

data/spec/system/example_temp_sensor_spec.rb

@@ -0,0 +1,264 @@
+# =========================================================================
+#   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_system_helper'
+
+describe "Ceedling" do
+  include CeedlingTestCases
+
+  before :all do
+    @c = SystemContext.new
+    @c.deploy_gem
+  end
+
+  after :all do
+    @c.done!
+  end
+
+  before { @proj_name = "temp_sensor" }
+  after { @c.with_context { FileUtils.rm_rf @proj_name } }
+
+  describe "command: `ceedling examples`" do
+    before do
+      @c.with_context do
+        @output = `bundle exec ruby -S ceedling examples 2>&1`
+      end
+    end
+
+    it "should list out all the examples" do
+      expect(@output).to match(/temp_sensor/)
+    end
+  end
+
+  describe "command: `ceedling example temp_sensor`" do
+    describe "temp_sensor" do
+      before do
+        @c.with_context do
+          output = `bundle exec ruby -S ceedling example temp_sensor 2>&1`
+          expect(output).to match(/created/)
+        end
+      end
+
+      it "should be testable" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:all 2>&1`
+            expect(@output).to match(/TESTED:\s+51/)
+            expect(@output).to match(/PASSED:\s+51/)
+          end
+        end
+      end
+
+      it "should be able to test a single module (it includes file-specific flags)" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:TemperatureCalculator 2>&1`
+            expect(@output).to match(/TESTED:\s+2/)
+            expect(@output).to match(/PASSED:\s+2/)
+
+            expect(@output).to match(/TemperatureCalculator\.out/i)
+          end
+        end
+      end
+
+      it "should be able to test multiple files matching a pattern" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:pattern[Temp] 2>&1`
+            expect(@output).to match(/TESTED:\s+6/)
+            expect(@output).to match(/PASSED:\s+6/)
+
+            expect(@output).to match(/TemperatureCalculator\.out/i)
+            expect(@output).to match(/TemperatureFilter\.out/i)
+          end
+        end
+      end
+
+      it "should be able to test all files matching in a path" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:path[adc] 2>&1`
+            expect(@output).to match(/TESTED:\s+15/)
+            expect(@output).to match(/PASSED:\s+15/)
+
+            expect(@output).to match(/AdcModel\.out/i)
+            expect(@output).to match(/AdcHardware\.out/i)
+            expect(@output).to match(/AdcConductor\.out/i)
+          end
+        end
+      end
+
+      it "should be able to test specific test cases in a file" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:path[adc] --test-case="RunShouldNot" 2>&1`
+            expect(@output).to match(/TESTED:\s+2/)
+            expect(@output).to match(/PASSED:\s+2/)
+
+            expect(@output).to match(/AdcModel\.out/i)
+            expect(@output).to match(/AdcHardware\.out/i)
+            expect(@output).to match(/AdcConductor\.out/i)
+          end
+        end
+      end
+
+      it "should be able to test when using a custom Unity Helper file added by relative-path mixin" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:all --verbosity=obnoxious --mixin=mixin/add_unity_helper.yml 2>&1`
+            expect(@output).to match(/Merging command line mixin using mixin\/add_unity_helper\.yml/)
+            expect(@output).to match(/TESTED:\s+51/)
+            expect(@output).to match(/PASSED:\s+51/)
+          end
+        end
+      end
+
+      it "should be able to test when using a custom Unity Helper file added by simple-named mixin" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:all --verbosity=obnoxious --mixin=add_unity_helper 2>&1`
+            expect(@output).to match(/Merging command line mixin using mixin\/add_unity_helper\.yml/)
+            expect(@output).to match(/TESTED:\s+51/)
+            expect(@output).to match(/PASSED:\s+51/)
+          end
+        end
+      end
+
+      it "should be able to test when using a custom Unity Helper file added by env-named mixin" do
+        @c.with_context do
+          ENV['CEEDLING_MIXIN_1'] = 'mixin/add_unity_helper.yml'
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling test:all --verbosity=obnoxious 2>&1`
+            expect(@output).to match(/Merging CEEDLING_MIXIN_1 mixin using mixin\/add_unity_helper\.yml/)
+            expect(@output).to match(/TESTED:\s+51/)
+            expect(@output).to match(/PASSED:\s+51/)
+          end
+        end
+      end
+
+      it "should be able to report the assembly files found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling files:assembly 2>&1`
+
+            expect(@output).to match(/Assembly files: None/i)
+          end
+        end
+      end
+
+      it "should be able to report the header files found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling files:header 2>&1`
+
+            expect(@output).to match(/Header files:/i)
+            expect(@output).to match(/src\/AdcModel\.h/i)
+            expect(@output).to match(/src\/AdcHardware\.h/i)
+            expect(@output).to match(/src\/AdcConductor\.h/i)
+            expect(@output).to match(/src\/Main\.h/i)
+            expect(@output).to match(/src\/UsartTransmitBufferStatus\.h/i)
+            #and many more
+
+            expect(@output).to match(/test\/support\/UnityHelper\.h/i)
+          end
+        end
+      end
+
+      it "should be able to report the source files found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling files:source 2>&1`
+
+            expect(@output).to match(/Source files:/i)
+            expect(@output).to match(/src\/AdcModel\.c/i)
+            expect(@output).to match(/src\/AdcHardware\.c/i)
+            expect(@output).to match(/src\/AdcConductor\.c/i)
+            expect(@output).to match(/src\/Main\.c/i)
+            expect(@output).to match(/src\/UsartTransmitBufferStatus\.c/i)
+            #and many more
+
+            expect(@output).not_to match(/test\/support\/UnityHelper\.c/i)
+          end
+        end
+      end
+
+      it "should be able to report the support files found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling files:support 2>&1`
+
+            expect(@output).to match(/Support files:/i)
+            expect(@output).to match(/test\/support\/UnityHelper\.c/i)
+          end
+        end
+      end
+
+      it "should be able to report the test files found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling files:test 2>&1`
+
+            expect(@output).to match(/Test files:/i)
+            expect(@output).to match(/test\/adc\/TestAdcModel\.c/i)
+            expect(@output).to match(/test\/adc\/TestAdcHardware\.c/i)
+            expect(@output).to match(/test\/adc\/TestAdcConductor\.c/i)
+            expect(@output).to match(/test\/TestMain\.c/i)
+            expect(@output).to match(/test\/TestUsartBaudRateRegisterCalculator.c/i)
+          end
+        end
+      end
+
+      it "should be able to report the header paths found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling paths:include 2>&1`
+
+            expect(@output).to match(/Include paths:/i)
+            expect(@output).to match(/src/i)
+          end
+        end
+      end
+
+      it "should be able to report the source paths found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling paths:source 2>&1`
+
+            expect(@output).to match(/Source paths:/i)
+            expect(@output).to match(/src/i)
+          end
+        end
+      end
+
+      it "should be able to report the support paths found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling paths:support 2>&1`
+
+            expect(@output).to match(/Support paths:/i)
+            expect(@output).to match(/test\/support/i)
+          end
+        end
+      end
+
+      it "should be able to report the test paths found in paths" do
+        @c.with_context do
+          Dir.chdir "temp_sensor" do
+            @output = `bundle exec ruby -S ceedling paths:test 2>&1`
+
+            expect(@output).to match(/Test paths:/i)
+            expect(@output).to match(/test/i)
+            expect(@output).to match(/test\/adc/i)
+
+            expect(@output).not_to match(/test\/support/i)
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/system/upgrade_as_vendor_spec.rb

@@ -0,0 +1,68 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-24 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'spec_system_helper'
+
+describe "Ceedling" do
+  include CeedlingTestCases
+
+  before :all do
+    @c = SystemContext.new
+    @c.deploy_gem
+  end
+
+  after :all do
+    @c.done!
+  end
+
+  before { @proj_name = "fake_project" }
+  after { @c.with_context { FileUtils.rm_rf @proj_name } }
+
+  describe "upgrade a project's `vendor` directory" do
+    before do
+      @c.with_context do
+        `bundle exec ruby -S ceedling new --local #{@proj_name} 2>&1`
+      end
+    end
+
+    it { can_create_projects }
+    it { contains_a_vendor_directory }
+    it { does_not_contain_documentation }
+    it { can_fetch_non_project_help }
+    it { can_fetch_project_help }
+    it { can_test_projects_with_success }
+    it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_success_default }
+    it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
+    it { can_test_projects_with_fail }
+    it { can_test_projects_with_fail_alias }
+    it { can_test_projects_with_fail_default }
+    it { can_test_projects_with_compile_error }
+
+    it { can_upgrade_projects }
+    it { can_upgrade_projects_even_if_test_support_folder_does_not_exist }
+    it { contains_a_vendor_directory }
+    it { does_not_contain_documentation }
+    it { can_fetch_non_project_help }
+    it { can_fetch_project_help }
+    it { can_test_projects_with_success }
+    it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_success_default }
+    it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
+    it { can_test_projects_with_fail }
+    it { can_test_projects_with_fail_alias }
+    it { can_test_projects_with_fail_default }
+    it { can_test_projects_with_compile_error }
+  end
+
+  describe "Cannot upgrade a non existing project" do
+    it { cannot_upgrade_non_existing_project }
+  end
+
+end

data/spec/system_utils_spec.rb

@@ -1,3 +1,10 @@
+# =========================================================================
+#   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/system_utils'
 
@@ -10,6 +17,8 @@ describe SystemUtils do
 
     @sys_utils = described_class.new({:system_wrapper => @sys_wrapper})
     @sys_utils.setup
+
+    @echo_test_cmd = {:command=>'echo $version'}
   end
  
   describe '#setup' do
@@ -21,7 +30,7 @@ describe SystemUtils do
       expect(@sys_utils.instance_variable_get(:@tcsh_shell)).to eq(nil)
      
 
-      allow(@streaminator).to receive(:shell_backticks).with('echo $version').and_return({:exit_code => 0, :output =>'tcsh 1234567890'})
+      allow(@loginator).to receive(:shell_backticks).with(@echo_test_cmd).and_return({:exit_code => 0, :output =>'tcsh 1234567890'})
       @sys_utils.tcsh_shell?
       
       @sys_utils.setup
@@ -32,24 +41,24 @@ describe SystemUtils do
 
   describe '#tcsh_shell?' do
     it 'returns true if exit code is zero and output contains tcsh' do
-      allow(@streaminator).to receive(:shell_backticks).with('echo $version').and_return({:exit_code => 0, :output =>'tcsh 1234567890'})
+      allow(@loginator).to receive(:shell_backticks).with(@echo_test_cmd).and_return({:exit_code => 0, :output =>'tcsh 1234567890'})
       expect(@sys_utils.tcsh_shell?).to eq(true)
     end
 
     it 'returns false if exit code is not 0' do
-      allow(@streaminator).to receive(:shell_backticks).with('echo $version').and_return({:exit_code => 1, :output =>'tcsh 1234567890'})
+      allow(@loginator).to receive(:shell_backticks).with(@echo_test_cmd).and_return({:exit_code => 1, :output =>'tcsh 1234567890'})
       expect(@sys_utils.tcsh_shell?).to eq(false)
     end
 
     it 'returns false if output does not contain tcsh' do
-      allow(@streaminator).to receive(:shell_backticks).with('echo $version').and_return({:exit_code => 0, :output =>'???'})
+      allow(@loginator).to receive(:shell_backticks).with(@echo_test_cmd).and_return({:exit_code => 0, :output =>'???'})
       expect(@sys_utils.tcsh_shell?).to eq(false)
     end
 
     it 'returns last value if already run' do
-      allow(@streaminator).to receive(:shell_backticks).with('echo $version').and_return({:exit_code => 1, :output =>'???'})
+      allow(@loginator).to receive(:shell_backticks).with(@echo_test_cmd).and_return({:exit_code => 1, :output =>'???'})
       expect(@sys_utils.tcsh_shell?).to eq(false)
-      allow(@streaminator).to receive(:shell_backticks).with('echo $version').and_return({:exit_code => 0, :output =>'tcsh 1234567890'})
+      allow(@loginator).to receive(:shell_backticks).with(@echo_test_cmd).and_return({:exit_code => 0, :output =>'tcsh 1234567890'})
       expect(@sys_utils.tcsh_shell?).to eq(false)
     end
   end