From ede482d8f3398262adcfb23095b6caad5872d8ba Mon Sep 17 00:00:00 2001
From: Joshua MacDonald <josh.macdonald@gmail.com>
Date: Sat, 21 Nov 2015 23:36:51 -0800
Subject: New TestGroup.Go method, improved error handling

---
 xdelta3/go/src/regtest.go | 66 ++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

(limited to 'xdelta3/go/src/regtest.go')

diff --git a/xdelta3/go/src/regtest.go b/xdelta3/go/src/regtest.go
index b028ed5..793c9fc 100644
--- a/xdelta3/go/src/regtest.go
+++ b/xdelta3/go/src/regtest.go
@@ -11,61 +11,63 @@ import (
 const (
 	blocksize = 1<<16
 	winsize = 1<<22
-	xdelta3 = "/volume/home/jmacd/src/xdelta-devel/xdelta3/xdelta3"
+	xdelta3 = "/Users/jmacd/src/xdelta-devel/xdelta3/xdelta3"
 	seed = 1422253499919909358
 )
 
-func smokeTest(r *xdelta.Runner, t *xdelta.TestGroup, p *xdelta.Program) {
-	t.Add(1)
+func smokeTest(r *xdelta.Runner, p *xdelta.Program) {
+	t, g := xdelta.NewTestGroup(r)
 	target := "Hello world!"
 	source := "Hello world, nice to meet you!"
-	
-	enc, err := r.Exec(p, true, []string{"-evv"})
+
+	enc, err := t.Exec(p, true, []string{"-evv"})
 	if err != nil {
-		t.Panic(err)
+		g.Panic(err)
 	}
 	encodeout := t.Drain(enc.Stdout, "encode.stdout")
 	t.Empty(enc.Stderr, "encode")
 
-	t.Write("encode.stdin", enc.Stdin, []byte(target))
-	t.Write("encode.srcin", enc.Srcin, []byte(source))
-
-	if err := enc.Cmd.Wait(); err != nil {
-		t.Panic(err)
+	if err := xdelta.TestWrite("encode.stdin", enc.Stdin, []byte(target)); err != nil {
+		g.Panic(err)
+	}
+	if err := xdelta.TestWrite("encode.srcin", enc.Srcin, []byte(source)); err != nil {
+		g.Panic(err)
 	}
 
-	dec, err := r.Exec(p, true, []string{"-dvv"})
+	dec, err := t.Exec(p, true, []string{"-dvv"})
 	if err != nil {
-		t.Panic(err)
+		g.Panic(err)
 	}
 
 	decodeout := t.Drain(dec.Stdout, "decode.stdout")
 	t.Empty(dec.Stderr, "decode")
 
-	t.Write("decode.stdin", dec.Stdin, <-encodeout)
-	t.Write("decode.srcin", dec.Srcin, []byte(source))
-	decoded := string(<-decodeout)
-	if err := dec.Cmd.Wait(); err != nil {
-		t.Panic(err)
+	if err := xdelta.TestWrite("decode.stdin", dec.Stdin, <-encodeout); err != nil {
+		g.Panic(err)
 	}
+	if err := xdelta.TestWrite("decode.srcin", dec.Srcin, []byte(source)); err != nil {
+		g.Panic(err)
+	}
+	decoded := string(<-decodeout)
 	if decoded != target {
-		t.Panic(errors.New("It's not working!!!"))
+		g.Panic(errors.New("It's not working!!!"))
 	}
-	t.Done()
+	t.Wait(g)
 	fmt.Println("Smoketest pass")
 }
 
-func offsetTest(r *xdelta.Runner, t *xdelta.TestGroup, p *xdelta.Program, bufsize, offset, length int64) {
-	t.Add(1)
+func offsetTest(r *xdelta.Runner, p *xdelta.Program, bufsize, offset, length int64) {
+	t, g := xdelta.NewTestGroup(r)
 	eargs := []string{"-e", "-0", fmt.Sprint("-B", bufsize), "-vv", fmt.Sprint("-W", winsize)}
-	enc, err := r.Exec(p, true, eargs)
+	enc, err := t.Exec(p, true, eargs)
 	if err != nil {
-		t.Panic(err)
+		g.Panic(err)
 	}
+	
 	dargs := []string{"-d", fmt.Sprint("-B", bufsize), "-vv", fmt.Sprint("-W", winsize)}
-	dec, err := r.Exec(p, true, dargs)
+	dec, err := t.Exec(p, true, dargs)
 	if err != nil {
-		t.Panic(err)
+		g.Panic(err)
 	}
 
 	read, write := io.Pipe()
@@ -81,13 +83,7 @@ func offsetTest(r *xdelta.Runner, t *xdelta.TestGroup, p *xdelta.Program, bufsiz
 	xdelta.WriteRstreams(t, seed, offset, length, enc.Srcin, enc.Stdin)
 	xdelta.WriteRstreams(t, seed, offset, length, dec.Srcin, write)
 
-	if err := enc.Cmd.Wait(); err != nil {
-		t.Panic(err)
-	}
-	if err := dec.Cmd.Wait(); err != nil {
-		t.Panic(err)
-	}
-	t.Done()
+	t.Wait(g)
 }
 
 func main() {
@@ -99,8 +95,8 @@ func main() {
 
 	prog := &xdelta.Program{xdelta3}
 
-	smokeTest(r, xdelta.NewTestGroup(), prog)
-	offsetTest(r, xdelta.NewTestGroup(), prog, 4 << 20, 3 << 20, 5 << 20)
+	smokeTest(r, prog)
+	offsetTest(r, prog, 4 << 20, 3 << 20, 5 << 20)
 
 	//offsetTest(r, xdelta.NewTestGroup(), prog, 1 << 31, 1 << 32, 1 << 33)
 }
-- 
cgit v1.2.3