From 53e4e5be5faa2ff63c10416a63c5d5538f17b366 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrew@servalproject.org>
Date: Mon, 13 Apr 2015 14:43:52 +0930
Subject: [PATCH] Improve 'rhizomerestful' journal append test case

Add asserts for the returned status codes
---
 tests/rhizomerestful | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/rhizomerestful b/tests/rhizomerestful
index 48ceab1f..7928d989 100755
--- a/tests/rhizomerestful
+++ b/tests/rhizomerestful
@@ -1162,7 +1162,7 @@ test_RhizomeInsertIncorrectFilehash() {
    assert_rhizome_list
 }
 
-doc_RhizomeJournalAppend="HTTP RESTful journal create and append"
+doc_RhizomeJournalAppend="HTTP RESTful Rhizome journal create and append"
 setup_RhizomeJournalAppend() {
    setup
    echo 'File one' >file1
@@ -1187,6 +1187,10 @@ test_RhizomeJournalAppend() {
          "http://$addr_localhost:$PORTA/restful/rhizome/append"
    tfw_cat http.header file1.manifest
    assertExitStatus == 0
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Bundle-Status-Code: 0$CR\$"
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Bundle-Status-Message: .*bundle new to store.*$CR\$"
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Payload-Status-Code: 1$CR\$"
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Payload-Status-Message: .*payload new to store.*$CR\$"
    assertStdoutIs 201
    extract_http_header H_BID http.header Serval-Rhizome-Bundle-Id "$rexp_manifestid"
    extract_http_header H_VERSION http.header Serval-Rhizome-Bundle-Version "$rexp_version"
@@ -1231,7 +1235,7 @@ test_RhizomeJournalAppend() {
    execute curl \
          --silent --show-error --write-out '%{http_code}' \
          --output file2.manifest \
-         --dump-header http.header \
+         --dump-header http.headers \
          --basic --user harry:potter \
          --form "bundle-id=$BID" \
          --form "bundle-author=$SIDA" \
@@ -1241,6 +1245,11 @@ test_RhizomeJournalAppend() {
    tfw_cat http.header file2.manifest
    assertExitStatus == 0
    assertStdoutIs 201
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Bundle-Status-Code: 0$CR\$"
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Bundle-Status-Message: .*bundle new to store.*$CR\$"
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Payload-Status-Code: 1$CR\$"
+   assertGrep --matches=1 --ignore-case http.header "^Serval-Rhizome-Result-Payload-Status-Message: .*payload new to store.*$CR\$"
+}
 }
 
 runTests "$@"