ceedling 0.15.1 → 0.15.2

data/vendor/unity/test/expectdata/testsample_run1.c

@@ -1,60 +1,63 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "one.h"
-#include "two.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      setUp(); \
+      TestFunc(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "one.h"
+#include "two.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+int GlobalExpectCount;
+int GlobalVerifyOrder;
+char* GlobalOrderError;
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  UnityBegin();
+  Unity.TestFile = "test/testdata/testsample.c";
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}

data/vendor/unity/test/expectdata/testsample_run2.c

@@ -1,63 +1,66 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-//=======Suite Teardown=====
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return suite_teardown(UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_custom_setup();
+}
+
+//=======Suite Teardown=====
+static int suite_teardown(int num_failures)
+{
+a_custom_teardown();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  UnityBegin();
+  Unity.TestFile = "test/testdata/testsample.c";
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return suite_teardown(UnityEnd());
+}

data/vendor/unity/test/expectdata/testsample_yaml.c

@@ -1,64 +1,67 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "two.h"
-#include "three.h"
-#include <four.h>
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_yaml_setup();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      setUp(); \
+      TestFunc(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "two.h"
+#include "three.h"
+#include <four.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_yaml_setup();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  UnityBegin();
+  Unity.TestFile = "test/testdata/testsample.c";
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}

data/vendor/unity/test/test_generate_test_runner.rb

@@ -2,14 +2,8 @@
 #   CMock Project - Automatic Mock Generation for C
 #   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
 #   [Released under MIT License. Please refer to license.txt for details]
-# ========================================== 
+# ==========================================
 
-ruby_version = RUBY_VERSION.split('.')
-if (ruby_version[1].to_i == 9) and (ruby_version[2].to_i > 1)
-  require 'rubygems'
-  gem 'test-unit'
-end
-require 'test/unit'
 require './auto/generate_test_runner.rb'
 
 TEST_FILE = 'test/testdata/testsample.c'
@@ -17,78 +11,78 @@ TEST_MOCK = 'test/testdata/mocksample.c'
 OUT_FILE  = 'build/testsample_'
 EXP_FILE  = 'test/expectdata/testsample_'
 
-class TestGenerateTestRunner < Test::Unit::TestCase
-  def setup
-  end
+$generate_test_runner_failures = 0
 
-  def teardown
-  end
-  
-  def verify_output_equal(subtest)
-    expected = File.read(EXP_FILE + subtest + '.c').gsub(/\r\n/,"\n")
-    actual   = File.read(OUT_FILE + subtest + '.c').gsub(/\r\n/,"\n")
-    assert_equal(expected, actual, "Generated File Sub-Test '#{subtest}' Failed")
-  end
-  
-  def test_ShouldGenerateARunnerByCreatingRunnerWithOptions
-    sets = { 'def'  => nil,
-             'new1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
-             'new2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }   
-    }
-    
-    sets.each_pair do |subtest, options|
-      UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
-      verify_output_equal(subtest)
-      UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
-      verify_output_equal('mock_' + subtest)
-    end
-  end
-  
-  def test_ShouldGenerateARunnerByRunningRunnerWithOptions
-    sets = { 'run1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
-             'run2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }   
-    }
-    
-    sets.each_pair do |subtest, options|
-      UnityTestRunnerGenerator.new.run(TEST_FILE, OUT_FILE + subtest + '.c', options)
-      verify_output_equal(subtest)
-      UnityTestRunnerGenerator.new.run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c', options)
-      verify_output_equal('mock_' + subtest)
-    end
+def verify_output_equal(subtest)
+  expected = File.read(EXP_FILE + subtest + '.c').gsub(/\r\n/,"\n")
+  actual   = File.read(OUT_FILE + subtest + '.c').gsub(/\r\n/,"\n")
+  if (expected != actual)
+    report("    #{subtest}:FAIL")
+    $generate_test_runner_failures += 1
+  else
+    report("    #{subtest}:PASS")
   end
-  
-  def test_ShouldGenerateARunnerByPullingYamlOptions
-    subtest = 'yaml'
-    cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
-    `#{cmdstr}`
+end
+
+should "GenerateARunnerByCreatingRunnerWithOptions" do
+  sets = { 'def'  => nil,
+           'new1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
+           'new2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }
+  }
+
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
     verify_output_equal(subtest)
-    
-    cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
-    `#{cmdstr}`
+    UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
     verify_output_equal('mock_' + subtest)
   end
-  
-  def test_ShouldGenerateARunnerByPullingCommandlineOptions
-    subtest = 'cmd'
-    cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
-    `#{cmdstr}`
+end
+
+should "GenerateARunnerByRunningRunnerWithOptions" do
+  sets = { 'run1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
+           'run2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }
+  }
+
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new.run(TEST_FILE, OUT_FILE + subtest + '.c', options)
     verify_output_equal(subtest)
-    
-    cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
-    `#{cmdstr}`
+    UnityTestRunnerGenerator.new.run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c', options)
     verify_output_equal('mock_' + subtest)
   end
-  
-  def test_ShouldGenerateARunnerThatUsesParameterizedTests
-    sets = { 'param'  => { :plugins => [:ignore], :use_param_tests => true }   
-    }
-    
-    sets.each_pair do |subtest, options|
-      UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
-      verify_output_equal(subtest)
-      UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
-      verify_output_equal('mock_' + subtest)
-    end
+end
+
+should "GenerateARunnerByPullingYamlOptions" do
+  subtest = 'yaml'
+  cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal(subtest)
+
+  cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal('mock_' + subtest)
+end
+
+should "GenerateARunnerByPullingCommandlineOptions" do
+  subtest = 'cmd'
+  cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal(subtest)
+
+  cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal('mock_' + subtest)
+end
+
+should "GenerateARunnerThatUsesParameterizedTests" do
+  sets = { 'param'  => { :plugins => [:ignore], :use_param_tests => true }
+  }
+
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
+    verify_output_equal(subtest)
+    UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
+    verify_output_equal('mock_' + subtest)
   end
-  
 end
+
+raise "There were #{$generate_test_runner_failures.to_s} failures while testing generate_test_runner.rb" if ($generate_test_runner_failures > 0)