From b22f306a3da12df0ac1ff5512830a35f6787f6d2 Mon Sep 17 00:00:00 2001 From: V2Ray Date: Sun, 20 Sep 2015 11:51:24 +0200 Subject: [PATCH] update test code --- config/json/json_test.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/config/json/json_test.go b/config/json/json_test.go index 52b10af0..abafaa6e 100644 --- a/config/json/json_test.go +++ b/config/json/json_test.go @@ -16,15 +16,15 @@ func TestClientSampleConfig(t *testing.T) { 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.Uint16(config.Port()).Positive() + assert.Pointer(config.InboundConfig()).IsNotNil() + assert.Pointer(config.OutboundConfig()).IsNotNil() - assert.String(config.InboundConfigValue.ProtocolString).Equals("socks") - assert.Int(len(config.InboundConfigValue.Content())).GreaterThan(0) + assert.String(config.InboundConfig().Protocol()).Equals("socks") + assert.Int(len(config.InboundConfig().Content())).GreaterThan(0) - assert.String(config.OutboundConfigValue.ProtocolString).Equals("vmess") - assert.Int(len(config.OutboundConfigValue.Content())).GreaterThan(0) + assert.String(config.OutboundConfig().Protocol()).Equals("vmess") + assert.Int(len(config.OutboundConfig().Content())).GreaterThan(0) } func TestServerSampleConfig(t *testing.T) { @@ -36,12 +36,13 @@ func TestServerSampleConfig(t *testing.T) { 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.Uint16(config.Port()).Positive() + assert.Pointer(config.InboundConfig()).IsNotNil() + assert.Pointer(config.OutboundConfig()).IsNotNil() - assert.String(config.InboundConfigValue.ProtocolString).Equals("vmess") - assert.Int(len(config.InboundConfigValue.Content())).GreaterThan(0) + assert.String(config.InboundConfig().Protocol()).Equals("vmess") + assert.Int(len(config.InboundConfig().Content())).GreaterThan(0) - assert.String(config.OutboundConfigValue.ProtocolString).Equals("freedom") + assert.String(config.OutboundConfig().Protocol()).Equals("freedom") + assert.Int(len(config.OutboundConfig().Content())).Equals(0) }