test cases for json config

This commit is contained in:
V2Ray committed 2015-09-20 11:45:40 +02:00
1 parent a887fd01b8
commit 07d4495b27
6 files changed
+110 -4

No files matched your search

+5 -3
View File
@@ -3,6 +3,7 @@ package json
import (
"encoding/json"
"io/ioutil"
"os"
"path/filepath"
"github.com/v2ray/v2ray-core"
@@ -49,7 +50,8 @@ func (config *Config) OutboundConfig() core.ConnectionConfig {
}
func LoadConfig(file string) (*Config, error) {
rawConfig, err := ioutil.ReadFile(file)
fixedFile := os.ExpandEnv(file)
rawConfig, err := ioutil.ReadFile(fixedFile)
if err != nil {
log.Error("Failed to read point config file (%s): %v", file, err)
return nil, err
@@ -59,11 +61,11 @@ func LoadConfig(file string) (*Config, error) {
err = json.Unmarshal(rawConfig, config)
if !filepath.IsAbs(config.InboundConfigValue.File) && len(config.InboundConfigValue.File) > 0 {
config.InboundConfigValue.File = filepath.Join(filepath.Dir(file), config.InboundConfigValue.File)
config.InboundConfigValue.File = filepath.Join(filepath.Dir(fixedFile), config.InboundConfigValue.File)
}
if !filepath.IsAbs(config.OutboundConfigValue.File) && len(config.OutboundConfigValue.File) > 0 {
config.OutboundConfigValue.File = filepath.Join(filepath.Dir(file), config.OutboundConfigValue.File)
config.OutboundConfigValue.File = filepath.Join(filepath.Dir(fixedFile), config.OutboundConfigValue.File)
}
return config, err
+47
View File
@@ -0,0 +1,47 @@
package json
import (
"path/filepath"
"testing"
"github.com/v2ray/v2ray-core/testing/unit"
)
func TestClientSampleConfig(t *testing.T) {
assert := unit.Assert(t)
// TODO: fix for Windows
baseDir := "$GOPATH/src/github.com/v2ray/v2ray-core/release/config"
config, err := LoadConfig(filepath.Join(baseDir, "vpoint_socks_vmess.json"))
assert.Error(err).IsNil()
assert.Uint16(config.PortValue).Positive()
assert.Pointer(config.InboundConfigValue).IsNotNil()
assert.Pointer(config.OutboundConfigValue).IsNotNil()
assert.String(config.InboundConfigValue.ProtocolString).Equals("socks")
assert.Int(len(config.InboundConfigValue.Content())).GreaterThan(0)
assert.String(config.OutboundConfigValue.ProtocolString).Equals("vmess")
assert.Int(len(config.OutboundConfigValue.Content())).GreaterThan(0)
}
func TestServerSampleConfig(t *testing.T) {
assert := unit.Assert(t)
// TODO: fix for Windows
baseDir := "$GOPATH/src/github.com/v2ray/v2ray-core/release/config"
config, err := LoadConfig(filepath.Join(baseDir, "vpoint_vmess_freedom.json"))
assert.Error(err).IsNil()
assert.Uint16(config.PortValue).Positive()
assert.Pointer(config.InboundConfigValue).IsNotNil()
assert.Pointer(config.OutboundConfigValue).IsNotNil()
assert.String(config.InboundConfigValue.ProtocolString).Equals("vmess")
assert.Int(len(config.InboundConfigValue.Content())).GreaterThan(0)
assert.String(config.OutboundConfigValue.ProtocolString).Equals("freedom")
}