sharness: have 'object put/get' data in seperate files

cryptix · cryptix · commit f675f3c1dae4 · 2015-03-07T16:27:31.000+01:00
diff --git a/test/sharness/t0051-object-data/expected_getOut b/test/sharness/t0051-object-data/expected_getOut
@@ -0,0 +1,4 @@
+{
+  "Links": [],
+  "Data": "\u0008\u0002\u0012\nHello Mars\u0018\n"
+}
diff --git a/test/sharness/t0051-object-data/testPut.json b/test/sharness/t0051-object-data/testPut.json
@@ -0,0 +1,3 @@
+{
+	"Data": "test json for sharness test"
+}
diff --git a/test/sharness/t0051-object.sh b/test/sharness/t0051-object.sh
@@ -26,11 +26,7 @@ test_expect_success "'ipfs object get' succeeds" '
 '
 
 test_expect_success "'ipfs object get' output looks good" '
-	echo "{" > expected_getOut &&
-	echo "  \"Links\": []," >> expected_getOut &&
-	echo "  \"Data\": \"\u0008\u0002\u0012\nHello Mars\u0018\n\"" >> expected_getOut &&
-	echo -n "}" >> expected_getOut &&
-	test_cmp expected_getOut actual_getOut
+	test_cmp ../t0051-object-data/expected_getOut actual_getOut
 '
 
 test_expect_success "'ipfs object stat' succeeds" '
@@ -46,17 +42,8 @@ echo "CumulativeSize: 18" >> expected_stat &&
   test_cmp expected_stat actual_stat
 '
 
-# semicool way to get json inline without much escaping
-objectPutJson=$(cat << EOF
-{
-	"Data": "test json for sharness test"
-}
-EOF
-)
-
 test_expect_success "'ipfs object put file.json' succeeds" '
-	echo $objectPutJson > file.json &&
-	ipfs object put file.json > actual_putOut
+	ipfs object put  ../t0051-object-data/testPut.json > actual_putOut
 '
 
 test_expect_success "'ipfs object put file.json' output looks good" '
@@ -66,7 +53,7 @@ test_expect_success "'ipfs object put file.json' output looks good" '
 '
 
 test_expect_success "'ipfs object put' from stdin succeeds" '
-	echo $objectPutJson | ipfs object put > actual_putStdinOut
+	cat ../t0051-object-data/testPut.json | ipfs object put > actual_putStdinOut
 '
 
 test_expect_success "'ipfs object put' from stdin output looks good" '

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "Links": [],
 +  "Data": "\u0008\u0002\u0012\nHello Mars\u0018\n"
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "Data": "test json for sharness test"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,7 @@ test_expect_success "'ipfs object get' succeeds" '`
`26`	`26`	`'`
`27`	`27`
`28`	`28`	`test_expect_success "'ipfs object get' output looks good" '`
`29`		`- echo "{" > expected_getOut &&`
`30`		`- echo " \"Links\": []," >> expected_getOut &&`
`31`		`- echo " \"Data\": \"\u0008\u0002\u0012\nHello Mars\u0018\n\"" >> expected_getOut &&`
`32`		`- echo -n "}" >> expected_getOut &&`
`33`		`- test_cmp expected_getOut actual_getOut`
	`29`	`+ test_cmp ../t0051-object-data/expected_getOut actual_getOut`
`34`	`30`	`'`
`35`	`31`
`36`	`32`	`test_expect_success "'ipfs object stat' succeeds" '`
`@@ -46,17 +42,8 @@ echo "CumulativeSize: 18" >> expected_stat &&`
`46`	`42`	`test_cmp expected_stat actual_stat`
`47`	`43`	`'`
`48`	`44`
`49`		`-# semicool way to get json inline without much escaping`
`50`		`-objectPutJson=$(cat << EOF`
`51`		`-{`
`52`		`- "Data": "test json for sharness test"`
`53`		`-}`
`54`		`-EOF`
`55`		`-)`
`56`		`-`
`57`	`45`	`test_expect_success "'ipfs object put file.json' succeeds" '`
`58`		`- echo $objectPutJson > file.json &&`
`59`		`- ipfs object put file.json > actual_putOut`
	`46`	`+ ipfs object put ../t0051-object-data/testPut.json > actual_putOut`
`60`	`47`	`'`
`61`	`48`
`62`	`49`	`test_expect_success "'ipfs object put file.json' output looks good" '`
`@@ -66,7 +53,7 @@ test_expect_success "'ipfs object put file.json' output looks good" '`
`66`	`53`	`'`
`67`	`54`
`68`	`55`	`test_expect_success "'ipfs object put' from stdin succeeds" '`
`69`		`- echo $objectPutJson \| ipfs object put > actual_putStdinOut`
	`56`	`+ cat ../t0051-object-data/testPut.json \| ipfs object put > actual_putStdinOut`
`70`	`57`	`'`
`71`	`58`
`72`	`59`	`test_expect_success "'ipfs object put' from stdin output looks good" '`