1 files changed, 22 insertions, 24 deletions
diff --git a/pkg/test/hook_test.go b/pkg/test/hook_test.go
index 31e74f7..7808883 100644
--- a/pkg/test/hook_test.go
+++ b/pkg/test/hook_test.go
@@ -8,47 +8,45 @@ import (
 )
 
 func TestUpperHook(t *testing.T) {
-	c, s := newClientServer(t)
-	defer closeClientServer(c, s)
+	e := newEnv(t)
+	defer e.Free()
+
+	c := e.newInstance()
 
 	c.Exec("add name T listen,addr=-:0 upper loop")
 
-	conn := xDial(t, "tcp", c.Get("tunnel.T.listen"))
-	defer conn.Close()
+	conn := e.Dial("tcp", c.Get("tunnel.T.listen"))
 
-	xWrite(t, conn, xData)
+	e.Write(conn, dummy)
 
-	buf := make([]byte, len(xData))
-	xReadFull(t, conn, buf)
+	buf := make([]byte, len(dummy))
+	e.ReadFull(conn, buf)
 
-	if r := string(buf); r != strings.ToUpper(xData) {
-		t.Fatalf("wrong reply: send '%s', recv '%s'", xData, r)
+	if r := string(buf); r != strings.ToUpper(dummy) {
+		t.Fatalf("wrong reply: send '%s', recv '%s'", dummy, r)
 	}
 }
 
 func TestHexHook(t *testing.T) {
-	c, s := newClientServer(t)
-	defer closeClientServer(c, s)
+	e := newEnv(t)
+	defer e.Free()
 
-	c.Exec("add name T listen,addr=-:0 hex dial,addr=@[addr]")
+	c := e.newInstance()
 
-	listen := xListen(t, "tcp", "127.0.0.1:0")
-	defer listen.Close()
+	c.Exec("add name T listen,addr=-:0 hex dial,addr=@[addr]")
 
+	listen := e.Listen("tcp", "127.0.0.1:0")
 	c.Set("addr", listen.Addr())
 
-	out := xDial(t, "tcp", c.Get("tunnel.T.listen"))
-	defer out.Close()
-
-	in := xAccept(t, listen)
-	defer in.Close()
+	out := e.Dial("tcp", c.Get("tunnel.T.listen"))
+	in := e.Accept(listen)
 
-	xWrite(t, out, xData)
+	e.Write(out, dummy)
 
-	buf := make([]byte, 2*len(xData))
-	xReadFull(t, in, buf)
+	buf := make([]byte, 2*len(dummy))
+	e.ReadFull(in, buf)
 
-	if r := string(buf); r != hex.EncodeToString([]byte(xData)) {
-		t.Fatalf("wrong reply: send '%s', recv '%s'", xData, r)
+	if r := string(buf); r != hex.EncodeToString([]byte(dummy)) {
+		t.Fatalf("wrong reply: send '%s', recv '%s'", dummy, r)
 	}
 }