ceedling 0.13.0 → 0.15.0

data/test_graveyard/integration/paths_test.rb

@@ -2,8 +2,8 @@ require File.dirname(__FILE__) + '/../integration_test_helper'
 require 'rubygems'
 require 'rake' # for FileList
 require 'constructor'
-require 'file_system_utils'
-require 'file_wrapper'
+require 'ceedling/file_system_utils'
+require 'ceedling/file_wrapper'
 
 
 PATHS_ROOT = INTEGRATION_TEST_ROOT + '/paths'

data/test_graveyard/unit/busted/configurator_builder_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'configurator_builder'
 require 'yaml'
-require 'constants' # for Verbosity constants class
+require 'ceedling/configurator_builder'
+require 'ceedling/constants' # for Verbosity constants class
 
 
 class ConfiguratorBuilderTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/configurator_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'configurator'
+require 'ceedling/configurator'
 
 
 class ConfiguratorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/configurator_validator_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'configurator_validator'
+require 'ceedling/configurator_validator'
 
 
 class ConfiguratorValidatorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/dependinator_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'dependinator'
+require 'ceedling/dependinator'
 
 
 class DependinatorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/file_finder_helper_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'file_finder_helper'
+require 'ceedling/file_finder_helper'
 
 
 class FileFinderHelperTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/file_finder_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'file_finder'
+require 'ceedling/file_finder'
 
 
 class FileFinderTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/file_path_utils_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'file_path_utils'
+require 'ceedling/file_path_utils'
 
 
 class FilePathUtilsTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/file_system_utils_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'file_system_utils'
+require 'ceedling/file_system_utils'
 
 
 class FileSystemUtilsTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/generator_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'generator'
+require 'ceedling/generator'
 
 
 class GeneratorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/generator_test_results_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'generator_test_results'
+require 'ceedling/generator_test_results'
 
 
 class GeneratorTestResultsTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/generator_test_runner_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'generator_test_runner'
+require 'ceedling/generator_test_runner'
 
 
 # redefine split for convenience of file content comparison in tests.

data/test_graveyard/unit/busted/preprocessinator_file_handler_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'preprocessinator_file_handler'
+require 'ceedling/preprocessinator_file_handler'
 
 
 class PreprocessinatorFileHandlerTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/preprocessinator_helper_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'preprocessinator_helper'
+require 'ceedling/preprocessinator_helper'
 
 
 class PreprocessinatorHelperTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/preprocessinator_includes_handler_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'preprocessinator_includes_handler'
+require 'ceedling/preprocessinator_includes_handler'
 
 
 class PreprocessinatorIncludesHandlerTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/preprocessinator_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'preprocessinator'
+require 'ceedling/preprocessinator'
 
 
 class PreprocessinatorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/project_file_loader_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'project_config_manager'
+require 'ceedling/project_config_manager'
 require 'yaml'
 
 class ProjectFileLoaderTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/setupinator_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'setupinator'
+require 'ceedling/setupinator'
 
 
 class SetupinatorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/streaminator_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'streaminator'
-require 'constants'
+require 'ceedling/streaminator'
+require 'ceedling/constants'
 
 
 class StreaminatorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/task_invoker_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'task_invoker'
+require 'ceedling/task_invoker'
 
 
 class TaskInvokerTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/test_includes_extractor_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'test_includes_extractor'
+require 'ceedling/test_includes_extractor'
 
 
 class TestIncludesExtractorTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/test_invoker_helper_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'test_invoker_helper'
+require 'ceedling/test_invoker_helper'
 
 
 class TestInvokerHelperTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/test_invoker_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'test_invoker'
+require 'ceedling/test_invoker'
 
 
 class TestInvokerTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/tool_executor_helper_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'tool_executor_helper'
+require 'ceedling/tool_executor_helper'
 
 
 class ToolExecutorHelperTest < Test::Unit::TestCase

data/test_graveyard/unit/busted/tool_executor_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'tool_executor'
+require 'ceedling/tool_executor'
 require 'yaml'
 
 

data/test_graveyard/unit/busted/verbosinator_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'verbosinator'
+require 'ceedling/verbosinator'
 
 
 class VerbosinatorTest < Test::Unit::TestCase

data/test_graveyard/unit/preprocessinator_extractor_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
-require 'preprocessinator_extractor'
+require 'ceedling/preprocessinator_extractor'
 
 
 class PreprocessinatorExtractorTest < Test::Unit::TestCase

data/vendor/c_exception/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org/"
+
+gem "rake"
+gem "test-unit", "2.4.3"

data/vendor/c_exception/lib/CException.h

@@ -62,7 +62,7 @@ extern volatile CEXCEPTION_FRAME_T CExceptionFrames[];
         CExceptionFrames[MY_ID].pFrame = (jmp_buf*)(&NewFrame);     \
         CExceptionFrames[MY_ID].Exception = CEXCEPTION_NONE;        \
         if (setjmp(NewFrame) == 0) {                                \
-            if (&PrevFrame) 
+            if (1)
 
 //Catch (see C file for explanation)
 #define Catch(e)                                                    \

data/vendor/c_exception/test/TestException.c

@@ -15,20 +15,23 @@ void tearDown(void)
 
 void test_BasicTryDoesNothingIfNoThrow(void)
 {
-  int i;
+  int i = 0;
   CEXCEPTION_T e = 0x5a;
-  
+
   Try
   {
     i += 1;
   }
   Catch(e)
   {
-    TEST_FAIL_MESSAGE("Should Not Enter Catch If Not Thrown")
+    TEST_FAIL_MESSAGE("Should Not Enter Catch If Not Thrown");
   }
-  
+
   //verify that e was untouched
   TEST_ASSERT_EQUAL(0x5a, e);
+
+  // verify that i was incremented once
+  TEST_ASSERT_EQUAL(1, i);
 }
 
 void test_BasicThrowAndCatch(void)
@@ -60,7 +63,7 @@ void test_BasicThrowAndCatch_WithMiniSyntax(void)
   Catch(e)
     TEST_ASSERT_EQUAL(0xEF, e);
   TEST_ASSERT_EQUAL(0xEF, e);
-  
+
   //Mini Passthrough
   Try
     e = 0;
@@ -117,12 +120,14 @@ void test_ThrowFromASubFunctionAndCatchInRootFunc(void)
 
   //verify that I can pass that value to something else
   TEST_ASSERT_EQUAL(0xBA, e);
+  //verify that ID and e have the same value
+  TEST_ASSERT_EQUAL(ID, e);
 }
 
 void HappyExceptionRethrower(unsigned int ID)
 {
   CEXCEPTION_T e;
-  
+
   Try
   {
     Throw(ID);
@@ -144,7 +149,7 @@ void test_ThrowAndCatchFromASubFunctionAndRethrowToCatchInRootFunc(void)
 {
   volatile  unsigned int ID = 0;
   CEXCEPTION_T e;
-  
+
   Try
   {
     HappyExceptionRethrower(0xBD);
@@ -162,7 +167,7 @@ void test_ThrowAndCatchFromASubFunctionAndRethrowToCatchInRootFunc(void)
 void test_ThrowAndCatchFromASubFunctionAndNoRethrowToCatchInRootFunc(void)
 {
   CEXCEPTION_T e = 3;
-  
+
   Try
   {
     HappyExceptionRethrower(0xBF);
@@ -171,7 +176,7 @@ void test_ThrowAndCatchFromASubFunctionAndNoRethrowToCatchInRootFunc(void)
   {
     TEST_FAIL_MESSAGE("Should Not Have Re-thrown Error (it should have already been caught)");
   }
-  
+
   //verify that THIS e is still untouched, even though subfunction was touched
   TEST_ASSERT_EQUAL(3, e);
 }
@@ -179,7 +184,7 @@ void test_ThrowAndCatchFromASubFunctionAndNoRethrowToCatchInRootFunc(void)
 void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThisDoesntCorruptExceptionId(void)
 {
   CEXCEPTION_T e;
-  
+
   Try
   {
     HappyExceptionThrower(0xBF);
@@ -197,7 +202,7 @@ void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThisDoesntCorruptE
 void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThatEachExceptionIdIndependent(void)
 {
   CEXCEPTION_T e1, e2;
-  
+
   Try
   {
     HappyExceptionThrower(0xBF);
@@ -224,7 +229,7 @@ void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThatEachExceptionI
 void test_CanHaveMultipleTryBlocksInASingleFunction(void)
 {
   CEXCEPTION_T e;
-  
+
   Try
   {
     HappyExceptionThrower(0x01);
@@ -250,7 +255,7 @@ void test_CanHaveNestedTryBlocksInASingleFunction_ThrowInside(void)
 {
   int i = 0;
   CEXCEPTION_T e;
-  
+
   Try
   {
     Try
@@ -268,13 +273,16 @@ void test_CanHaveNestedTryBlocksInASingleFunction_ThrowInside(void)
   {
     TEST_FAIL_MESSAGE("Should Have Been Caught By Inside Catch");
   }
+
+  // verify that i is still zero
+  TEST_ASSERT_EQUAL(0, i);
 }
 
 void test_CanHaveNestedTryBlocksInASingleFunction_ThrowOutside(void)
 {
   int i = 0;
   CEXCEPTION_T e;
-  
+
   Try
   {
     Try
@@ -292,6 +300,9 @@ void test_CanHaveNestedTryBlocksInASingleFunction_ThrowOutside(void)
   {
     TEST_ASSERT_EQUAL(0x01, e);
   }
+
+  // verify that i is 2
+  TEST_ASSERT_EQUAL(2, i);
 }
 
 void test_AThrowWithoutATryCatchWillUseDefaultHandlerIfSpecified(void)

data/vendor/c_exception/test/TestException_Runner.c

@@ -1,57 +1,74 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-#include "unity.h"
-#include "CException.h"
-
-extern void setUp(void);
-extern void tearDown(void);
-
-extern void test_BasicTryDoesNothingIfNoThrow(void);
-extern void test_BasicThrowAndCatch(void);
-extern void test_BasicThrowAndCatch_WithMiniSyntax(void);
-extern void test_VerifyVolatilesSurviveThrowAndCatch(void);
-extern void test_ThrowFromASubFunctionAndCatchInRootFunc(void);
-extern void test_ThrowAndCatchFromASubFunctionAndRethrowToCatchInRootFunc(void);
-extern void test_ThrowAndCatchFromASubFunctionAndNoRethrowToCatchInRootFunc(void);
-extern void test_CanHaveMultipleTryBlocksInASingleFunction(void);
-extern void test_CanHaveNestedTryBlocksInASingleFunction_ThrowInside(void);
-extern void test_CanHaveNestedTryBlocksInASingleFunction_ThrowOutside(void);
-extern void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThisDoesntCorruptExceptionId(void);
-extern void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThatEachExceptionIdIndependent(void);
-extern void test_AThrowWithoutATryCatchWillUseDefaultHandlerIfSpecified(void);
-extern void test_AThrowWithoutOutsideATryCatchWillUseDefaultHandlerEvenAfterTryCatch(void);
-
-static void runTest(UnityTestFunction test)
-{
-  if (TEST_PROTECT())
-  {
-      test();
-  }
-  tearDown();
-}
-
-
-int main(void)
-{
-  Unity.TestFile = __FILE__;
-  UnityBegin();
-
-  // RUN_TEST calls runTest
-  RUN_TEST(test_BasicTryDoesNothingIfNoThrow, 15);
-  RUN_TEST(test_BasicThrowAndCatch, 33);
-  RUN_TEST(test_BasicThrowAndCatch_WithMiniSyntax, 52);
-  RUN_TEST(test_VerifyVolatilesSurviveThrowAndCatch, 72);
-  RUN_TEST(test_ThrowFromASubFunctionAndCatchInRootFunc, 101);
-  RUN_TEST(test_ThrowAndCatchFromASubFunctionAndRethrowToCatchInRootFunc, 142);
-  RUN_TEST(test_ThrowAndCatchFromASubFunctionAndNoRethrowToCatchInRootFunc, 161);
-  RUN_TEST(test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThisDoesntCorruptExceptionId, 178);
-  RUN_TEST(test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThatEachExceptionIdIndependent, 196);
-  RUN_TEST(test_CanHaveMultipleTryBlocksInASingleFunction, 223);
-  RUN_TEST(test_CanHaveNestedTryBlocksInASingleFunction_ThrowInside, 248);
-  RUN_TEST(test_CanHaveNestedTryBlocksInASingleFunction_ThrowOutside, 272);
-  RUN_TEST(test_AThrowWithoutATryCatchWillUseDefaultHandlerIfSpecified, 296);
-  RUN_TEST(test_AThrowWithoutOutsideATryCatchWillUseDefaultHandlerEvenAfterTryCatch, 308);
-
-  UnityEnd();
-  
-  return 0;
-}
+/* 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_BasicTryDoesNothingIfNoThrow(void);
+extern void test_BasicThrowAndCatch(void);
+extern void test_BasicThrowAndCatch_WithMiniSyntax(void);
+extern void test_VerifyVolatilesSurviveThrowAndCatch(void);
+extern void test_ThrowFromASubFunctionAndCatchInRootFunc(void);
+extern void test_ThrowAndCatchFromASubFunctionAndRethrowToCatchInRootFunc(void);
+extern void test_ThrowAndCatchFromASubFunctionAndNoRethrowToCatchInRootFunc(void);
+extern void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThisDoesntCorruptExceptionId(void);
+extern void test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThatEachExceptionIdIndependent(void);
+extern void test_CanHaveMultipleTryBlocksInASingleFunction(void);
+extern void test_CanHaveNestedTryBlocksInASingleFunction_ThrowInside(void);
+extern void test_CanHaveNestedTryBlocksInASingleFunction_ThrowOutside(void);
+extern void test_AThrowWithoutATryCatchWillUseDefaultHandlerIfSpecified(void);
+extern void test_AThrowWithoutOutsideATryCatchWillUseDefaultHandlerEvenAfterTryCatch(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/TestException.c";
+  UnityBegin();
+  RUN_TEST(test_BasicTryDoesNothingIfNoThrow, 16);
+  RUN_TEST(test_BasicThrowAndCatch, 37);
+  RUN_TEST(test_BasicThrowAndCatch_WithMiniSyntax, 56);
+  RUN_TEST(test_VerifyVolatilesSurviveThrowAndCatch, 76);
+  RUN_TEST(test_ThrowFromASubFunctionAndCatchInRootFunc, 105);
+  RUN_TEST(test_ThrowAndCatchFromASubFunctionAndRethrowToCatchInRootFunc, 148);
+  RUN_TEST(test_ThrowAndCatchFromASubFunctionAndNoRethrowToCatchInRootFunc, 167);
+  RUN_TEST(test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThisDoesntCorruptExceptionId, 184);
+  RUN_TEST(test_ThrowAnErrorThenEnterATryBlockFromWithinCatch_VerifyThatEachExceptionIdIndependent, 202);
+  RUN_TEST(test_CanHaveMultipleTryBlocksInASingleFunction, 229);
+  RUN_TEST(test_CanHaveNestedTryBlocksInASingleFunction_ThrowInside, 254);
+  RUN_TEST(test_CanHaveNestedTryBlocksInASingleFunction_ThrowOutside, 281);
+  RUN_TEST(test_AThrowWithoutATryCatchWillUseDefaultHandlerIfSpecified, 308);
+  RUN_TEST(test_AThrowWithoutOutsideATryCatchWillUseDefaultHandlerEvenAfterTryCatch, 319);
+
+  return (UnityEnd());
+}