Deploy updated bats jq

exercises/concept/assembly-line/bats-jq.bash

@@ -10,7 +10,6 @@
 # - "Printing to the terminal", https://bats-core.readthedocs.io/en/stable/writing-tests.html#printing-to-the-terminal
 # - "File descriptor 3", https://bats-core.readthedocs.io/en/stable/writing-tests.html#file-descriptor-3-read-this-if-bats-hangs
 
-
 jq() {
     local output stderr rc line
     stderr=$(mktemp)
@@ -27,3 +26,64 @@ jq() {
     echo "$output"
     return "$rc"
 }
+
+#############################################################
+# These are extra assert functions for use in tests.
+
+# Assert two JSON objects are equal.
+#   https://jqlang.org/manual/v1.7/#==-!=
+#
+#   assert_objects_equal '{"a": 1, "b": 2}' '{"b":2,"a":1}' 
+#   # => true
+#
+assert_objects_equal() {
+    local result=$(
+        jq -n --argjson actual "$1" \
+              --argjson expected "$2" \
+            '$actual == $expected'
+    )
+    [[ $result == "true" ]]
+}
+
+# Assert 2 floating-point values are "close enough".
+#
+#   # are they the same to 2 decimal places?
+#   assert_float 1.993 1.995        # => true
+#
+#   # are they the same to 3 decimal places?
+#   assert_float -d 3 1.993 1.995   # => false
+#
+assert_float() {
+    local OPTIND OPTARG
+    local decimals=2 actual expected
+    while getopts :d: opt; do
+        case $opt in
+            d) decimals=$OPTARG ;;
+            *) return 2 ;;
+        esac
+    done
+    shift $((OPTIND - 1))
+    # bash can't do floating point: use awk
+    read -r actual expected < <(
+        awk -v d="$decimals" -v a="$1" -v e="$2" '
+            BEGIN {
+                m = 10 ^ d
+                print int(a * m)/m, int(e * m)/m
+            }
+        '
+    )
+    # now call a bats-assert command to get the desired output
+    assert_equal "$actual" "$expected"
+}
+
+# Assert that an object's value of a given key is the expected value.
+# This uses the bats `output` variable.
+#
+#   run jq -f ...
+#   assert_key_value 'the_key' 'the_expected_value'
+#
+assert_key_value() {
+    local key=$1 expected=$2 actual
+    actual=$(jq -rc --arg key "$key" '.[$key]' <<< "$output")
+    assert_equal "$actual" "$expected"
+}

exercises/concept/assembly-line/test-assembly-line.bats

@@ -2,29 +2,6 @@
 load bats-extra
 load bats-jq
 
-assert_float() {
-    local OPTIND OPTARG
-    local decimals=2 actual expected
-    while getopts :d: opt; do
-        case $opt in
-            d) decimals=$OPTARG ;;
-            *) return 2 ;;
-        esac
-    done
-    shift $((OPTIND - 1))
-    # bash can't do floating point: use awk (also uses IEEE754 numbers)
-    read -r actual expected < <(
-        awk -v d="$decimals" -v a="$1" -v e="$2" '
-            BEGIN {
-                m = 10 ^ d
-                print int(a * m)/m, int(e * m)/m
-            }
-        '
-    )
-    # now call a bats-assert command to get the desired output
-    assert_equal "$actual" "$expected"
-}
-
 @test production_rate_per_hour_for_speed_zero {
     ## task 1
     run jq -f assembly-line.jq <<< '{"speed": 0}'

exercises/concept/bird-count/bats-jq.bash

@@ -10,7 +10,6 @@
 # - "Printing to the terminal", https://bats-core.readthedocs.io/en/stable/writing-tests.html#printing-to-the-terminal
 # - "File descriptor 3", https://bats-core.readthedocs.io/en/stable/writing-tests.html#file-descriptor-3-read-this-if-bats-hangs
 
-
 jq() {
     local output stderr rc line
     stderr=$(mktemp)
@@ -27,3 +26,64 @@ jq() {
     echo "$output"
     return "$rc"
 }
+
+#############################################################
+# These are extra assert functions for use in tests.
+
+# Assert two JSON objects are equal.
+#   https://jqlang.org/manual/v1.7/#==-!=
+#
+#   assert_objects_equal '{"a": 1, "b": 2}' '{"b":2,"a":1}' 
+#   # => true
+#
+assert_objects_equal() {
+    local result=$(
+        jq -n --argjson actual "$1" \
+              --argjson expected "$2" \
+            '$actual == $expected'
+    )
+    [[ $result == "true" ]]
+}
+
+# Assert 2 floating-point values are "close enough".
+#
+#   # are they the same to 2 decimal places?
+#   assert_float 1.993 1.995        # => true
+#
+#   # are they the same to 3 decimal places?
+#   assert_float -d 3 1.993 1.995   # => false
+#
+assert_float() {
+    local OPTIND OPTARG
+    local decimals=2 actual expected
+    while getopts :d: opt; do
+        case $opt in
+            d) decimals=$OPTARG ;;
+            *) return 2 ;;
+        esac
+    done
+    shift $((OPTIND - 1))
+    # bash can't do floating point: use awk
+    read -r actual expected < <(
+        awk -v d="$decimals" -v a="$1" -v e="$2" '
+            BEGIN {
+                m = 10 ^ d
+                print int(a * m)/m, int(e * m)/m
+            }
+        '
+    )
+    # now call a bats-assert command to get the desired output
+    assert_equal "$actual" "$expected"
+}
+
+# Assert that an object's value of a given key is the expected value.
+# This uses the bats `output` variable.
+#
+#   run jq -f ...
+#   assert_key_value 'the_key' 'the_expected_value'
+#
+assert_key_value() {
+    local key=$1 expected=$2 actual
+    actual=$(jq -rc --arg key "$key" '.[$key]' <<< "$output")
+    assert_equal "$actual" "$expected"
+}

exercises/concept/bird-count/test-bird-count.bats

@@ -2,12 +2,6 @@
 load bats-extra
 load bats-jq
 
-assert_key_value() {
-    local key=$1 expected=$2 actual
-    actual=$(jq -rc --arg key "$key" '.[$key]' <<< "$output")
-    assert_equal "$actual" "$expected"
-}
-
 @test last_week {
     ## task 1
     run jq -f bird-count.jq bird-counting-data.json

exercises/concept/grade-stats/bats-jq.bash

@@ -10,7 +10,6 @@
 # - "Printing to the terminal", https://bats-core.readthedocs.io/en/stable/writing-tests.html#printing-to-the-terminal
 # - "File descriptor 3", https://bats-core.readthedocs.io/en/stable/writing-tests.html#file-descriptor-3-read-this-if-bats-hangs
 
-
 jq() {
     local output stderr rc line
     stderr=$(mktemp)
@@ -27,3 +26,64 @@ jq() {
     echo "$output"
     return "$rc"
 }
+
+#############################################################
+# These are extra assert functions for use in tests.
+
+# Assert two JSON objects are equal.
+#   https://jqlang.org/manual/v1.7/#==-!=
+#
+#   assert_objects_equal '{"a": 1, "b": 2}' '{"b":2,"a":1}' 
+#   # => true
+#
+assert_objects_equal() {
+    local result=$(
+        jq -n --argjson actual "$1" \
+              --argjson expected "$2" \
+            '$actual == $expected'
+    )
+    [[ $result == "true" ]]
+}
+
+# Assert 2 floating-point values are "close enough".
+#
+#   # are they the same to 2 decimal places?
+#   assert_float 1.993 1.995        # => true
+#
+#   # are they the same to 3 decimal places?
+#   assert_float -d 3 1.993 1.995   # => false
+#
+assert_float() {
+    local OPTIND OPTARG
+    local decimals=2 actual expected
+    while getopts :d: opt; do
+        case $opt in
+            d) decimals=$OPTARG ;;
+            *) return 2 ;;
+        esac
+    done
+    shift $((OPTIND - 1))
+    # bash can't do floating point: use awk
+    read -r actual expected < <(
+        awk -v d="$decimals" -v a="$1" -v e="$2" '
+            BEGIN {
+                m = 10 ^ d
+                print int(a * m)/m, int(e * m)/m
+            }
+        '
+    )
+    # now call a bats-assert command to get the desired output
+    assert_equal "$actual" "$expected"
+}
+
+# Assert that an object's value of a given key is the expected value.
+# This uses the bats `output` variable.
+#
+#   run jq -f ...
+#   assert_key_value 'the_key' 'the_expected_value'
+#
+assert_key_value() {
+    local key=$1 expected=$2 actual
+    actual=$(jq -rc --arg key "$key" '.[$key]' <<< "$output")
+    assert_equal "$actual" "$expected"
+}

exercises/concept/grade-stats/test-grade-stats.bats

@@ -2,12 +2,6 @@
 load bats-extra
 load bats-jq
 
-assert_key_value() {
-    local key=$1 expected=$2 actual
-    actual=$(jq -rc --arg key "$key" '.[$key]' <<< "$output")
-    assert_equal "$actual" "$expected"
-}
-
 @test 'number to letter grade A' {
     ## task 1
     run jq -nc '

exercises/concept/high-score-board/bats-jq.bash

@@ -10,7 +10,6 @@
 # - "Printing to the terminal", https://bats-core.readthedocs.io/en/stable/writing-tests.html#printing-to-the-terminal
 # - "File descriptor 3", https://bats-core.readthedocs.io/en/stable/writing-tests.html#file-descriptor-3-read-this-if-bats-hangs
 
-
 jq() {
     local output stderr rc line
     stderr=$(mktemp)
@@ -27,3 +26,64 @@ jq() {
     echo "$output"
     return "$rc"
 }
+
+#############################################################
+# These are extra assert functions for use in tests.
+
+# Assert two JSON objects are equal.
+#   https://jqlang.org/manual/v1.7/#==-!=
+#
+#   assert_objects_equal '{"a": 1, "b": 2}' '{"b":2,"a":1}' 
+#   # => true
+#
+assert_objects_equal() {
+    local result=$(
+        jq -n --argjson actual "$1" \
+              --argjson expected "$2" \
+            '$actual == $expected'
+    )
+    [[ $result == "true" ]]
+}
+
+# Assert 2 floating-point values are "close enough".
+#
+#   # are they the same to 2 decimal places?
+#   assert_float 1.993 1.995        # => true
+#
+#   # are they the same to 3 decimal places?
+#   assert_float -d 3 1.993 1.995   # => false
+#
+assert_float() {
+    local OPTIND OPTARG
+    local decimals=2 actual expected
+    while getopts :d: opt; do
+        case $opt in
+            d) decimals=$OPTARG ;;
+            *) return 2 ;;
+        esac
+    done
+    shift $((OPTIND - 1))
+    # bash can't do floating point: use awk
+    read -r actual expected < <(
+        awk -v d="$decimals" -v a="$1" -v e="$2" '
+            BEGIN {
+                m = 10 ^ d
+                print int(a * m)/m, int(e * m)/m
+            }
+        '
+    )
+    # now call a bats-assert command to get the desired output
+    assert_equal "$actual" "$expected"
+}
+
+# Assert that an object's value of a given key is the expected value.
+# This uses the bats `output` variable.
+#
+#   run jq -f ...
+#   assert_key_value 'the_key' 'the_expected_value'
+#
+assert_key_value() {
+    local key=$1 expected=$2 actual
+    actual=$(jq -rc --arg key "$key" '.[$key]' <<< "$output")
+    assert_equal "$actual" "$expected"
+}

exercises/concept/high-score-board/test-high-score-board.bats

@@ -2,12 +2,6 @@
 load bats-extra
 load bats-jq
 
-assert_key_value() {
-    local key=$1 expected=$2 actual
-    actual=$(jq -rc --arg key "$key" '.[$key]' <<< "$output")
-    assert_equal "$actual" "$expected"
-}
-
 @test creates_a_new_board_with_a_test_entry {
     ## task 1
     run jq -n -c '