Merge pull request #1363 from bitcraze/ToveRumar/unit_tests_update_fo…

…r_ruby unit tests update for newer ruby versions
bitcraze · Apr 11, 2024 · 28e647b · 28e647b
2 parents dbb09b5 + ced8fdd
commit 28e647b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/test/deck/core/test_deck_memory.c b/test/deck/core/test_deck_memory.c
@@ -541,7 +541,7 @@ void testReadFromPrimaryDeckMemory() {
     TEST_ASSERT_TRUE(read_isCalled);
     TEST_ASSERT_EQUAL_UINT32(100, read_vAddr);
     TEST_ASSERT_EQUAL_UINT8(30, read_len);
-    TEST_ASSERT_TRUE(actual)
+    TEST_ASSERT_TRUE(actual);
 }
 
 void testReadFromSecondaryDeckMemory() {
@@ -559,7 +559,7 @@ void testReadFromSecondaryDeckMemory() {
     TEST_ASSERT_TRUE(read_isCalled);
     TEST_ASSERT_EQUAL_UINT32(100, read_vAddr);
     TEST_ASSERT_EQUAL_UINT8(30, read_len);
-    TEST_ASSERT_TRUE(actual)
+    TEST_ASSERT_TRUE(actual);
 }
 
 void testReadFromDeckWithoutReadFunction() {
@@ -603,7 +603,7 @@ void testWriteToPrimaryDeckMemory() {
     TEST_ASSERT_TRUE(write_isCalled);
     TEST_ASSERT_EQUAL_UINT32(100, write_vAddr);
     TEST_ASSERT_EQUAL_UINT8(30, write_len);
-    TEST_ASSERT_TRUE(actual)
+    TEST_ASSERT_TRUE(actual);
 }
 
 void testWriteToSecondaryDeckMemory() {
@@ -621,7 +621,7 @@ void testWriteToSecondaryDeckMemory() {
     TEST_ASSERT_TRUE(write_isCalled);
     TEST_ASSERT_EQUAL_UINT32(100, write_vAddr);
     TEST_ASSERT_EQUAL_UINT8(30, write_len);
-    TEST_ASSERT_TRUE(actual)
+    TEST_ASSERT_TRUE(actual);
 }
 
 void testWriteToSecondaryDeckMemoryPassesInMemDef() {

diff --git a/test/modules/src/lighthouse/test_lighthouse_core.c b/test/modules/src/lighthouse/test_lighthouse_core.c
@@ -168,7 +168,7 @@ void testThatOffsetIsDecodedInUartFrame() {
   TEST_ASSERT_EQUAL_UINT32(expected, actual);
 
   // Verify the padding data was not affected
-  TEST_ASSERT_TRUE(frameOk)
+  TEST_ASSERT_TRUE(frameOk);
 }
 
 
@@ -187,7 +187,7 @@ void testThatBeamDataIsDecodedInUartFrame() {
   TEST_ASSERT_EQUAL_UINT32(expected, actual);
 
   // Verify the padding data was not affected
-  TEST_ASSERT_TRUE(frameOk)
+  TEST_ASSERT_TRUE(frameOk);
 }
 
 void testThatSensorIsDecodedInUartFrame() {

diff --git a/tools/test/rakefile_helper.rb b/tools/test/rakefile_helper.rb
@@ -1,16 +1,16 @@
-require 'yaml'
 require 'fileutils'
 require './vendor/unity/auto/unity_test_summary'
 require './vendor/unity/auto/generate_test_runner'
 require './vendor/unity/auto/colour_reporter'
+require './vendor/unity/auto/yaml_helper'
 
 module RakefileHelpers
 
   C_EXTENSION = '.c'
 
   def load_configuration(config_file)
     $cfg_file = config_file
-    $cfg = YAML.load(File.read($cfg_file))
+    $cfg  = YamlHelper.load_file($cfg_file)
     $colour_output = false unless $cfg['colour']
   end
 

diff --git a/vendor/unity b/vendor/unity