fix tests, fix golint errors, fix go vet errors

Author: Brian Sorahan

buffer_test.go

@@ -1,9 +1,12 @@
 package sc
 
-import "testing"
+import (
+	"testing"
+	"time"
+)
 
 func TestBuffer(t *testing.T) {
-	c, err := NewClient("udp", "127.0.0.1:57112", "127.0.0.1:57120")
+	c, err := NewClient("udp", "127.0.0.1:57112", "127.0.0.1:57120", 5*time.Second)
 	if err != nil {
 		t.Fatal(err)
 	}

client.go

@@ -61,6 +61,7 @@ const (
 	// DefaultScsynthAddr is the remote address for DefaultClient.
 	DefaultScsynthAddr = "0.0.0.0:57120"
 
+	// DefaultConnectTimeout is the default timeout for connecting to scsynth.
 	DefaultConnectTimeout = time.Second
 )
 

client_test.go

@@ -22,7 +22,7 @@ func skipIfNoScsynth(t *testing.T, client *Client) {
 //     scsynth -u 57120
 //
 func TestClient(t *testing.T) {
-	client, err := NewClient("udp", "127.0.0.1:57200", "127.0.0.1:57120")
+	client, err := NewClient("udp", "127.0.0.1:57200", "127.0.0.1:57120", 5*time.Second)
 	if err != nil {
 		t.Fatal(err)
 	}

group_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func TestexpandInputs(t *testing.T) {
+func TestExpandInputs(t *testing.T) {
 	a := []Input{Multi(C(1), C(2), C(3)), Multi(C(4), C(5))}
 	b := expandInputs(a...)
 	// should be [ [1,4], [2,5], [3,4] ]

input_test.go

@@ -1,4 +1,5 @@
 // +build linux
+
 package sc
 
 // ServerPath is the path the scsynth executable on linux systems.

server_linux.go

@@ -71,38 +71,3 @@ func ExampleNewSynthdef() {
 	// Output:
 	// {"name":"SineTone","constants":[440,0],"initialParamValues":[],"paramNames":[],"ugens":[{"name":"SinOsc","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":-1,"outputIndex":0},{"ugenIndex":-1,"outputIndex":1}],"outputs":[2]},{"name":"Out","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":-1,"outputIndex":1},{"ugenIndex":0,"outputIndex":0}],"outputs":[]}],"variants":[]}
 }
-
-func ExampleNewSynthdefSineTone2() {
-	NewSynthdef("SineTone2", func(p Params) Ugen {
-		bus := C(0)
-		freq := C(440)
-		phase := SinOsc{Freq: C(0.1)}.Rate(AR)
-		out := SinOsc{freq, phase}.Rate(AR).Mul(C(0.5))
-		return Out{bus, out}.Rate(AR)
-	}).WriteJSON(os.Stdout)
-	// Output:
-	// {"name":"SineTone2","constants":[0.1,0,440,0.5],"initialParamValues":[],"paramNames":[],"ugens":[{"name":"SinOsc","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":-1,"outputIndex":0},{"ugenIndex":-1,"outputIndex":1}],"outputs":[2]},{"name":"SinOsc","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":-1,"outputIndex":2},{"ugenIndex":0,"outputIndex":0}],"outputs":[2]},{"name":"BinaryOpUGen","rate":2,"specialIndex":2,"inputs":[{"ugenIndex":1,"outputIndex":0},{"ugenIndex":-1,"outputIndex":3}],"outputs":[2]},{"name":"Out","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":-1,"outputIndex":1},{"ugenIndex":2,"outputIndex":0}],"outputs":[]}],"variants":[]}
-}
-
-func ExampleNewSynthdefParams() {
-	NewSynthdef("SineTone4", func(p Params) Ugen {
-		freq := p.Add("freq", 440)
-		bus, sine := C(0), SinOsc{freq, C(0)}.Rate(AR)
-		return Out{bus, sine}.Rate(AR)
-	}).WriteJSON(os.Stdout)
-	// Output:
-	// {"name":"SineTone4","constants":[0],"initialParamValues":[440],"paramNames":[{"name":"freq","index":0}],"ugens":[{"name":"Control","rate":1,"specialIndex":0,"inputs":[],"outputs":[1]},{"name":"SinOsc","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":0,"outputIndex":0},{"ugenIndex":-1,"outputIndex":0}],"outputs":[2]},{"name":"Out","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":-1,"outputIndex":0},{"ugenIndex":1,"outputIndex":0}],"outputs":[]}],"variants":[]}
-}
-
-func ExampleSynthdefParams2() {
-	NewSynthdef("SawTone1", func(p Params) Ugen {
-		freq := p.Add("freq", 440)
-		cutoff, q := p.Add("cutoff", 1200), p.Add("q", 0.5)
-		bus := C(0)
-		saw := Saw{freq}.Rate(AR)
-		out := RLPF{saw, cutoff, q}.Rate(AR)
-		return Out{bus, out}.Rate(AR)
-	}).WriteJSON(os.Stdout)
-	// Output:
-	// {"name":"SawTone1","constants":[0],"initialParamValues":[440,1200,0.5],"paramNames":[{"name":"freq","index":0},{"name":"cutoff","index":1},{"name":"q","index":2}],"ugens":[{"name":"Control","rate":1,"specialIndex":0,"inputs":[],"outputs":[1,1,1]},{"name":"Saw","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":0,"outputIndex":0}],"outputs":[2]},{"name":"RLPF","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":1,"outputIndex":0},{"ugenIndex":0,"outputIndex":1},{"ugenIndex":0,"outputIndex":2}],"outputs":[2]},{"name":"Out","rate":2,"specialIndex":0,"inputs":[{"ugenIndex":-1,"outputIndex":0},{"ugenIndex":2,"outputIndex":0}],"outputs":[]}],"variants":[]}
-}