trim

ericminio · Apr 26, 2024 · 519c9e7 · 519c9e7
1 parent 0815cae
commit 519c9e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/stub-json/about/tests.sh b/stub-json/about/tests.sh
@@ -5,7 +5,7 @@ source ../support/utils.sh
 
 function test_json_header {
     nginx_reload_configuration
-    type=$(curl --head http://localhost:8080/ping | grep "Content-Type:" | oneliner)
+    type=$(curl --head http://localhost:8080/ping | grep "Content-Type:" | trim)
 
     assertequals "$type" "Content-Type: application/json"
 }
@@ -17,3 +17,4 @@ function test_json_content {
 
     assertequals "$body" '{ "alive":true, "value":42 }'
 }
+
diff --git a/support/utils.sh b/support/utils.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+function trim {
+    sed "s/^[ $(printf '\n')$(printf '\r')]*//g" | sed "s/[ $(printf '\n')$(printf '\r')]*$//g"
+}
+
 function oneliner {
     tr -d '\n' | tr -d '\r'
 }
@@ -12,3 +16,10 @@ function json {
     compact | sed 's/{/{ /g' | sed 's/}/ }/g' | sed 's/,/, /g'
 }
 
+
+function test_only_trim {
+    a=" $(printf '\r\n')  123  $(printf '\r\n')  "
+    b=$(printf "%s" "$a" | trim)
+
+    assertequals "$b" "123"
+}