ceedling 0.15.1 → 0.15.2

data/vendor/{cmock/vendor/unity/examples → unity/examples/example_3}/test/no_ruby/TestProductionCode_Runner.c

@@ -1,50 +1,50 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-
-char MessageBuffer[50];
-
-extern void setUp(void);
-extern void tearDown(void);
-
-extern void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void);
-extern void test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken(void);
-extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue(void);
-extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain(void);
-extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void);
-
-static void runTest(UnityTestFunction test)
-{
-  if (TEST_PROTECT())
-  {
-      setUp();
-      test();
-  }
-  if (TEST_PROTECT() && !TEST_IS_IGNORED)
-  {
-    tearDown();
-  }
-}
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-int main(void)
-{
-  Unity.TestFile = "test/TestProductionCode.c";
-  UnityBegin();
-
-  // RUN_TEST calls runTest
-  RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20);
-  RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken, 30);
-  RUN_TEST(test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue, 41);
-  RUN_TEST(test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain, 51);
-  RUN_TEST(test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed, 57);
-
-  UnityEnd();
-  return 0;
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+
+char MessageBuffer[50];
+
+extern void setUp(void);
+extern void tearDown(void);
+
+extern void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void);
+extern void test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken(void);
+extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue(void);
+extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain(void);
+extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void);
+
+static void runTest(UnityTestFunction test)
+{
+  if (TEST_PROTECT())
+  {
+      setUp();
+      test();
+  }
+  if (TEST_PROTECT() && !TEST_IS_IGNORED)
+  {
+    tearDown();
+  }
+}
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+int main(void)
+{
+  Unity.TestFile = "test/TestProductionCode.c";
+  UnityBegin();
+
+  // RUN_TEST calls runTest
+  RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20);
+  RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken, 30);
+  RUN_TEST(test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue, 41);
+  RUN_TEST(test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain, 51);
+  RUN_TEST(test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed, 57);
+
+  UnityEnd();
+  return 0;
+}

data/vendor/unity/extras/eclipse/error_parsers.txt

@@ -0,0 +1,26 @@
+Eclipse error parsers
+=====================
+
+These are a godsend for extracting  & quickly navigating to
+warnings & error messages from console output. Unforunately
+I don't know how to write an Eclipse plugin so you'll have
+to add them manually.
+
+To add a console parser to Eclipse, go to Window --> Preferences
+--> C/C++ --> Build --> Settings. Click on the 'Error Parsers'
+tab and then click the 'Add...' button. See the table below for
+the parser fields to add.
+
+Eclipse will only parse the console output during a build, so
+running your unit tests must be part of your build process.
+Either add this to your make/rakefile, or add it as a post-
+build step in your Eclipse project settings.
+
+
+Unity unit test error parsers
+-----------------------------
+Severity    Pattern                                 File    Line    Description
+-------------------------------------------------------------------------------
+Error       (\.+)(.*?):(\d+):(.*?):FAIL: (.*)       $2      $3      $5
+Warning     (\.+)(.*?):(\d+):(.*?):IGNORE: (.*)     $2      $3      $5
+Warning     (\.+)(.*?):(\d+):(.*?):IGNORE\s*$       $2      $3      Ignored test

data/vendor/unity/extras/fixture/src/unity_fixture.c

@@ -28,7 +28,7 @@ void announceTestRun(unsigned int runNumber)
     UNITY_OUTPUT_CHAR('\n');
 }
 
-int UnityMain(int argc, char* argv[], void (*runAllTests)())
+int UnityMain(int argc, char* argv[], void (*runAllTests)(void))
 {
     int result = UnityGetCommandLineOptions(argc, argv);
     unsigned int r;
@@ -351,6 +351,9 @@ int UnityGetCommandLineOptions(int argc, char* argv[])
                     i++;
                 }
             }
+        } else {
+            // ignore unknown parameter
+            i++;
         }
     }
     return 0;

data/vendor/unity/extras/fixture/src/unity_fixture.h

@@ -13,40 +13,40 @@
 #include "unity_fixture_malloc_overrides.h"
 #include "unity_fixture_internals.h"
 
-int UnityMain(int argc, char* argv[], void (*runAllTests)());
+int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
 
 
 #define TEST_GROUP(group)\
-    int TEST_GROUP_##group = 0
+    static const char* TEST_GROUP_##group = #group
 
-#define TEST_SETUP(group) void TEST_##group##_SETUP()
+#define TEST_SETUP(group) void TEST_##group##_SETUP(void)
 
-#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN()
+#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void)
 
 
 #define TEST(group, name) \
-    void TEST_##group##_##name##_();\
-    void TEST_##group##_##name##_run()\
+    void TEST_##group##_##name##_(void);\
+    void TEST_##group##_##name##_run(void)\
     {\
         UnityTestRunner(TEST_##group##_SETUP,\
-             TEST_##group##_##name##_,\
+            TEST_##group##_##name##_,\
             TEST_##group##_TEAR_DOWN,\
             "TEST(" #group ", " #name ")",\
-            #group, #name,\
+            TEST_GROUP_##group, #name,\
             __FILE__, __LINE__);\
     }\
-    void  TEST_##group##_##name##_()
+    void  TEST_##group##_##name##_(void)
 
 #define IGNORE_TEST(group, name) \
-    void TEST_##group##_##name##_();\
-    void TEST_##group##_##name##_run()\
+    void TEST_##group##_##name##_(void);\
+    void TEST_##group##_##name##_run(void)\
     {\
         UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
     }\
-    void  TEST_##group##_##name##_()
+    void TEST_##group##_##name##_(void)
 
 #define DECLARE_TEST_CASE(group, name) \
-    void TEST_##group##_##name##_run()
+    void TEST_##group##_##name##_run(void)
 
 #define RUN_TEST_CASE(group, name) \
     { DECLARE_TEST_CASE(group, name);\
@@ -54,8 +54,9 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
 
 //This goes at the bottom of each test file or in a separate c file
 #define TEST_GROUP_RUNNER(group)\
-    void TEST_##group##_GROUP_RUNNER_runAll();\
-    void TEST_##group##_GROUP_RUNNER()\
+    void TEST_##group##_GROUP_RUNNER_runAll(void);\
+    void TEST_##group##_GROUP_RUNNER(void);\
+    void TEST_##group##_GROUP_RUNNER(void)\
     {\
         TEST_##group##_GROUP_RUNNER_runAll();\
     }\
@@ -63,7 +64,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
 
 //Call this from main
 #define RUN_TEST_GROUP(group)\
-    { void TEST_##group##_GROUP_RUNNER();\
+    { void TEST_##group##_GROUP_RUNNER(void);\
       TEST_##group##_GROUP_RUNNER(); }
 
 //CppUTest Compatibility Macros

data/vendor/unity/extras/fixture/src/unity_fixture_internals.h

@@ -16,7 +16,7 @@ typedef struct _UNITY_FIXTURE_T
     const char* GroupFilter;
 } UNITY_FIXTURE_T;
 
-typedef void unityfunction();
+typedef void unityfunction(void);
 void UnityTestRunner(unityfunction * setup,
         unityfunction * body,
         unityfunction * teardown,
@@ -26,15 +26,15 @@ void UnityTestRunner(unityfunction * setup,
         const char * file, int line);
 
 void UnityIgnoreTest(const char * printableName);
-void UnityMalloc_StartTest();
-void UnityMalloc_EndTest();
-int UnityFailureCount();
+void UnityMalloc_StartTest(void);
+void UnityMalloc_EndTest(void);
+int UnityFailureCount(void);
 int UnityGetCommandLineOptions(int argc, char* argv[]);
-void UnityConcludeFixtureTest();
+void UnityConcludeFixtureTest(void);
 
 void UnityPointer_Set(void ** ptr, void * newValue);
-void UnityPointer_UndoAllSets();
-void UnityPointer_Init();
+void UnityPointer_UndoAllSets(void);
+void UnityPointer_Init(void);
 
 void UnityAssertEqualPointer(const void * expected,
                             const void * actual,

data/vendor/unity/extras/fixture/test/unity_fixture_Test.c

@@ -255,6 +255,23 @@ TEST(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified)
     TEST_ASSERT_EQUAL(2, UnityFixture.RepeatCount);
 }
 
+static char* unknownCommand[] = {
+        "testrunner.exe",
+        "-v",
+        "-g", "groupname",
+        "-n", "testname",
+        "-r", "98",
+        "-z"
+};
+TEST(UnityCommandOptions, UnknownCommandIsIgnored)
+{
+    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(9, unknownCommand));
+    TEST_ASSERT_EQUAL(1, UnityFixture.Verbose);
+    STRCMP_EQUAL("groupname", UnityFixture.GroupFilter);
+    STRCMP_EQUAL("testname", UnityFixture.NameFilter);
+    TEST_ASSERT_EQUAL(98, UnityFixture.RepeatCount);
+}
+
 
 //------------------------------------------------------------
 

data/vendor/unity/extras/fixture/test/unity_fixture_TestRunner.c

@@ -30,6 +30,7 @@ TEST_GROUP_RUNNER(UnityCommandOptions)
     RUN_TEST_CASE(UnityCommandOptions, OptionSelectRepeatTestsSpecificCount);
     RUN_TEST_CASE(UnityCommandOptions, MultipleOptions);
     RUN_TEST_CASE(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified);
+    RUN_TEST_CASE(UnityCommandOptions, UnknownCommandIsIgnored);
 }
 
 TEST_GROUP_RUNNER(LeakDetection)

data/vendor/unity/makefile

@@ -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]
-# ========================================== 
+# ==========================================
 
 C_COMPILER=gcc
 TARGET_BASE = testunity
@@ -15,9 +15,11 @@ TARGET = $(TARGET_BASE)$(TARGET_EXTENSION)
 OUT_FILE=-o $(TARGET)
 SRC_FILES=src/unity.c test/testunity.c build/testunity_Runner.c
 INC_DIRS=-Isrc
-SYMBOLS=-DTEST -DUNITY_SUPPORT_64
+SYMBOLS=-DTEST -DUNITY_SUPPORT_64 -DUNITY_INCLUDE_DOUBLE
 
-ifeq ($(OS),Windows_NT)
+ifeq ($(OSTYPE),cygwin)
+	CLEANUP = rm -f build/*.o ; rm -f $(TARGET) ; mkdir -p build
+else ifeq ($(OS),Windows_NT)
 	CLEANUP = del /F /Q build\* && del /F /Q $(TARGET)
 else
 	CLEANUP = rm -f build/*.o ; rm -f $(TARGET) ; mkdir -p build
@@ -32,4 +34,4 @@ default:
 
 clean:
 	$(CLEANUP)
-	
+

data/vendor/unity/rakefile_helper.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]
-# ========================================== 
+# ==========================================
 
 require 'yaml'
 require 'fileutils'
@@ -13,7 +13,7 @@ require UNITY_ROOT + 'auto/colour_reporter'
 module RakefileHelpers
 
   C_EXTENSION = '.c'
-  
+
   def load_configuration(config_file)
     unless ($configured)
       $cfg_file = "targets/#{config_file}" unless (config_file =~ /[\\|\/]/)
@@ -22,24 +22,24 @@ module RakefileHelpers
       $configured = true if (config_file != DEFAULT_CONFIG_FILE)
     end
   end
-  
+
   def configure_clean
     CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
   end
-  
+
   def configure_toolchain(config_file=DEFAULT_CONFIG_FILE)
     config_file += '.yml' unless config_file =~ /\.yml$/
     config_file = config_file unless config_file =~ /[\\|\/]/
     load_configuration(config_file)
     configure_clean
   end
-  
+
   def get_unit_test_files
     path = $cfg['compiler']['unit_tests_path'] + 'test*' + C_EXTENSION
     path.gsub!(/\\/, '/')
     FileList.new(path)
   end
-  
+
   def get_local_include_dirs
     include_dirs = $cfg['compiler']['includes']['items'].dup
     include_dirs.delete_if {|dir| dir.is_a?(Array)}
@@ -67,7 +67,7 @@ module RakefileHelpers
     end
     return nil
   end
-  
+
   def tackit(strings)
     if strings.is_a?(Array)
       result = "\"#{strings.join}\""
@@ -76,13 +76,22 @@ module RakefileHelpers
     end
     return result
   end
-  
+
   def squash(prefix, items)
     result = ''
     items.each { |item| result += " #{prefix}#{tackit(item)}" }
     return result
   end
 
+  def should(behave, &block)
+    if block
+      puts "Should " + behave
+      yield block
+    else
+      puts "UNIMPLEMENTED CASE: Should #{behave}"
+    end
+  end
+
   def build_compiler_fields
     command  = tackit($cfg['compiler']['path'])
     if $cfg['compiler']['defines']['items'].nil?
@@ -104,7 +113,7 @@ module RakefileHelpers
     execute(cmd_str + obj_file)
     return obj_file
   end
-  
+
   def build_linker_fields
     command  = tackit($cfg['linker']['path'])
     if $cfg['linker']['options'].nil?
@@ -120,7 +129,7 @@ module RakefileHelpers
     includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
     return {:command => command, :options => options, :includes => includes}
   end
-  
+
   def link_it(exe_name, obj_list)
     linker = build_linker_fields
     cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
@@ -130,7 +139,7 @@ module RakefileHelpers
       exe_name + $cfg['linker']['bin_files']['extension']
     execute(cmd_str)
   end
-  
+
   def build_simulator_fields
     return nil if $cfg['simulator'].nil?
     if $cfg['simulator']['path'].nil?
@@ -150,7 +159,7 @@ module RakefileHelpers
     end
     return {:command => command, :pre_support => pre_support, :post_support => post_support}
   end
-  
+
   def execute(command_string, verbose=true)
     report command_string
     output = `#{command_string}`.chomp
@@ -160,32 +169,32 @@ module RakefileHelpers
     end
     return output
   end
-  
+
   def report_summary
     summary = UnityTestSummary.new
-    summary.set_root_path(UNITY_ROOT ) 
+    summary.set_root_path(UNITY_ROOT )
     results_glob = "#{$cfg['compiler']['build_path']}*.test*"
     results_glob.gsub!(/\\/, '/')
     results = Dir[results_glob]
     summary.set_targets(results)
     summary.run
   end
-  
+
   def run_tests(test_files)
     report 'Running Unity system tests...'
-    
+
     # Tack on TEST define for compiling unit tests
     load_configuration($cfg_file)
     test_defines = ['TEST']
     $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
     $cfg['compiler']['defines']['items'] << 'TEST'
-    
+
     include_dirs = get_local_include_dirs
-    
+
     # Build and execute each unit test
     test_files.each do |test|
       obj_list = []
-      
+
       # Detect dependencies and build required modules
       extract_headers(test).each do |header|
         # Compile corresponding source file if it exists
@@ -194,30 +203,30 @@ module RakefileHelpers
           obj_list << compile(src_file, test_defines)
         end
       end
-      
+
       # Build the test runner (generate if configured to do so)
       test_base = File.basename(test, C_EXTENSION)
-      
+
       runner_name = test_base + '_Runner.c'
       runner_path = ''
-      
+
       if $cfg['compiler']['runner_path'].nil?
         runner_path = $cfg['compiler']['build_path'] + runner_name
       else
         runner_path = $cfg['compiler']['runner_path'] + runner_name
       end
-      
+
       options = $cfg[:unity]
       options[:use_param_tests] = (test =~ /parameterized/) ? true : false
       UnityTestRunnerGenerator.new(options).run(test, runner_path)
       obj_list << compile(runner_path, test_defines)
-      
+
       # Build the test module
       obj_list << compile(test, test_defines)
-      
+
       # Link the test executable
       link_it(test_base, obj_list)
-      
+
       # Execute unit test and generate results file
       simulator = build_simulator_fields
       executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
@@ -234,7 +243,7 @@ module RakefileHelpers
         test_results += '.testpass'
       end
       File.open(test_results, 'w') { |f| f.print output }
-      
+
     end
   end
 end