ceedling 0.15.6 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ceedling/version.rb +3 -3
  3. data/lib/ceedling/version.rb.erb +1 -1
  4. data/vendor/cmock/lib/cmock_config.rb +1 -0
  5. data/vendor/cmock/lib/cmock_generator.rb +1 -1
  6. data/vendor/cmock/lib/cmock_generator_utils.rb +1 -0
  7. data/vendor/cmock/test/unit/cmock_generator_main_test.rb +4 -0
  8. data/vendor/cmock/test/unit/cmock_generator_utils_test.rb +3 -0
  9. data/vendor/unity/README.md +203 -0
  10. data/vendor/unity/auto/generate_test_runner.rb +45 -18
  11. data/vendor/unity/docs/license.txt +18 -28
  12. data/vendor/unity/examples/example_1/makefile +18 -13
  13. data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode2_Runner.c +3 -3
  14. data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode_Runner.c +3 -3
  15. data/vendor/unity/examples/example_2/makefile +14 -10
  16. data/vendor/unity/examples/example_3/makefile +18 -13
  17. data/vendor/unity/examples/example_3/test/no_ruby/TestProductionCode2_Runner.c +3 -3
  18. data/vendor/unity/examples/example_3/test/no_ruby/TestProductionCode_Runner.c +3 -3
  19. data/vendor/unity/extras/fixture/rakefile_helper.rb +18 -18
  20. data/vendor/unity/extras/fixture/src/unity_fixture.c +2 -1
  21. data/vendor/unity/extras/fixture/test/unity_fixture_Test.c +1 -1
  22. data/vendor/unity/src/unity.c +78 -55
  23. data/vendor/unity/src/unity_internals.h +7 -3
  24. data/vendor/unity/test/expectdata/testsample_cmd.c +3 -3
  25. data/vendor/unity/test/expectdata/testsample_def.c +3 -3
  26. data/vendor/unity/test/expectdata/testsample_mock_cmd.c +3 -3
  27. data/vendor/unity/test/expectdata/testsample_mock_def.c +3 -3
  28. data/vendor/unity/test/expectdata/testsample_mock_new1.c +3 -3
  29. data/vendor/unity/test/expectdata/testsample_mock_new2.c +3 -3
  30. data/vendor/unity/test/expectdata/testsample_mock_param.c +3 -3
  31. data/vendor/unity/test/expectdata/testsample_mock_run1.c +3 -3
  32. data/vendor/unity/test/expectdata/testsample_mock_run2.c +3 -3
  33. data/vendor/unity/test/expectdata/testsample_mock_yaml.c +3 -3
  34. data/vendor/unity/test/expectdata/testsample_new1.c +3 -3
  35. data/vendor/unity/test/expectdata/testsample_new2.c +3 -3
  36. data/vendor/unity/test/expectdata/testsample_param.c +3 -3
  37. data/vendor/unity/test/expectdata/testsample_run1.c +3 -3
  38. data/vendor/unity/test/expectdata/testsample_run2.c +3 -3
  39. data/vendor/unity/test/expectdata/testsample_yaml.c +3 -3
  40. data/vendor/unity/test/rakefile +1 -1
  41. data/vendor/unity/test/tests/test_generate_test_runner.rb +8 -8
  42. data/vendor/unity/test/tests/testunity.c +1 -1
  43. metadata +3 -3
  44. data/ceedling-0.15.5.gem +0 -0
@@ -509,9 +509,9 @@ void UnityAssertDoubleSpecial(const _UD actual,
509
509
  // Error Strings We Might Need
510
510
  //-------------------------------------------------------
511
511
 
512
- extern const char* UnityStrErrFloat;
513
- extern const char* UnityStrErrDouble;
514
- extern const char* UnityStrErr64;
512
+ extern const char UnityStrErrFloat[];
513
+ extern const char UnityStrErrDouble[];
514
+ extern const char UnityStrErr64[];
515
515
 
516
516
  //-------------------------------------------------------
517
517
  // Test Running Macros
@@ -545,6 +545,10 @@ extern const char* UnityStrErr64;
545
545
 
546
546
  #define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
547
547
  #define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
548
+ #define UNITY_NEW_TEST(a) \
549
+ Unity.CurrentTestName = a; \
550
+ Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)(__LINE__); \
551
+ Unity.NumberOfTests++;
548
552
 
549
553
  #ifndef UNITY_BEGIN
550
554
  #define UNITY_BEGIN() UnityBegin(__FILE__)
@@ -38,7 +38,8 @@ extern void test_TheSecondThingToTest(void);
38
38
 
39
39
 
40
40
  //=======Test Reset Option=====
41
- void resetTest()
41
+ void resetTest(void);
42
+ void resetTest(void)
42
43
  {
43
44
  tearDown();
44
45
  setUp();
@@ -48,8 +49,7 @@ void resetTest()
48
49
  //=======MAIN=====
49
50
  int main(void)
50
51
  {
51
- UnityBegin();
52
- Unity.TestFile = "test/testdata/testsample.c";
52
+ UnityBegin("testdata/testsample.c");
53
53
  RUN_TEST(test_TheFirstThingToTest, 21);
54
54
  RUN_TEST(test_TheSecondThingToTest, 43);
55
55
 
@@ -34,7 +34,8 @@ extern void test_TheSecondThingToTest(void);
34
34
 
35
35
 
36
36
  //=======Test Reset Option=====
37
- void resetTest()
37
+ void resetTest(void);
38
+ void resetTest(void)
38
39
  {
39
40
  tearDown();
40
41
  setUp();
@@ -44,8 +45,7 @@ void resetTest()
44
45
  //=======MAIN=====
45
46
  int main(void)
46
47
  {
47
- UnityBegin();
48
- Unity.TestFile = "test/testdata/testsample.c";
48
+ UnityBegin("testdata/testsample.c");
49
49
  RUN_TEST(test_TheFirstThingToTest, 21);
50
50
  RUN_TEST(test_TheSecondThingToTest, 43);
51
51
 
@@ -56,7 +56,8 @@ static void CMock_Destroy(void)
56
56
  }
57
57
 
58
58
  //=======Test Reset Option=====
59
- void resetTest()
59
+ void resetTest(void);
60
+ void resetTest(void)
60
61
  {
61
62
  CMock_Verify();
62
63
  CMock_Destroy();
@@ -69,8 +70,7 @@ void resetTest()
69
70
  //=======MAIN=====
70
71
  int main(void)
71
72
  {
72
- UnityBegin();
73
- Unity.TestFile = "test/testdata/mocksample.c";
73
+ UnityBegin("testdata/mocksample.c");
74
74
  RUN_TEST(test_TheFirstThingToTest, 21);
75
75
  RUN_TEST(test_TheSecondThingToTest, 43);
76
76
 
@@ -52,7 +52,8 @@ static void CMock_Destroy(void)
52
52
  }
53
53
 
54
54
  //=======Test Reset Option=====
55
- void resetTest()
55
+ void resetTest(void);
56
+ void resetTest(void)
56
57
  {
57
58
  CMock_Verify();
58
59
  CMock_Destroy();
@@ -65,8 +66,7 @@ void resetTest()
65
66
  //=======MAIN=====
66
67
  int main(void)
67
68
  {
68
- UnityBegin();
69
- Unity.TestFile = "test/testdata/mocksample.c";
69
+ UnityBegin("testdata/mocksample.c");
70
70
  RUN_TEST(test_TheFirstThingToTest, 21);
71
71
  RUN_TEST(test_TheSecondThingToTest, 43);
72
72
 
@@ -65,7 +65,8 @@ static void CMock_Destroy(void)
65
65
  }
66
66
 
67
67
  //=======Test Reset Option=====
68
- void resetTest()
68
+ void resetTest(void);
69
+ void resetTest(void)
69
70
  {
70
71
  CMock_Verify();
71
72
  CMock_Destroy();
@@ -78,8 +79,7 @@ void resetTest()
78
79
  //=======MAIN=====
79
80
  int main(void)
80
81
  {
81
- UnityBegin();
82
- Unity.TestFile = "test/testdata/mocksample.c";
82
+ UnityBegin("testdata/mocksample.c");
83
83
  RUN_TEST(test_TheFirstThingToTest, 21);
84
84
  RUN_TEST(test_TheSecondThingToTest, 43);
85
85
 
@@ -64,7 +64,8 @@ a_custom_teardown();
64
64
  }
65
65
 
66
66
  //=======Test Reset Option=====
67
- void resetTest()
67
+ void resetTest(void);
68
+ void resetTest(void)
68
69
  {
69
70
  CMock_Verify();
70
71
  CMock_Destroy();
@@ -78,8 +79,7 @@ void resetTest()
78
79
  int main(void)
79
80
  {
80
81
  suite_setup();
81
- UnityBegin();
82
- Unity.TestFile = "test/testdata/mocksample.c";
82
+ UnityBegin("testdata/mocksample.c");
83
83
  RUN_TEST(test_TheFirstThingToTest, 21);
84
84
  RUN_TEST(test_TheSecondThingToTest, 43);
85
85
 
@@ -53,7 +53,8 @@ static void CMock_Destroy(void)
53
53
  }
54
54
 
55
55
  //=======Test Reset Option=====
56
- void resetTest()
56
+ void resetTest(void);
57
+ void resetTest(void)
57
58
  {
58
59
  CMock_Verify();
59
60
  CMock_Destroy();
@@ -66,8 +67,7 @@ void resetTest()
66
67
  //=======MAIN=====
67
68
  int main(void)
68
69
  {
69
- UnityBegin();
70
- Unity.TestFile = "test/testdata/mocksample.c";
70
+ UnityBegin("testdata/mocksample.c");
71
71
  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
72
72
  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
73
73
 
@@ -65,7 +65,8 @@ static void CMock_Destroy(void)
65
65
  }
66
66
 
67
67
  //=======Test Reset Option=====
68
- void resetTest()
68
+ void resetTest(void);
69
+ void resetTest(void)
69
70
  {
70
71
  CMock_Verify();
71
72
  CMock_Destroy();
@@ -78,8 +79,7 @@ void resetTest()
78
79
  //=======MAIN=====
79
80
  int main(void)
80
81
  {
81
- UnityBegin();
82
- Unity.TestFile = "test/testdata/mocksample.c";
82
+ UnityBegin("testdata/mocksample.c");
83
83
  RUN_TEST(test_TheFirstThingToTest, 21);
84
84
  RUN_TEST(test_TheSecondThingToTest, 43);
85
85
 
@@ -64,7 +64,8 @@ a_custom_teardown();
64
64
  }
65
65
 
66
66
  //=======Test Reset Option=====
67
- void resetTest()
67
+ void resetTest(void);
68
+ void resetTest(void)
68
69
  {
69
70
  CMock_Verify();
70
71
  CMock_Destroy();
@@ -78,8 +79,7 @@ void resetTest()
78
79
  int main(void)
79
80
  {
80
81
  suite_setup();
81
- UnityBegin();
82
- Unity.TestFile = "test/testdata/mocksample.c";
82
+ UnityBegin("testdata/mocksample.c");
83
83
  RUN_TEST(test_TheFirstThingToTest, 21);
84
84
  RUN_TEST(test_TheSecondThingToTest, 43);
85
85
 
@@ -65,7 +65,8 @@ a_yaml_setup();
65
65
  }
66
66
 
67
67
  //=======Test Reset Option=====
68
- void resetTest()
68
+ void resetTest(void);
69
+ void resetTest(void)
69
70
  {
70
71
  CMock_Verify();
71
72
  CMock_Destroy();
@@ -79,8 +80,7 @@ void resetTest()
79
80
  int main(void)
80
81
  {
81
82
  suite_setup();
82
- UnityBegin();
83
- Unity.TestFile = "test/testdata/mocksample.c";
83
+ UnityBegin("testdata/mocksample.c");
84
84
  RUN_TEST(test_TheFirstThingToTest, 21);
85
85
  RUN_TEST(test_TheSecondThingToTest, 43);
86
86
 
@@ -44,7 +44,8 @@ extern void test_TheSecondThingToTest(void);
44
44
 
45
45
 
46
46
  //=======Test Reset Option=====
47
- void resetTest()
47
+ void resetTest(void);
48
+ void resetTest(void)
48
49
  {
49
50
  tearDown();
50
51
  setUp();
@@ -54,8 +55,7 @@ void resetTest()
54
55
  //=======MAIN=====
55
56
  int main(void)
56
57
  {
57
- UnityBegin();
58
- Unity.TestFile = "test/testdata/testsample.c";
58
+ UnityBegin("testdata/testsample.c");
59
59
  RUN_TEST(test_TheFirstThingToTest, 21);
60
60
  RUN_TEST(test_TheSecondThingToTest, 43);
61
61
 
@@ -46,7 +46,8 @@ a_custom_teardown();
46
46
  }
47
47
 
48
48
  //=======Test Reset Option=====
49
- void resetTest()
49
+ void resetTest(void);
50
+ void resetTest(void)
50
51
  {
51
52
  tearDown();
52
53
  setUp();
@@ -57,8 +58,7 @@ void resetTest()
57
58
  int main(void)
58
59
  {
59
60
  suite_setup();
60
- UnityBegin();
61
- Unity.TestFile = "test/testdata/testsample.c";
61
+ UnityBegin("testdata/testsample.c");
62
62
  RUN_TEST(test_TheFirstThingToTest, 21);
63
63
  RUN_TEST(test_TheSecondThingToTest, 43);
64
64
 
@@ -35,7 +35,8 @@ extern void test_TheSecondThingToTest(void);
35
35
 
36
36
 
37
37
  //=======Test Reset Option=====
38
- void resetTest()
38
+ void resetTest(void);
39
+ void resetTest(void)
39
40
  {
40
41
  tearDown();
41
42
  setUp();
@@ -45,8 +46,7 @@ void resetTest()
45
46
  //=======MAIN=====
46
47
  int main(void)
47
48
  {
48
- UnityBegin();
49
- Unity.TestFile = "test/testdata/testsample.c";
49
+ UnityBegin("testdata/testsample.c");
50
50
  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
51
51
  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
52
52
 
@@ -44,7 +44,8 @@ extern void test_TheSecondThingToTest(void);
44
44
 
45
45
 
46
46
  //=======Test Reset Option=====
47
- void resetTest()
47
+ void resetTest(void);
48
+ void resetTest(void)
48
49
  {
49
50
  tearDown();
50
51
  setUp();
@@ -54,8 +55,7 @@ void resetTest()
54
55
  //=======MAIN=====
55
56
  int main(void)
56
57
  {
57
- UnityBegin();
58
- Unity.TestFile = "test/testdata/testsample.c";
58
+ UnityBegin("testdata/testsample.c");
59
59
  RUN_TEST(test_TheFirstThingToTest, 21);
60
60
  RUN_TEST(test_TheSecondThingToTest, 43);
61
61
 
@@ -46,7 +46,8 @@ a_custom_teardown();
46
46
  }
47
47
 
48
48
  //=======Test Reset Option=====
49
- void resetTest()
49
+ void resetTest(void);
50
+ void resetTest(void)
50
51
  {
51
52
  tearDown();
52
53
  setUp();
@@ -57,8 +58,7 @@ void resetTest()
57
58
  int main(void)
58
59
  {
59
60
  suite_setup();
60
- UnityBegin();
61
- Unity.TestFile = "test/testdata/testsample.c";
61
+ UnityBegin("testdata/testsample.c");
62
62
  RUN_TEST(test_TheFirstThingToTest, 21);
63
63
  RUN_TEST(test_TheSecondThingToTest, 43);
64
64
 
@@ -47,7 +47,8 @@ a_yaml_setup();
47
47
  }
48
48
 
49
49
  //=======Test Reset Option=====
50
- void resetTest()
50
+ void resetTest(void);
51
+ void resetTest(void)
51
52
  {
52
53
  tearDown();
53
54
  setUp();
@@ -58,8 +59,7 @@ void resetTest()
58
59
  int main(void)
59
60
  {
60
61
  suite_setup();
61
- UnityBegin();
62
- Unity.TestFile = "test/testdata/testsample.c";
62
+ UnityBegin("testdata/testsample.c");
63
63
  RUN_TEST(test_TheFirstThingToTest, 21);
64
64
  RUN_TEST(test_TheSecondThingToTest, 43);
65
65
 
@@ -34,7 +34,7 @@ end
34
34
 
35
35
  desc "Test unity's helper scripts"
36
36
  task :scripts => [:prepare_for_tests] do
37
- Dir['test/test_*.rb'].each do |scriptfile|
37
+ Dir['tests/test_*.rb'].each do |scriptfile|
38
38
  require "./"+scriptfile
39
39
  end
40
40
  end
@@ -4,12 +4,12 @@
4
4
  # [Released under MIT License. Please refer to license.txt for details]
5
5
  # ==========================================
6
6
 
7
- require './auto/generate_test_runner.rb'
7
+ require '../auto/generate_test_runner.rb'
8
8
 
9
- TEST_FILE = 'test/testdata/testsample.c'
10
- TEST_MOCK = 'test/testdata/mocksample.c'
9
+ TEST_FILE = 'testdata/testsample.c'
10
+ TEST_MOCK = 'testdata/mocksample.c'
11
11
  OUT_FILE = 'build/testsample_'
12
- EXP_FILE = 'test/expectdata/testsample_'
12
+ EXP_FILE = 'expectdata/testsample_'
13
13
 
14
14
  $generate_test_runner_failures = 0
15
15
 
@@ -53,22 +53,22 @@ end
53
53
 
54
54
  should "GenerateARunnerByPullingYamlOptions" do
55
55
  subtest = 'yaml'
56
- cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
56
+ cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
57
57
  `#{cmdstr}`
58
58
  verify_output_equal(subtest)
59
59
 
60
- cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
60
+ cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
61
61
  `#{cmdstr}`
62
62
  verify_output_equal('mock_' + subtest)
63
63
  end
64
64
 
65
65
  should "GenerateARunnerByPullingCommandlineOptions" do
66
66
  subtest = 'cmd'
67
- cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
67
+ cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
68
68
  `#{cmdstr}`
69
69
  verify_output_equal(subtest)
70
70
 
71
- cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
71
+ cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
72
72
  `#{cmdstr}`
73
73
  verify_output_equal('mock_' + subtest)
74
74
  end
@@ -218,7 +218,7 @@ void testNotEqualInt16s(void)
218
218
  void testNotEqualInt32s(void)
219
219
  {
220
220
  EXPECT_ABORT_BEGIN
221
- TEST_ASSERT_EQUAL_INT32(-2147483647, -2147483646);
221
+ TEST_ASSERT_EQUAL_INT32(-2147483647, -2147483648); //use largest 32 bit negative to test printability
222
222
  VERIFY_FAILS_END
223
223
  }
224
224
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ceedling
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.6
4
+ version: 0.16.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Karlesky, Mark VanderVoord
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-08-02 00:00:00.000000000 Z
13
+ date: 2014-12-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: thor
@@ -102,7 +102,6 @@ files:
102
102
  - assets/rakefile_with_guts.rb
103
103
  - assets/test_example_file.c
104
104
  - bin/ceedling
105
- - ceedling-0.15.5.gem
106
105
  - ceedling.gemspec
107
106
  - config/test_environment.rb
108
107
  - docs/CeedlingLogo.png
@@ -807,6 +806,7 @@ files:
807
806
  - vendor/unity/extras/fixture/test/unity_fixture_TestRunner.c
808
807
  - vendor/unity/extras/fixture/test/unity_output_Spy.c
809
808
  - vendor/unity/extras/fixture/test/unity_output_Spy.h
809
+ - vendor/unity/README.md
810
810
  - vendor/unity/test/expectdata/testsample_cmd.c
811
811
  - vendor/unity/test/expectdata/testsample_def.c
812
812
  - vendor/unity/test/expectdata/testsample_mock_cmd.c
Binary file