chore(tests): modify JSON tests to not need all providers listed
This commit is contained in:
Quentin McGaw
@@ -11,8 +11,7 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func populateProviderToVersion(allProviderVersion uint16,
|
||||
providerToVersion map[string]uint16) map[string]uint16 {
|
||||
func populateProviderToVersion(providerToVersion map[string]uint16) map[string]uint16 {
|
||||
allProviders := providers.All()
|
||||
for _, provider := range allProviders {
|
||||
_, has := providerToVersion[provider]
|
||||
@@ -20,29 +19,11 @@ func populateProviderToVersion(allProviderVersion uint16,
|
||||
continue
|
||||
}
|
||||
|
||||
providerToVersion[provider] = allProviderVersion
|
||||
providerToVersion[provider] = 0
|
||||
}
|
||||
return providerToVersion
|
||||
}
|
||||
|
||||
func populateAllServersVersion(allProviderVersion uint16,
|
||||
servers models.AllServers) models.AllServers {
|
||||
allProviders := providers.All()
|
||||
if servers.ProviderToServers == nil {
|
||||
servers.ProviderToServers = make(map[string]models.Servers, len(allProviders)-1)
|
||||
}
|
||||
for _, provider := range allProviders {
|
||||
_, has := servers.ProviderToServers[provider]
|
||||
if has {
|
||||
continue
|
||||
}
|
||||
servers.ProviderToServers[provider] = models.Servers{
|
||||
Version: allProviderVersion,
|
||||
}
|
||||
}
|
||||
return servers
|
||||
}
|
||||
|
||||
func Test_extractServersFromBytes(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
@@ -59,94 +40,49 @@ func Test_extractServersFromBytes(t *testing.T) {
|
||||
},
|
||||
"bad provider JSON": {
|
||||
b: []byte(`{"cyberghost": "garbage"}`),
|
||||
hardcodedVersions: populateProviderToVersion(1, map[string]uint16{}),
|
||||
hardcodedVersions: populateProviderToVersion(map[string]uint16{}),
|
||||
errMessage: "cannot decode servers version for provider Cyberghost: " +
|
||||
"json: cannot unmarshal string into Go value of type struct { Version uint16 \"json:\\\"version\\\"\" }",
|
||||
},
|
||||
"bad servers array JSON": {
|
||||
b: []byte(`{"cyberghost": {"version": 1, "servers": "garbage"}}`),
|
||||
hardcodedVersions: populateProviderToVersion(1, map[string]uint16{}),
|
||||
b: []byte(`{"cyberghost": {"version": 1, "servers": "garbage"}}`),
|
||||
hardcodedVersions: populateProviderToVersion(map[string]uint16{
|
||||
providers.Cyberghost: 1,
|
||||
}),
|
||||
errMessage: "cannot decode servers for provider Cyberghost: " +
|
||||
"json: cannot unmarshal string into Go struct field Servers.servers of type []models.Server",
|
||||
},
|
||||
"absent provider keys": {
|
||||
b: []byte(`{}`),
|
||||
hardcodedVersions: populateProviderToVersion(1, map[string]uint16{}),
|
||||
b: []byte(`{}`),
|
||||
hardcodedVersions: populateProviderToVersion(map[string]uint16{
|
||||
providers.Cyberghost: 1,
|
||||
}),
|
||||
persisted: models.AllServers{
|
||||
ProviderToServers: map[string]models.Servers{},
|
||||
},
|
||||
},
|
||||
"same versions": {
|
||||
b: []byte(`{
|
||||
"cyberghost": {"version": 1, "timestamp": 0},
|
||||
"expressvpn": {"version": 1, "timestamp": 0},
|
||||
"fastestvpn": {"version": 1, "timestamp": 0},
|
||||
"hidemyass": {"version": 1, "timestamp": 0},
|
||||
"ipvanish": {"version": 1, "timestamp": 0},
|
||||
"ivpn": {"version": 1, "timestamp": 0},
|
||||
"mullvad": {"version": 1, "timestamp": 0},
|
||||
"nordvpn": {"version": 1, "timestamp": 0},
|
||||
"perfect privacy": {"version": 1, "timestamp": 0},
|
||||
"privado": {"version": 1, "timestamp": 0},
|
||||
"private internet access": {"version": 1, "timestamp": 0},
|
||||
"privatevpn": {"version": 1, "timestamp": 0},
|
||||
"protonvpn": {"version": 1, "timestamp": 0},
|
||||
"purevpn": {"version": 1, "timestamp": 0},
|
||||
"surfshark": {"version": 1, "timestamp": 0},
|
||||
"torguard": {"version": 1, "timestamp": 0},
|
||||
"vpn unlimited": {"version": 1, "timestamp": 0},
|
||||
"vyprvpn": {"version": 1, "timestamp": 0},
|
||||
"wevpn": {"version": 1, "timestamp": 0},
|
||||
"windscribe": {"version": 1, "timestamp": 0}
|
||||
"cyberghost": {"version": 1, "timestamp": 0}
|
||||
}`),
|
||||
hardcodedVersions: populateProviderToVersion(1, map[string]uint16{}),
|
||||
persisted: populateAllServersVersion(1, models.AllServers{}),
|
||||
hardcodedVersions: populateProviderToVersion(map[string]uint16{
|
||||
providers.Cyberghost: 1,
|
||||
}),
|
||||
persisted: models.AllServers{
|
||||
ProviderToServers: map[string]models.Servers{
|
||||
providers.Cyberghost: {Version: 1},
|
||||
},
|
||||
},
|
||||
},
|
||||
"different versions": {
|
||||
b: []byte(`{
|
||||
"cyberghost": {"version": 1, "timestamp": 1},
|
||||
"expressvpn": {"version": 1, "timestamp": 1},
|
||||
"fastestvpn": {"version": 1, "timestamp": 1},
|
||||
"hidemyass": {"version": 1, "timestamp": 1},
|
||||
"ipvanish": {"version": 1, "timestamp": 1},
|
||||
"ivpn": {"version": 1, "timestamp": 1},
|
||||
"mullvad": {"version": 1, "timestamp": 1},
|
||||
"nordvpn": {"version": 1, "timestamp": 1},
|
||||
"perfect privacy": {"version": 1, "timestamp": 1},
|
||||
"privado": {"version": 1, "timestamp": 1},
|
||||
"private internet access": {"version": 1, "timestamp": 1},
|
||||
"privatevpn": {"version": 1, "timestamp": 1},
|
||||
"protonvpn": {"version": 1, "timestamp": 1},
|
||||
"purevpn": {"version": 1, "timestamp": 1},
|
||||
"surfshark": {"version": 1, "timestamp": 1},
|
||||
"torguard": {"version": 1, "timestamp": 1},
|
||||
"vpn unlimited": {"version": 1, "timestamp": 1},
|
||||
"vyprvpn": {"version": 1, "timestamp": 1},
|
||||
"wevpn": {"version": 1, "timestamp": 1},
|
||||
"windscribe": {"version": 1, "timestamp": 1}
|
||||
"cyberghost": {"version": 1, "timestamp": 1}
|
||||
}`),
|
||||
hardcodedVersions: populateProviderToVersion(2, map[string]uint16{}),
|
||||
hardcodedVersions: populateProviderToVersion(map[string]uint16{
|
||||
providers.Cyberghost: 2,
|
||||
}),
|
||||
logged: []string{
|
||||
"Cyberghost servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Expressvpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Fastestvpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Hidemyass servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Ipvanish servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Ivpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Mullvad servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Nordvpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Perfect Privacy servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Privado servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Private Internet Access servers from file discarded because they have version 1 and hardcoded servers have version 2", //nolint:lll
|
||||
"Privatevpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Protonvpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Purevpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Surfshark servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Torguard servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Vpn Unlimited servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Vyprvpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Wevpn servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
"Windscribe servers from file discarded because they have version 1 and hardcoded servers have version 2",
|
||||
},
|
||||
persisted: models.AllServers{
|
||||
ProviderToServers: map[string]models.Servers{},
|
||||
|
||||
Reference in New Issue
Block a user