Merge pull request #282 from TypedDevs/feat/support-clock-without-perl

Support displaying clock without perl (for non-macOS)

Author: Chemaclass

CHANGELOG.md

@@ -5,7 +5,8 @@
 - Fix echo does not break test execution results
 - Add bashunit facade to enable custom assertions
 - Document how to verify the `sha256sum` of the final executable
-- Enable display execution time on MacOS with `SHOW_EXECUTION_TIME`
+- Enable display execution time on macOS with `SHOW_EXECUTION_TIME`
+- Support for displaying the clock without `perl` (for non-macOS)
 - Add `-l|--log-junit <log.xml>` option
 - Add `-r|--report-html <report.html>` option
 

src/clock.sh

@@ -1,11 +1,22 @@
 #!/bin/bash
 
 function clock::now() {
-  perl -MTime::HiRes -e 'printf("%.0f\n",Time::HiRes::time()*1000)'
+  if perl --version > /dev/null 2>&1; then
+    perl -MTime::HiRes -e 'printf("%.0f\n",Time::HiRes::time()*1000)'
+  elif [[ "$_OS" != "OSX" ]]; then
+    date +%s%N
+  else
+    echo ""
+  fi
 }
 
 _START_TIME=$(clock::now)
 
 function clock::runtime_in_milliseconds() {
-  echo $(( $(clock::now) - _START_TIME ))
+  end_time=$(clock::now)
+  if [[ -n $end_time ]]; then
+    echo $(( end_time - _START_TIME ))
+  else
+    echo ""
+  fi
 }

tests/unit/clock_test.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+__ORIGINAL_OS=""
+
+function set_up_before_script() {
+  __ORIGINAL_OS=$_OS
+}
+
+function tear_down_after_script() {
+  export _OS=$__ORIGINAL_OS
+}
+
+function mock_non_existing_fn() {
+  return 127;
+}
+
+function test_now_with_perl() {
+  mock perl echo "1720705883457"
+
+  assert_equals "1720705883457" "$(clock::now)"
+}
+
+function test_now_on_linux_without_perl() {
+  export _OS="Linux"
+  mock perl mock_non_existing_fn
+  mock date echo "1720705883457"
+
+  assert_equals "1720705883457" "$(clock::now)"
+}
+function test_now_on_windows_without_perl() {
+  export _OS="Windows"
+  mock perl mock_non_existing_fn
+  mock date echo "1720705883457"
+
+  assert_equals "1720705883457" "$(clock::now)"
+}
+
+function test_now_on_osx_without_perl() {
+  export _OS="OSX"
+  mock perl mock_non_existing_fn
+
+  assert_equals "" "$(clock::now)"
+}
+
+function test_runtime_in_milliseconds_when_not_empty_time() {
+  mock perl echo "1720705883457"
+
+  assert_not_empty "$(clock::runtime_in_milliseconds)"
+}
+
+function test_runtime_in_milliseconds_when_empty_time() {
+  export _OS="OSX"
+  mock perl mock_non_existing_fn
+
+  assert_empty "$(clock::runtime_in_milliseconds)"
+}

tests/unit/console_results_test.sh

@@ -266,11 +266,6 @@ function test_total_asserts_is_the_sum_of_passed_skipped_incomplete_snapshot_and
 }
 
 function test_render_execution_time() {
-  if [[ $_OS == "OSX" ]]; then
-    skip "Skipping in OSX"
-    return
-  fi
-
   local render_result
   render_result=$(
     # shellcheck disable=SC2034
@@ -282,11 +277,6 @@ function test_render_execution_time() {
 }
 
 function test_not_render_execution_time() {
-  if [[ $_OS == "OSX" ]]; then
-    skip "Skipping in OSX"
-    return
-  fi
-
   local render_result
   render_result=$(
     # shellcheck disable=SC2034