Reorganize config test.

shadowsocks/config_test.go

@@ -4,49 +4,64 @@ import (
 	"testing"
 )
 
-func TestParseConfig1Password(t *testing.T) {
-	config, err := ParseConfig("testdata/config-one-passwd.json")
+func TestConfigJson(t *testing.T) {
+	config, err := ParseConfig("testdata/config.json")
 	if err != nil {
-		t.Error("error parsing single password config:", err)
+		t.Error("error parsing config.json:", err)
 	}
 
 	if config.Password != "barfoo!" {
 		t.Error("wrong password from config")
 	}
-	if config.Timeout != 60 {
-		t.Error("tiemout wrong")
-	}
-	if !config.CacheEncTable {
-		t.Error("cache_enctable should be true")
+	if config.Timeout != 0 {
+		t.Error("tiemout should default to 0")
 	}
 	srvArr := config.GetServerArray()
 	if len(srvArr) != 1 || srvArr[0] != "127.0.0.1" {
 		t.Error("server option is not set correctly")
 	}
+	if config.CacheEncTable {
+		t.Error("cache_enctable should be false by default")
+	}
 }
 
-func TestParseConfigMultiPassword(t *testing.T) {
-	config, err := ParseConfig("testdata/config-multi-passwd.json")
+func TestServerMultiPort(t *testing.T) {
+	config, err := ParseConfig("testdata/server-multi-port.json")
 	if err != nil {
-		t.Error("error parsing multi password config:", err)
+		t.Error("error parsing multi server-multi-port.json:", err)
 	}
 
-	if config.Password != "barfoo!" {
-		t.Error("wrong password from config")
-	}
 	if config.PortPassword["8387"] != "foobar" {
 		t.Error("wrong multiple password for port 8387")
 	}
+	if config.PortPassword["8388"] != "barfoo" {
+		t.Error("wrong multiple password for port 8388")
+	}
+	if config.PortPassword["8389"] != "" {
+		t.Error("should have no password for port 8389")
+	}
+
+	if !config.CacheEncTable {
+		t.Error("cache_enctable should be true")
+	}
+}
+
+func TestDeprecatedClientMultiServerArray(t *testing.T) {
+	// This form of config is deprecated. Provided only for backward compatibility.
+	config, err := ParseConfig("testdata/deprecated-client-multi-server.json")
+	if err != nil {
+		t.Error("error parsing deprecated-client-multi-server.json:", err)
+	}
 
 	srvArr := config.GetServerArray()
 	if len(srvArr) != 2 {
 		t.Error("server option is not set correctly")
 	}
 	if srvArr[0] != "127.0.0.1" {
-		t.Error("1st server wrong")
+		t.Error("1st server wrong, got %v", srvArr[0])
 	}
 	if srvArr[1] != "127.0.1.1" {
-		t.Error("2nd server wrong")
+		t.Error("2nd server wrong, got %v", srvArr[0])
 	}
 }
 

shadowsocks/testdata/config.json

@@ -0,0 +1,6 @@
+{
+	"server":"127.0.0.1",
+	"server_port":8388,
+	"local_port":1081,
+	"password":"barfoo!"
+}

shadowsocks/testdata/deprecated-client-multi-server.json

@@ -0,0 +1,7 @@
+{
+	"server":["127.0.0.1", "127.0.1.1"],
+	"server_port":8388,
+	"local_port":1081,
+	"password":"barfoo!",
+	"timeout":60
+}

shadowsocks/testdata/server-multi-port.json

@@ -0,0 +1,8 @@
+{
+	"port_password": {
+		"8387": "foobar",
+		"8388": "barfoo"
+	},
+	"timeout": 60,
+	"cache_enctable": true
+}