From c4e9bd8e018bcb459fa0e1f49519aa4dad2d2ead Mon Sep 17 00:00:00 2001
From: Jaromil <jaromil@dyne.org>
Date: Fri, 24 Apr 2020 09:57:06 +0200
Subject: [PATCH] alignment of tests and new zencode

---
 test/utils.sh           | 4 +++-
 test/zencode_enchash.sh | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/utils.sh b/test/utils.sh
index 03c4929..de9ef80 100644
--- a/test/utils.sh
+++ b/test/utils.sh
@@ -2,7 +2,7 @@ set -e
 set -o pipefail
 
 detect_zenroom_path() {
-	zenroom_paths=( "$PWD" "$PWD/../../src" "$PWD/src" "/usr/local/bin" "$PWD/../.." )
+	zenroom_paths=( "$PWD" "$PWD/../../src" "$PWD/../src" "$PWD/src" "/usr/local/bin" "$PWD/../.." "$PWD/.." )
 	zenroom_path="/usr/local/bin/zenroom"
 	case $OSTYPE in
 		linux*)
@@ -44,7 +44,9 @@ detect_zenroom_path() {
 		exit 1
 	fi
 	chmod +x $zenroom_path
+	>&2 echo
 	>&2 echo "Zenroom exec: $zenroom_path"
+	>&2 echo
 	echo "$zenroom_path"
 	unset zenroom_paths zenroom_path
 }
diff --git a/test/zencode_enchash.sh b/test/zencode_enchash.sh
index 4075e05..dff53d9 100755
--- a/test/zencode_enchash.sh
+++ b/test/zencode_enchash.sh
@@ -8,7 +8,7 @@ t=`mktemp -d`
 cat <<EOF | zenroom -z | tee $t/hex.json
 rule output encoding hex
 Given nothing
-When I write 'a string to be hashed' in 'source'
+When I write string 'a string to be hashed' in 'source'
 and I create the hash of 'source'
 Then print the 'hash'
 EOF
@@ -27,7 +27,7 @@ EOF
 cat <<EOF | zenroom -z | tee $t/base64.json
 rule output encoding base64
 Given nothing
-When I write 'a string to be hashed' in 'source'
+When I write string 'a string to be hashed' in 'source'
 and I create the hash of 'source' using 'sha512'
 Then print the 'hash'
 EOF
@@ -36,7 +36,7 @@ EOF
 cat <<EOF | zenroom -z | tee $t/url64.json
 rule output encoding url64
 Given nothing
-When I write 'a string to be hashed' in 'source'
+When I write string 'a string to be hashed' in 'source'
 and I create the hash of 'source' using 'sha256'
 Then print the 'hash'
 EOF