ceedling 0.20.3 → 0.21.0

data/vendor/cmock/vendor/c_exception/vendor/unity/test/tests/testparameterized.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include "unity.h"
 
-int putcharSpy(int c) {return putchar(c);} // include passthrough for linking tests
+void putcharSpy(int c) { (void)putchar(c);} // include passthrough for linking tests
 
 #define TEST_CASE(...)
 

data/vendor/cmock/vendor/c_exception/vendor/unity/test/tests/testunity.c

@@ -44,8 +44,8 @@ static const _UD d_zero = 0.0;
       UNITY_OUTPUT_CHAR('\n');                                                 \
     }
 
-int SetToOneToFailInTearDown;
-int SetToOneMeanWeAlreadyCheckedThisGuy;
+static int SetToOneToFailInTearDown;
+static int SetToOneMeanWeAlreadyCheckedThisGuy;
 
 void setUp(void)
 {
@@ -1370,7 +1370,7 @@ void testNotEqualString4(void)
 void testNotEqualStringLen4(void)
 {
     EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("bar\r", "bar\n", 4);
+    TEST_ASSERT_EQUAL_STRING_LEN("\r\x16", "bar\n", 4);
     VERIFY_FAILS_END
 }
 
@@ -1390,6 +1390,13 @@ void testNotEqualString_ExpectedStringIsNull(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualStringLen_ExpectedStringIsNull(void)
+{
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_STRING_LEN(NULL, "bar", 1);
+    VERIFY_FAILS_END
+}
+
 void testNotEqualString_ActualStringIsNull(void)
 {
     EXPECT_ABORT_BEGIN
@@ -1397,6 +1404,13 @@ void testNotEqualString_ActualStringIsNull(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualStringLen_ActualStringIsNull(void)
+{
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_STRING_LEN("foo", NULL, 1);
+    VERIFY_FAILS_END
+}
+
 void testEqualStringArrays(void)
 {
     const char *testStrings[] = { "foo", "boo", "woo", "moo" };
@@ -1476,6 +1490,16 @@ void testEqualStringArrayIfBothNulls(void)
     TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
 }
 
+void testNotEqualStringArrayLengthZero(void)
+{
+    const char *testStrings[] = {NULL};
+    const char **expStrings = NULL;
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 0);
+    VERIFY_FAILS_END
+}
+
 void testEqualMemory(void)
 {
     const char *testString = "whatever";
@@ -1516,6 +1540,13 @@ void testNotEqualMemory4(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualMemoryLengthZero(void)
+{
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_MEMORY(NULL, NULL, 0);
+    VERIFY_FAILS_END
+}
+
 void testEqualIntArrays(void)
 {
     int p0[] = {1, 8, 987, -2};
@@ -1528,6 +1559,7 @@ void testEqualIntArrays(void)
     TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
     TEST_ASSERT_EQUAL_INT_ARRAY(p0, p2, 3);
     TEST_ASSERT_EQUAL_INT_ARRAY(p0, p3, 1);
+    TEST_ASSERT_EQUAL_INT_ARRAY(NULL, NULL, 1);
 }
 
 void testNotEqualIntArraysNullExpected(void)
@@ -1580,6 +1612,16 @@ void testNotEqualIntArrays3(void)
     VERIFY_FAILS_END
 }
 
+void testNotEqualIntArraysLengthZero(void)
+{
+    _UU32 p0[1] = {1};
+    _UU32 p1[1] = {1};
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 0);
+    VERIFY_FAILS_END
+}
+
 void testEqualPtrArrays(void)
 {
     char A = 1;
@@ -2205,7 +2247,7 @@ char* getBufferPutcharSpy(void)
 #endif
 }
 
-int putcharSpy(int c)
+void putcharSpy(int c)
 {
 #ifdef USING_OUTPUT_SPY
     if (putcharSpyEnabled)
@@ -2215,7 +2257,19 @@ int putcharSpy(int c)
     } else
         c = putchar(c);
 #endif
-    return c;
+}
+
+void testFailureCountIncrementsAndIsReturnedAtEnd(void)
+{
+    Unity.CurrentTestFailed = 1;
+    startPutcharSpy(); // Suppress output
+    UnityConcludeTest();
+    TEST_ASSERT_EQUAL(1, Unity.TestFailures);
+
+    int failures = UnityEnd();
+    Unity.TestFailures--;
+    endPutcharSpy();
+    TEST_ASSERT_EQUAL(1, failures);
 }
 
 #define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) {             \
@@ -2978,6 +3032,18 @@ void testFloatIsNotDeterminate2(void)
 #endif
 }
 
+void testFloatTraitFailsOnInvalidTrait(void)
+{
+#ifdef UNITY_EXCLUDE_FLOAT
+    TEST_IGNORE();
+#else
+    EXPECT_ABORT_BEGIN
+    UnityAssertFloatSpecial(1.0f, NULL, __LINE__, UNITY_FLOAT_INVALID_TRAIT);
+    VERIFY_FAILS_END
+#endif
+}
+
+
 void testEqualFloatArrays(void)
 {
 #ifdef UNITY_EXCLUDE_FLOAT
@@ -2993,6 +3059,7 @@ void testEqualFloatArrays(void)
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p2, 3);
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p3, 1);
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(NULL, NULL, 1);
 #endif
 }
 
@@ -3136,6 +3203,20 @@ void testNotEqualFloatArraysInf(void)
 #endif
 }
 
+void testNotEqualFloatArraysLengthZero(void)
+{
+#ifdef UNITY_EXCLUDE_FLOAT
+    TEST_IGNORE();
+#else
+    float p0[1] = {0.0f};
+    float p1[1] = {0.0f};
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 0);
+    VERIFY_FAILS_END
+#endif
+}
+
 // ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES DOUBLE SUPPORT ==================
 
 void testDoublesWithinDelta(void)
@@ -3483,6 +3564,17 @@ void testDoubleIsNotDeterminate2(void)
 #endif
 }
 
+void testDoubleTraitFailsOnInvalidTrait(void)
+{
+#ifdef UNITY_EXCLUDE_DOUBLE
+    TEST_IGNORE();
+#else
+    EXPECT_ABORT_BEGIN
+    UnityAssertDoubleSpecial(1.0, NULL, __LINE__, UNITY_FLOAT_INVALID_TRAIT);
+    VERIFY_FAILS_END
+#endif
+}
+
 void testEqualDoubleArrays(void)
 {
 #ifdef UNITY_EXCLUDE_DOUBLE
@@ -3498,6 +3590,7 @@ void testEqualDoubleArrays(void)
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p2, 3);
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p3, 1);
+    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(NULL, NULL, 1);
 #endif
 }
 
@@ -3641,6 +3734,22 @@ void testNotEqualDoubleArraysInf(void)
 #endif
 }
 
+void testNotEqualDoubleArraysLengthZero(void)
+{
+#ifdef UNITY_EXCLUDE_DOUBLE
+    TEST_IGNORE();
+#else
+    double p0[1] = {0.0};
+    double p1[1] = {0.0};
+
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 0);
+    VERIFY_FAILS_END
+#endif
+}
+
+// ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES DETAIL SUPPORT ==================
+
 void testThatDetailsCanBeHandleOneDetail(void)
 {
 #ifdef UNITY_EXCLUDE_DETAILS
@@ -3654,6 +3763,19 @@ void testThatDetailsCanBeHandleOneDetail(void)
 #endif
 }
 
+void testThatDetailsCanHandleTestFail(void)
+{
+#ifdef UNITY_EXCLUDE_DETAILS
+    TEST_IGNORE();
+#else
+    UNITY_SET_DETAILS("Detail1","Detail2");
+
+    EXPECT_ABORT_BEGIN
+    TEST_FAIL_MESSAGE("Should Fail And Say Detail1 and Detail2");
+    VERIFY_FAILS_END
+#endif
+}
+
 void testThatDetailsCanBeHandleTwoDetails(void)
 {
 #ifdef UNITY_EXCLUDE_DETAILS

data/vendor/cmock/vendor/unity/auto/generate_module.rb

@@ -2,7 +2,7 @@
 #   Unity Project - A Test Framework for C
 #   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
 #   [Released under MIT License. Please refer to license.txt for details]
-# ========================================== 
+# ==========================================
 
 # This script creates all the files with start code necessary for a new module.
 # A simple module only requires a source file, header file, and test file.
@@ -32,20 +32,20 @@ HELP_TEXT = [ "\nGENERATE MODULE\n-------- ------",
 
 #Built in patterns
 PATTERNS = { 'src' => {''         => { :inc => [] } },
-             'dh'  => {'Driver'   => { :inc => ['%1$sHardware.h'] }, 
-                       'Hardware' => { :inc => [] } 
+             'dh'  => {'Driver'   => { :inc => ['%1$sHardware.h'] },
+                       'Hardware' => { :inc => [] }
                       },
-             'dih' => {'Driver'   => { :inc => ['%1$sHardware.h', '%1$sInterrupt.h'] }, 
+             'dih' => {'Driver'   => { :inc => ['%1$sHardware.h', '%1$sInterrupt.h'] },
                        'Interrupt'=> { :inc => ['%1$sHardware.h'] },
-                       'Hardware' => { :inc => [] } 
+                       'Hardware' => { :inc => [] }
                       },
-             'mch' => {'Model'    => { :inc => [] }, 
+             'mch' => {'Model'    => { :inc => [] },
                        'Conductor'=> { :inc => ['%1$sModel.h', '%1$sHardware.h'] },
-                       'Hardware' => { :inc => [] } 
+                       'Hardware' => { :inc => [] }
                       },
-             'mvp' => {'Model'    => { :inc => [] }, 
+             'mvp' => {'Model'    => { :inc => [] },
                        'Presenter'=> { :inc => ['%1$sModel.h', '%1$sView.h'] },
-                       'View'     => { :inc => [] } 
+                       'View'     => { :inc => [] }
                       }
            }
 
@@ -63,7 +63,7 @@ void tearDown(void)
 
 void test_%1$s_NeedToImplement(void)
 {
-    TEST_IGNORE();
+    TEST_IGNORE_MESSAGE("Need to Implement %1$s");
 }
 ]
 
@@ -91,7 +91,7 @@ ARGV.each do |arg|
     when /^(\w+)/
       raise "ERROR: You can't have more than one Module name specified!" unless @module_name.nil?
       @module_name = arg
-    when /^-(h|-help)/ 
+    when /^-(h|-help)/
       puts HELP_TEXT
       exit
     else
@@ -126,7 +126,7 @@ end
 @includes.merge!(@extra_inc) unless @extra_inc.nil?
 
 #create triad definition
-TRIAD = [ { :ext => '.c', :path => @path_src,        :template => TEMPLATE_SRC, :inc => :src, :boilerplate => @boilerplates[:src] }, 
+TRIAD = [ { :ext => '.c', :path => @path_src,        :template => TEMPLATE_SRC, :inc => :src, :boilerplate => @boilerplates[:src] },
           { :ext => '.h', :path => @path_inc,        :template => TEMPLATE_INC, :inc => :inc, :boilerplate => @boilerplates[:inc] },
           { :ext => '.c', :path => @path_tst+'Test', :template => TEMPLATE_TST, :inc => :tst, :boilerplate => @boilerplates[:tst] },
         ]
@@ -159,7 +159,7 @@ if @destroy
     file = filespec[:path]
     if File.exist?(file)
       if @update_svn
-        `svn delete \"#{file}\" --force` 
+        `svn delete \"#{file}\" --force`
         puts "File #{file} deleted and removed from source control"
       else
         FileUtils.remove(file)
@@ -182,13 +182,13 @@ end
 files.each_with_index do |file, i|
   File.open(file[:path], 'w') do |f|
     f.write(file[:boilerplate] % [file[:name]]) unless file[:boilerplate].nil?
-    f.write(file[:template] % [ file[:name], 
-                                file[:includes].map{|f| "#include \"#{f}\"\n"}.join, 
+    f.write(file[:template] % [ file[:name],
+                                file[:includes].map{|f| "#include \"#{f}\"\n"}.join,
                                 file[:name].upcase ]
            )
   end
   if (@update_svn)
-    `svn add \"#{file[:path]}\"` 
+    `svn add \"#{file[:path]}\"`
     if $?.exitstatus == 0
       puts "File #{file[:path]} created and added to source control"
     else

data/vendor/cmock/vendor/unity/auto/generate_test_runner.rb

@@ -22,13 +22,16 @@ class UnityTestRunnerGenerator
 
   def self.default_options
     {
-      :includes      => [],
-      :plugins       => [],
-      :framework     => :unity,
-      :test_prefix   => "test|spec|should",
-      :setup_name    => "setUp",
-      :teardown_name => "tearDown",
-      :main_name     => "main",
+      :includes         => [],
+      :plugins          => [],
+      :framework        => :unity,
+      :test_prefix      => "test|spec|should",
+      :setup_name       => "setUp",
+      :teardown_name    => "tearDown",
+      :main_name        => "main", #set to :auto to automatically generate each time
+      :main_export_decl => "",
+      :cmdline_args     => false,
+      :use_param_tests  => false,
     }
   end
 
@@ -158,7 +161,7 @@ class UnityTestRunnerGenerator
   def create_header(output, mocks, testfile_includes=[])
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     create_runtest(output, mocks)
-    output.puts("\n//=======Automagically Detected Files To Include=====")
+    output.puts("\n/*=======Automagically Detected Files To Include=====*/")
     output.puts("#include \"#{@options[:framework].to_s}.h\"")
     output.puts('#include "cmock.h"') unless (mocks.empty?)
     output.puts('#include <setjmp.h>')
@@ -186,7 +189,7 @@ class UnityTestRunnerGenerator
   end
 
   def create_externs(output, tests, mocks)
-    output.puts("\n//=======External Functions This Runner Calls=====")
+    output.puts("\n/*=======External Functions This Runner Calls=====*/")
     output.puts("extern void #{@options[:setup_name]}(void);")
     output.puts("extern void #{@options[:teardown_name]}(void);")
     tests.each do |test|
@@ -197,7 +200,7 @@ class UnityTestRunnerGenerator
 
   def create_mock_management(output, mock_headers)
     unless (mock_headers.empty?)
-      output.puts("\n//=======Mock Management=====")
+      output.puts("\n/*=======Mock Management=====*/")
       output.puts("static void CMock_Init(void)")
       output.puts("{")
       if @options[:enforce_strict_ordering]
@@ -232,14 +235,14 @@ class UnityTestRunnerGenerator
 
   def create_suite_setup_and_teardown(output)
     unless (@options[:suite_setup].nil?)
-      output.puts("\n//=======Suite Setup=====")
-      output.puts("static int suite_setup(void)")
+      output.puts("\n/*=======Suite Setup=====*/")
+      output.puts("static void suite_setup(void)")
       output.puts("{")
       output.puts(@options[:suite_setup])
       output.puts("}")
     end
     unless (@options[:suite_teardown].nil?)
-      output.puts("\n//=======Suite Teardown=====")
+      output.puts("\n/*=======Suite Teardown=====*/")
       output.puts("static int suite_teardown(int num_failures)")
       output.puts("{")
       output.puts(@options[:suite_teardown])
@@ -251,12 +254,13 @@ class UnityTestRunnerGenerator
     cexception = @options[:plugins].include? :cexception
     va_args1   = @options[:use_param_tests] ? ', ...' : ''
     va_args2   = @options[:use_param_tests] ? '__VA_ARGS__' : ''
-    output.puts("\n//=======Test Runner Used To Run Each Test Below=====")
+    output.puts("\n/*=======Test Runner Used To Run Each Test Below=====*/")
     output.puts("#define RUN_TEST_NO_ARGS") if @options[:use_param_tests]
     output.puts("#define RUN_TEST(TestFunc, TestLineNum#{va_args1}) \\")
     output.puts("{ \\")
     output.puts("  Unity.CurrentTestName = #TestFunc#{va_args2.empty? ? '' : " \"(\" ##{va_args2} \")\""}; \\")
     output.puts("  Unity.CurrentTestLineNumber = TestLineNum; \\")
+    output.puts("  if (UnityTestMatches()) { \\") if (@options[:cmdline_args])
     output.puts("  Unity.NumberOfTests++; \\")
     output.puts("  CMock_Init(); \\") unless (used_mocks.empty?)
     output.puts("  UNITY_CLR_DETAILS(); \\") unless (used_mocks.empty?)
@@ -275,11 +279,12 @@ class UnityTestRunnerGenerator
     output.puts("  } \\")
     output.puts("  CMock_Destroy(); \\") unless (used_mocks.empty?)
     output.puts("  UnityConcludeTest(); \\")
+    output.puts("  } \\")  if (@options[:cmdline_args])
     output.puts("}\n")
   end
 
   def create_reset(output, used_mocks)
-    output.puts("\n//=======Test Reset Option=====")
+    output.puts("\n/*=======Test Reset Option=====*/")
     output.puts("void resetTest(void);")
     output.puts("void resetTest(void)")
     output.puts("{")
@@ -292,14 +297,49 @@ class UnityTestRunnerGenerator
   end
 
   def create_main(output, filename, tests, used_mocks)
-    output.puts("\n\n//=======MAIN=====")
-    if (@options[:main_name] != "main")
-      output.puts("int #{@options[:main_name]}(void);")
+    output.puts("\n\n/*=======MAIN=====*/")
+    main_name = (@options[:main_name].to_sym == :auto) ? "main_#{filename.gsub('.c','')}" : "#{@options[:main_name]}"
+    if (@options[:cmdline_args])
+      if (main_name != "main")
+        output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv);")
+      end
+      output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)")
+      output.puts("{")
+      output.puts("  int parse_status = UnityParseOptions(argc, argv);")
+      output.puts("  if (parse_status != 0)")
+      output.puts("  {")
+      output.puts("    if (parse_status < 0)")
+      output.puts("    {")
+      output.puts("      UnityPrint(\"#{filename.gsub('.c','')}.\");")
+      output.puts("      UNITY_PRINT_EOL();")
+      if (@options[:use_param_tests])
+        tests.each do |test|
+          if ((test[:args].nil?) or (test[:args].empty?))
+            output.puts("      UnityPrint(\"  #{test[:test]}(RUN_TEST_NO_ARGS)\");")
+            output.puts("      UNITY_PRINT_EOL();")
+          else
+            test[:args].each do |args|
+              output.puts("      UnityPrint(\"  #{test[:test]}(#{args})\");")
+              output.puts("      UNITY_PRINT_EOL();")
+            end
+          end
+        end
+      else
+        tests.each { |test| output.puts("      UnityPrint(\"  #{test[:test]}\");\n    UNITY_PRINT_EOL();")}
+      end
+      output.puts("    return 0;")
+      output.puts("    }")
+      output.puts("  return parse_status;")
+      output.puts("  }")
+    else
+      if (main_name != "main")
+        output.puts("#{@options[:main_export_decl]} int #{main_name}(void);")
+      end
+      output.puts("int #{main_name}(void)")
+      output.puts("{")
     end
-    output.puts("int #{@options[:main_name]}(void)")
-    output.puts("{")
     output.puts("  suite_setup();") unless @options[:suite_setup].nil?
-    output.puts("  UnityBegin(\"#{filename.gsub(/\\/,'\\\\')}\");")
+    output.puts("  UnityBegin(\"#{filename.gsub(/\\/,'\\\\\\')}\");")
     if (@options[:use_param_tests])
       tests.each do |test|
         if ((test[:args].nil?) or (test[:args].empty?))