ceedling 0.19.0 → 0.20.2

data/vendor/cmock/vendor/unity/test/expectdata/testsample_head1.c

@@ -29,6 +29,8 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_TheFirstThingToTest(void);
 extern void test_TheSecondThingToTest(void);
+extern void test_TheThirdThingToTest(void);
+extern void test_TheFourthThingToTest(void);
 
 
 //=======Test Reset Option=====
@@ -46,6 +48,8 @@ int main(void)
   UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
+  RUN_TEST(test_TheThirdThingToTest, 53);
+  RUN_TEST(test_TheFourthThingToTest, 58);
 
   return (UnityEnd());
 }

data/vendor/cmock/vendor/unity/test/expectdata/testsample_head1.h

@@ -1,12 +1,15 @@
 /* AUTOGENERATED FILE. DO NOT EDIT. */
-#ifndef __B_U_I_L_D__T_E_S_T_S_A_M_P_L_E___H_E_A_D_1__H_
-#define __B_U_I_L_D__T_E_S_T_S_A_M_P_L_E___H_E_A_D_1__H_
+#ifndef _TESTSAMPLE_HEAD1_H
+#define _TESTSAMPLE_HEAD1_H
 
+#include "unity.h"
 #include "funky.h"
 #include "stanky.h"
 #include <setjmp.h>
 
-void test_TheFirstThingToTest();
-void test_TheSecondThingToTest();
+void test_TheFirstThingToTest(void);
+void test_TheSecondThingToTest(void);
+void test_TheThirdThingToTest(void);
+void test_TheFourthThingToTest(void);
 #endif
 

data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_head1.h

@@ -1,11 +1,13 @@
 /* AUTOGENERATED FILE. DO NOT EDIT. */
-#ifndef __B_U_I_L_D__T_E_S_T_S_A_M_P_L_E___M_O_C_K___H_E_A_D_1__H_
-#define __B_U_I_L_D__T_E_S_T_S_A_M_P_L_E___M_O_C_K___H_E_A_D_1__H_
+#ifndef _TESTSAMPLE_MOCK_HEAD1_H
+#define _TESTSAMPLE_MOCK_HEAD1_H
 
+#include "unity.h"
+#include "cmock.h"
 #include "funky.h"
 #include <setjmp.h>
 
-void test_TheFirstThingToTest();
-void test_TheSecondThingToTest();
+void test_TheFirstThingToTest(void);
+void test_TheSecondThingToTest(void);
 #endif
 

data/vendor/cmock/vendor/unity/test/expectdata/testsample_new1.c

@@ -41,6 +41,8 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_TheFirstThingToTest(void);
 extern void test_TheSecondThingToTest(void);
+extern void test_TheThirdThingToTest(void);
+extern void test_TheFourthThingToTest(void);
 
 
 //=======Test Reset Option=====
@@ -58,6 +60,8 @@ int main(void)
   UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
+  RUN_TEST(test_TheThirdThingToTest, 53);
+  RUN_TEST(test_TheFourthThingToTest, 58);
 
   return (UnityEnd());
 }

data/vendor/cmock/vendor/unity/test/expectdata/testsample_new2.c

@@ -31,6 +31,8 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_TheFirstThingToTest(void);
 extern void test_TheSecondThingToTest(void);
+extern void test_TheThirdThingToTest(void);
+extern void test_TheFourthThingToTest(void);
 
 
 //=======Suite Setup=====
@@ -61,6 +63,8 @@ int main(void)
   UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
+  RUN_TEST(test_TheThirdThingToTest, 53);
+  RUN_TEST(test_TheFourthThingToTest, 58);
 
   return suite_teardown(UnityEnd());
 }

data/vendor/cmock/vendor/unity/test/expectdata/testsample_param.c

@@ -32,6 +32,8 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_TheFirstThingToTest(void);
 extern void test_TheSecondThingToTest(void);
+extern void test_TheThirdThingToTest(void);
+extern void test_TheFourthThingToTest(void);
 
 
 //=======Test Reset Option=====
@@ -49,6 +51,8 @@ int main(void)
   UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
   RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
+  RUN_TEST(test_TheThirdThingToTest, 53, RUN_TEST_NO_ARGS);
+  RUN_TEST(test_TheFourthThingToTest, 58, RUN_TEST_NO_ARGS);
 
   return (UnityEnd());
 }

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

@@ -41,6 +41,8 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_TheFirstThingToTest(void);
 extern void test_TheSecondThingToTest(void);
+extern void test_TheThirdThingToTest(void);
+extern void test_TheFourthThingToTest(void);
 
 
 //=======Test Reset Option=====
@@ -58,6 +60,8 @@ int main(void)
   UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
+  RUN_TEST(test_TheThirdThingToTest, 53);
+  RUN_TEST(test_TheFourthThingToTest, 58);
 
   return (UnityEnd());
 }

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

@@ -31,6 +31,8 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_TheFirstThingToTest(void);
 extern void test_TheSecondThingToTest(void);
+extern void test_TheThirdThingToTest(void);
+extern void test_TheFourthThingToTest(void);
 
 
 //=======Suite Setup=====
@@ -61,6 +63,8 @@ int main(void)
   UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
+  RUN_TEST(test_TheThirdThingToTest, 53);
+  RUN_TEST(test_TheFourthThingToTest, 58);
 
   return suite_teardown(UnityEnd());
 }

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

@@ -38,6 +38,8 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_TheFirstThingToTest(void);
 extern void test_TheSecondThingToTest(void);
+extern void test_TheThirdThingToTest(void);
+extern void test_TheFourthThingToTest(void);
 
 
 //=======Suite Setup=====
@@ -62,6 +64,8 @@ int main(void)
   UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
+  RUN_TEST(test_TheThirdThingToTest, 53);
+  RUN_TEST(test_TheFourthThingToTest, 58);
 
   return (UnityEnd());
 }

data/vendor/cmock/vendor/unity/test/rakefile_helper.rb

@@ -97,7 +97,7 @@ module RakefileHelpers
     if $cfg['compiler']['defines']['items'].nil?
       defines  = ''
     else
-      defines  = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'])
+      defines  = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=putcharSpy'])
     end
     options  = squash('', $cfg['compiler']['options'])
     includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])

data/vendor/cmock/vendor/unity/test/targets/clang_file.yml

@@ -57,7 +57,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_64
       - UNITY_OUTPUT_RESULTS_FILE

data/vendor/cmock/vendor/unity/test/targets/clang_strict.yml

@@ -57,7 +57,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
       - UNITY_SUPPORT_64

data/vendor/cmock/vendor/unity/test/targets/gcc_32.yml

@@ -19,7 +19,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_EXCLUDE_STDINT_H
       - UNITY_EXCLUDE_LIMITS_H
       - UNITY_EXCLUDE_SIZEOF

data/vendor/cmock/vendor/unity/test/targets/gcc_64.yml

@@ -19,7 +19,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_EXCLUDE_STDINT_H
       - UNITY_EXCLUDE_LIMITS_H
       - UNITY_EXCLUDE_SIZEOF

data/vendor/cmock/vendor/unity/test/targets/gcc_auto_limits.yml

@@ -19,7 +19,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_EXCLUDE_STDINT_H
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES

data/vendor/cmock/vendor/unity/test/targets/gcc_auto_sizeof.yml

@@ -19,7 +19,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_EXCLUDE_STDINT_H
       - UNITY_EXCLUDE_LIMITS_H
       - UNITY_INCLUDE_DOUBLE

data/vendor/cmock/vendor/unity/test/targets/gcc_auto_stdint.yml

@@ -32,7 +32,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
       - UNITY_SUPPORT_64

data/vendor/cmock/vendor/unity/test/targets/gcc_manual_math.yml

@@ -19,7 +19,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_OUTPUT_CHAR=putcharSpy
       - UNITY_EXCLUDE_MATH_H
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES

data/vendor/cmock/vendor/unity/test/testdata/testsample.c

@@ -35,15 +35,32 @@ void test_ShouldBeIgnored(void)
 //void test_ShouldAlsoNotBeTested(void)
 //{
 //    Call_An_Expect();
-//    
+//
 //    CallAFunction();
 //    test_CallAFunctionThatLooksLikeATest();
 //}
 
 void test_TheSecondThingToTest(void)
 {
+    uint8_t* crazyString = "GET / HTTP/1.1\r\nHost: 127.0.0.1:8081\r\nConnection: keep-alive\r\nCache-Control: no-cache\r\nUser-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36\r\nPostman-Token: 768c7149-c3fb-f704-71a2-63918d9195b2\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, sdch\r\nAccept-Language: en-GB,en-US;q=0.8,en;q=0.6\r\n\r\n";
+
+    Call_An_Expect();
+
+    CallAFunction();
+    test_CallAFunctionThatLooksLikeATest();
+}
+
+void test_TheThirdThingToTest(void)
+{
+    CallAFunction();
+}
+
+void test_TheFourthThingToTest(void)
+{
+    uint8_t* anotherString = "GET / HTTP/1.1\r\nHost: 127.0.0.1:8081\r\nConnection: keep-alive\r\nCache-Control: no-cache\r\nUser-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36\r\nPostman-Token: 768c7149-c3fb-f704-71a2-63918d9195b2\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, sdch\r\nAccept-Language: en-GB,en-US;q=0.8,en;q=0.6\r\n\r\n";
+
     Call_An_Expect();
-    
+
     CallAFunction();
     test_CallAFunctionThatLooksLikeATest();
 }

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

@@ -8,6 +8,8 @@
 #include "unity.h"
 #include <string.h>
 
+int putcharSpy(int c);
+
 // Dividing by these constants produces +/- infinity.
 // The rationale is given in UnityAssertFloatIsInf's body.
 #ifndef UNITY_EXCLUDE_FLOAT
@@ -27,6 +29,9 @@ static const _UD d_zero = 0.0;
     Unity.CurrentTestFailed = (Unity.CurrentTestFailed == 1) ? 0 : 1;          \
     if (Unity.CurrentTestFailed == 1) {                                        \
       SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
+      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
+      UNITY_OUTPUT_CHAR(':');                                                  \
+      UnityPrint(Unity.CurrentTestName);                                       \
       UnityPrint("[[[[ Previous Test Should Have Failed But Did Not ]]]]");    \
       UNITY_OUTPUT_CHAR('\n');                                                 \
     }
@@ -107,6 +112,12 @@ void testUnitySizeInitializationReminder(void)
     TEST_ASSERT_EQUAL_MESSAGE(sizeof(_Expected_Unity), sizeof(Unity), message);
 }
 
+void testPassShouldEndImmediatelyWithPass(void)
+{
+    TEST_PASS();
+    TEST_FAIL_MESSAGE("We should have passed already and finished this test");
+}
+
 void testTrue(void)
 {
     TEST_ASSERT(1);
@@ -1192,6 +1203,12 @@ void testINT32sNotWithinDelta(void)
     VERIFY_FAILS_END
 }
 
+void testINT32sNotWithinDeltaAndDifferenceOverflows(void)
+{
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_INT32_WITHIN(1, -1, 0x7FFFFFFF);
+    VERIFY_FAILS_END
+}
 void testINT32sNotWithinDeltaAndCustomMessage(void)
 {
     EXPECT_ABORT_BEGIN
@@ -2160,12 +2177,12 @@ void testIgnoredAndThenFailInTearDown(void)
 
 // Tricky series of macros to set USING_OUTPUT_SPY
 #define USING_SPY_AS(a)           EXPAND_AND_USE_2ND(ASSIGN_VALUE(a), 0)
-#define ASSIGN_VALUE(a)           VAL_FUNC_##a
-#define VAL_FUNC_putcharSpy()     0, 1
+#define ASSIGN_VALUE(a)           VAL_##a
+#define VAL_putcharSpy            0, 1
 #define EXPAND_AND_USE_2ND(a, b)  SECOND_PARAM(a, b, throwaway)
 #define SECOND_PARAM(a, b, ...)   b
-#if USING_SPY_AS(UNITY_OUTPUT_CHAR())
-  #define USING_OUTPUT_SPY // true only if UNITY_OUTPUT_CHAR = putchar_Spy
+#if USING_SPY_AS(UNITY_OUTPUT_CHAR)
+  #define USING_OUTPUT_SPY // true only if UNITY_OUTPUT_CHAR = putcharSpy
 #endif
 
 #ifdef USING_OUTPUT_SPY
@@ -2496,6 +2513,17 @@ void testINT64sNotWithinDelta(void)
 #endif
 }
 
+void testINT64sNotWithinDeltaAndDifferenceOverflows(void)
+{
+#ifndef UNITY_SUPPORT_64
+    TEST_IGNORE();
+#else
+    EXPECT_ABORT_BEGIN
+    TEST_ASSERT_INT64_WITHIN(1, 0x8000000000000000, 0x7FFFFFFFFFFFFFFF);
+    VERIFY_FAILS_END
+#endif
+}
+
 void testEqualHEX64Arrays(void)
 {
 #ifndef UNITY_SUPPORT_64
@@ -2952,6 +2980,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
@@ -3457,6 +3497,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

data/vendor/unity/auto/generate_test_runner.rb

@@ -91,7 +91,9 @@ class UnityTestRunnerGenerator
   def find_tests(source)
     tests_and_line_numbers = []
 
-    source_scrubbed = source.gsub(/\/\/.*$/, '')               # remove line comments
+    source_scrubbed = source.clone
+    source_scrubbed = source_scrubbed.gsub(/"[^"]*"/, '')      # remove things in strings
+    source_scrubbed = source_scrubbed.gsub(/\/\/.*$/, '')      # remove line comments
     source_scrubbed = source_scrubbed.gsub(/\/\*.*?\*\//m, '') # remove block comments
     lines = source_scrubbed.split(/(^\s*\#.*$)                 # Treat preprocessor directives as a logical line
                               | (;|\{|\}) /x)                  # Match ;, {, and } as end of lines
@@ -329,7 +331,7 @@ class UnityTestRunnerGenerator
       output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h','')}.h\""}")
     end
     output.puts "\n"
-    tests.each do |test| 
+    tests.each do |test|
       if ((test[:params].nil?) or (test[:params].empty?))
         output.puts("void #{test[:test]}(void);")
       else

data/vendor/unity/auto/stylize_as_junit.rb

@@ -0,0 +1,260 @@
+#!/usr/bin/ruby
+#
+# unity_to_junit.rb
+#
+require 'fileutils'
+require 'optparse'
+require 'ostruct'
+require 'set'
+
+require 'pp'
+
+VERSION = 1.0
+
+class ArgvParser
+
+  #
+  # Return a structure describing the options.
+  #
+  def self.parse(args)
+    # The options specified on the command line will be collected in *options*.
+    # We set default values here.
+    options = OpenStruct.new
+    options.results_dir = "."
+    options.root_path = "."
+    options.out_file = "results.xml"
+
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: unity_to_junit.rb [options]"
+
+      opts.separator ""
+      opts.separator "Specific options:"
+
+      opts.on("-r", "--results <dir>", "Look for Unity Results files here.") do |results|
+        #puts "results #{results}"
+        options.results_dir = results
+      end
+
+      opts.on("-p", "--root_path <path>", "Prepend this path to files in results.") do |root_path|
+        options.root_path = root_path
+      end
+
+      opts.on("-o", "--output <filename>", "XML file to generate.") do |out_file|
+        #puts "out_file: #{out_file}"
+        options.out_file = out_file
+      end
+
+      opts.separator ""
+      opts.separator "Common options:"
+
+      # No argument, shows at tail.  This will print an options summary.
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+
+      # Another typical switch to print the version.
+      opts.on_tail("--version", "Show version") do
+        puts "unity_to_junit.rb version #{VERSION}"
+        exit
+      end
+    end
+
+    opts.parse!(args)
+    options
+  end  # parse()
+
+end  # class OptparseExample
+
+class UnityToJUnit
+  include FileUtils::Verbose
+  attr_reader :report, :total_tests, :failures, :ignored
+
+  def initialize
+    @report = ''
+    @unit_name = ''
+  end
+
+  def run
+    # Clean up result file names
+    results = @targets.map {|target| target.gsub(/\\/,"/")}
+    #puts "Output File: #{@out_file}"
+    f = File.new(@out_file, "w")
+    write_xml_header(f)
+    write_suites_header( f )
+    results.each do |result_file|
+      lines = File.readlines(result_file).map { |line| line.chomp }
+      if lines.length == 0
+        raise "Empty test result file: #{result_file}"
+      else
+        result_output = get_details(result_file, lines)
+        tests,failures,ignored = parse_test_summary(lines)
+        result_output[:counts][:total] = tests
+        result_output[:counts][:failed] = failures
+        result_output[:counts][:ignored] = ignored
+        result_output[:counts][:passed] = (result_output[:counts][:total] - result_output[:counts][:failed] - result_output[:counts][:ignored])
+      end
+      #use line[0] from the test output to get the test_file path and name
+      test_file_str = lines[0].gsub("\\","/")
+      test_file_str = test_file_str.split(":")
+      test_file = test_file_str[0] + ':' + test_file_str[1]
+      result_output[:source][:path] = File.dirname(test_file)
+      result_output[:source][:file] = File.basename(test_file)
+
+      # save result_output
+      @unit_name = File.basename(test_file, ".*")
+
+      write_suite_header( result_output[:counts], f)
+      write_failures( result_output, f )
+      write_tests( result_output, f )
+      write_ignored( result_output, f )
+      write_suite_footer( f )
+    end
+    write_suites_footer( f )
+    f.close
+  end
+
+  def set_targets(target_array)
+    @targets = target_array
+  end
+
+  def set_root_path(path)
+    @root = path
+  end
+  def set_out_file(filename)
+    @out_file = filename
+  end
+  def usage(err_msg=nil)
+    puts "\nERROR: "
+    puts err_msg if err_msg
+    puts "Usage: unity_to_junit.rb [options]"
+    puts ""
+    puts "Specific options:"
+    puts "    -r, --results <dir>              Look for Unity Results files here."
+    puts "    -p, --root_path <path>           Prepend this path to files in results."
+    puts "    -o, --output <filename>          XML file to generate."
+    puts ""
+    puts "Common options:"
+    puts "    -h, --help                       Show this message"
+    puts "        --version                    Show version"
+
+    exit 1
+  end
+
+  protected
+  def get_details(result_file, lines)
+    results = get_results_structure
+    lines.each do |line|
+      line = line.gsub("\\","/")
+      src_file,src_line,test_name,status,msg = line.split(/:/)
+      line_out = ((@root and (@root != 0)) ? "#{@root}#{line}" : line ).gsub(/\//, "\\")
+      case(status)
+        when 'IGNORE' then results[:ignores] << {:test => test_name, :line => src_line, :message => msg}
+        when 'FAIL'   then results[:failures] << {:test => test_name, :line => src_line, :message => msg}
+        when 'PASS'   then results[:successes] << {:test => test_name, :line => src_line, :message => msg}
+      end
+    end
+    return results
+  end
+
+  def parse_test_summary(summary)
+    if summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
+      [$1.to_i,$2.to_i,$3.to_i]
+    else
+      raise "Couldn't parse test results: #{summary}"
+    end
+  end
+  def here; File.expand_path(File.dirname(__FILE__)); end
+
+  private
+
+  def get_results_structure
+    return {
+      :source    => {:path => '', :file => ''},
+      :successes => [],
+      :failures  => [],
+      :ignores   => [],
+      :counts    => {:total => 0, :passed => 0, :failed => 0, :ignored  => 0},
+      :stdout    => [],
+    }
+  end
+
+  def write_xml_header( stream )
+    stream.puts "<?xml version='1.0' encoding='utf-8' ?>"
+  end
+
+  def write_suites_header( stream )
+    stream.puts "<testsuites>"
+  end
+
+  def write_suite_header( counts, stream )
+    stream.puts "\t<testsuite errors=\"0\" skipped=\"#{counts[:ignored]}\" failures=\"#{counts[:failed]}\" tests=\"#{counts[:total]}\" name=\"unity\">"
+  end
+
+  def write_failures( results, stream )
+    result = results[:failures]
+    result.each do |item|
+      filename = File.join(results[:source][:path], File.basename(results[:source][:file], '.*'))
+      stream.puts "\t\t<testcase classname=\"#{@unit_name}\" name=\"#{item[:test]}\" time=\"0\">"
+      stream.puts "\t\t\t<failure message=\"#{item[:message]}\" type=\"Assertion\"/>"
+      stream.puts "\t\t\t<system-err>&#xD;[File] #{filename}&#xD;[Line] #{item[:line]}&#xD;</system-err>"
+      stream.puts "\t\t</testcase>"
+    end
+  end
+
+  def write_tests( results, stream )
+    result = results[:successes]
+    result.each do |item|
+      filename = File.join(results[:source][:path], File.basename(results[:source][:file], '.*'))
+      stream.puts "\t\t<testcase classname=\"#{@unit_name}\" name=\"#{item[:test]}\" time=\"0\" />"
+    end
+  end
+
+  def write_ignored( results, stream )
+    result = results[:ignores]
+    result.each do |item|
+      filename = File.join(results[:source][:path], File.basename(results[:source][:file], '.*'))
+      puts "Writing ignored tests for test harness: #{filename}"
+      stream.puts "\t\t<testcase classname=\"#{@unit_name}\" name=\"#{item[:test]}\" time=\"0\">"
+      stream.puts "\t\t\t<skipped message=\"#{item[:message]}\" type=\"Assertion\"/>"
+      stream.puts "\t\t\t<system-err>&#xD;[File] #{filename}&#xD;[Line] #{item[:line]}&#xD;</system-err>"
+      stream.puts "\t\t</testcase>"
+    end
+  end
+
+  def write_suite_footer( stream )
+    stream.puts "\t</testsuite>"
+  end
+
+  def write_suites_footer( stream )
+    stream.puts "</testsuites>"
+  end
+end #UnityToJUnit
+
+if __FILE__ == $0
+  #parse out the command options
+  options = ArgvParser.parse(ARGV)
+
+  #create an instance to work with
+  utj = UnityToJUnit.new
+  begin
+    #look in the specified or current directory for result files
+    targets = "#{options.results_dir.gsub(/\\/, '/')}**/*.test*"
+
+    results = Dir[targets]
+    raise "No *.testpass, *.testfail, or *.testresults files found in '#{targets}'" if results.empty?
+    utj.set_targets(results)
+
+    #set the root path
+    utj.set_root_path(options.root_path)
+
+    #set the output XML file name
+    #puts "Output File from options: #{options.out_file}"
+    utj.set_out_file(options.out_file)
+
+    #run the summarizer
+    puts utj.run
+  rescue Exception => e
+    utj.usage e.message
+  end
+end