update: added local vars file for tests

This commit is contained in:
MrMirDan
2026-04-29 17:16:32 +03:00
parent 1238920b60
commit 132c836777
16 changed files with 132 additions and 95 deletions

View File

@@ -743,16 +743,6 @@ jobs:
env:
QT_VERSION: 6.10.1
TEST_SELF_HOSTED_CONFIG: ${{ secrets.TEST_SELF_HOSTED_CONFIG }}
TEST_APP_PATH: ${{ secrets.TEST_APP_PATH }}
TEST_SITES_LIST_PATH: ${{ secrets.TEST_SITES_LIST_PATH }}
TEST_DNS_LIST_PATH: ${{ secrets.TEST_DNS_LIST_PATH }}
TEST_EXPORT_PATH: ${{ secrets.TEST_EXPORT_PATH }}
TEST_KEY_VMESS_NEW: ${{ secrets.TEST_KEY_VMESS_NEW }}
TEST_KEY_VMESS: ${{ secrets.TEST_KEY_VMESS }}
TEST_KEY_TROJAN: ${{ secrets.TEST_KEY_TROJAN }}
TEST_KEY_SS: ${{ secrets.TEST_KEY_SS }}
TEST_KEY_SSD: ${{ secrets.TEST_KEY_SSD }}
steps:
- name: 'Get sources'
@@ -822,16 +812,6 @@ jobs:
env:
QT_VERSION: 6.10.1
TEST_SELF_HOSTED_CONFIG: ${{ secrets.TEST_SELF_HOSTED_CONFIG }}
TEST_APP_PATH: ${{ secrets.TEST_APP_PATH }}
TEST_SITES_LIST_PATH: ${{ secrets.TEST_SITES_LIST_PATH }}
TEST_DNS_LIST_PATH: ${{ secrets.TEST_DNS_LIST_PATH }}
TEST_EXPORT_PATH: ${{ secrets.TEST_EXPORT_PATH }}
TEST_KEY_VMESS_NEW: ${{ secrets.TEST_KEY_VMESS_NEW }}
TEST_KEY_VMESS: ${{ secrets.TEST_KEY_VMESS }}
TEST_KEY_TROJAN: ${{ secrets.TEST_KEY_TROJAN }}
TEST_KEY_SS: ${{ secrets.TEST_KEY_SS }}
TEST_KEY_SSD: ${{ secrets.TEST_KEY_SSD }}
steps:
- name: 'Get sources'
@@ -891,16 +871,6 @@ jobs:
env:
QT_VERSION: 6.10.1
TEST_SELF_HOSTED_CONFIG: ${{ secrets.TEST_SELF_HOSTED_CONFIG }}
TEST_APP_PATH: ${{ secrets.TEST_APP_PATH }}
TEST_SITES_LIST_PATH: ${{ secrets.TEST_SITES_LIST_PATH }}
TEST_DNS_LIST_PATH: ${{ secrets.TEST_DNS_LIST_PATH }}
TEST_EXPORT_PATH: ${{ secrets.TEST_EXPORT_PATH }}
TEST_KEY_VMESS_NEW: ${{ secrets.TEST_KEY_VMESS_NEW }}
TEST_KEY_VMESS: ${{ secrets.TEST_KEY_VMESS }}
TEST_KEY_TROJAN: ${{ secrets.TEST_KEY_TROJAN }}
TEST_KEY_SS: ${{ secrets.TEST_KEY_SS }}
TEST_KEY_SSD: ${{ secrets.TEST_KEY_SSD }}
steps:
- name: 'Setup xcode'

View File

@@ -20,6 +20,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
QJsonObject decodeVpnKey(const QString &vpnKey) {
QString key = vpnKey;
key.replace("vpn://", "");
@@ -97,7 +103,7 @@ private slots:
}
void testAdminSelfHostedExport() {
QString vpnKey = "vpn://AAABTXjarZIxT8MwEIX_Cro5jbDjQunKUhhYyoZQZZKjRGpsy3baQtT_zp2bJh3oACLLPfvz3bOe00FpTdS1QR9g_tKB3q1h3sFCwBzEdf9N5ElBBgtJqBiQOkcFoemAbs6RInQ7oNkZemAvrrKvRV9VX6fH-lhSVSwavU9GSdcmXZX0UqSbseJRMqlioDxuSsJZH1mKWTrhvI22tJvVljKoLU-TtB3aN4NxpavKYwhpSD7LRc4t0WsTeMwqNRNsKweHbAyTtnRj8KvWE0pUEut-hNah2TpDM0-Kwu8vKMSd-ttFLrntao_rVvuKWkc9OnIk4n8t915_Ulcqo5FSxa9tYsk2rxlU-K7bTby_lDWfCKWvXTy-5jOGeLVET-9L7MOG-KQbJEBx57jXjdtgXtqG_wUdws5yJhCpa1iefhopM2gD-n4An-ElHL4BvzD6nw";
QString vpnKey = getValueFromIni("configs/TEST_CONFIG_ANY");
QSignalSpy importFinishedSpy(m_coreController->m_importCoreController, &ImportController::importFinished);
QSignalSpy defaultServerChangedSpy(m_coreController->m_serversRepository, &SecureServersRepository::defaultServerChanged);

View File

@@ -19,6 +19,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
void initTestCase() {
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
@@ -42,9 +48,9 @@ private slots:
}
void testComplexOperationSequence() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString xrayKey = "vpn://AAAAtXjadY7NCsJADIRfRXKui1YP0qt3L14EkRK7EQt2d0lS_0rf3awonjyFmW-YyQBNDIptIBao9sNPQgXYBXq2OL0zPqCA96kGSJHV6HK5MFP6YyCt0XsmsQqYz9zKzd3MmDIGyek6cdRoUJsE43gowNMJ-4uu_695kobbpG0MBndmTrbEV4sWcI6iG-zIQE47umOXLuSa2BlNKHKL7PMeiX5lmdH79bIsoBfiT0UOZQnjCw_AXRQ";
QString wgKey = "vpn://AAAAwXjahY89a8NADIb_StDsHLFDIHjt0C1LhgwlBNWnpgfx3SHp6hDj_15dacnYTS_Po68ZhhQVQyQW6N_mZ4QecIz0CLieAtO1IHto4Fn3M-TEat6u3XetMSnvkfSC3jOJjYN24_audRtjyhil-pfMSZPB4jMsy7kBTx9Ybvryz2ZPMnDIGlI042TktZLVkfjLmhr4TKIHHMnodHV0xzHfyA1pNJZRZEr1alAS_Yvbin6e6LoGihD_DqhSjbB8AyB_ZI8";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QString xrayKey = getValueFromIni("configs/TEST_CONFIG_WG");
QString wgKey = getValueFromIni("configs/TEST_CONFIG_XRAY");
QSignalSpy importFinishedSpy(m_coreController->m_importCoreController, &ImportController::importFinished);
QSignalSpy serverAddedSpy(m_coreController->m_serversRepository, &SecureServersRepository::serverAdded);

View File

@@ -20,6 +20,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
void initTestCase() {
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
@@ -44,9 +50,9 @@ private slots:
}
void testSetDefaultServerIndex() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString xrayKey = "vpn://AAAAtXjadY7NCsJADIRfRXKui1YP0qt3L14EkRK7EQt2d0lS_0rf3awonjyFmW-YyQBNDIptIBao9sNPQgXYBXq2OL0zPqCA96kGSJHV6HK5MFP6YyCt0XsmsQqYz9zKzd3MmDIGyek6cdRoUJsE43gowNMJ-4uu_695kobbpG0MBndmTrbEV4sWcI6iG-zIQE47umOXLuSa2BlNKHKL7PMeiX5lmdH79bIsoBfiT0UOZQnjCw_AXRQ";
QString wgKey = "vpn://AAAAwXjahY89a8NADIb_StDsHLFDIHjt0C1LhgwlBNWnpgfx3SHp6hDj_15dacnYTS_Po68ZhhQVQyQW6N_mZ4QecIz0CLieAtO1IHto4Fn3M-TEat6u3XetMSnvkfSC3jOJjYN24_audRtjyhil-pfMSZPB4jMsy7kBTx9Ybvryz2ZPMnDIGlI042TktZLVkfjLmhr4TKIHHMnodHV0xzHfyA1pNJZRZEr1alAS_Yvbin6e6LoGihD_DqhSjbB8AyB_ZI8";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QString xrayKey = getValueFromIni("configs/TEST_CONFIG_WG");
QString wgKey = getValueFromIni("configs/TEST_CONFIG_XRAY");
auto importResult1 = m_coreController->m_importCoreController->extractConfigFromData(awgKey);
m_coreController->m_importCoreController->importConfig(importResult1.config);
@@ -77,9 +83,9 @@ private slots:
}
void testDefaultServerChangeOnRemoveEdgeCases() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString xrayKey = "vpn://AAAAtXjadY7NCsJADIRfRXKui1YP0qt3L14EkRK7EQt2d0lS_0rf3awonjyFmW-YyQBNDIptIBao9sNPQgXYBXq2OL0zPqCA96kGSJHV6HK5MFP6YyCt0XsmsQqYz9zKzd3MmDIGyek6cdRoUJsE43gowNMJ-4uu_695kobbpG0MBndmTrbEV4sWcI6iG-zIQE47umOXLuSa2BlNKHKL7PMeiX5lmdH79bIsoBfiT0UOZQnjCw_AXRQ";
QString wgKey = "vpn://AAAAwXjahY89a8NADIb_StDsHLFDIHjt0C1LhgwlBNWnpgfx3SHp6hDj_15dacnYTS_Po68ZhhQVQyQW6N_mZ4QecIz0CLieAtO1IHto4Fn3M-TEat6u3XetMSnvkfSC3jOJjYN24_audRtjyhil-pfMSZPB4jMsy7kBTx9Ybvryz2ZPMnDIGlI042TktZLVkfjLmhr4TKIHHMnodHV0xzHfyA1pNJZRZEr1alAS_Yvbin6e6LoGihD_DqhSjbB8AyB_ZI8";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QString xrayKey = getValueFromIni("configs/TEST_CONFIG_WG");
QString wgKey = getValueFromIni("configs/TEST_CONFIG_XRAY");
auto importResult1 = m_coreController->m_importCoreController->extractConfigFromData(awgKey);
m_coreController->m_importCoreController->importConfig(importResult1.config);

View File

@@ -19,6 +19,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
void initTestCase() {
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
@@ -42,7 +48,7 @@ private slots:
}
void testGatewayStacksRecomputeOnServerOperations() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QSignalSpy gatewayStacksExpandedSpy(m_coreController->m_serversController, &ServersController::gatewayStacksExpanded);
QSignalSpy serverAddedSpy(m_coreController->m_serversRepository, &SecureServersRepository::serverAdded);

View File

@@ -21,9 +21,10 @@ private:
CoreController *m_coreController;
SecureQSettings *m_settings;
QString getSHAdminConfig()
QString getValueFromIni(const QString &key)
{
return QProcessEnvironment::systemEnvironment().value("TEST_SELF_HOSTED_CONFIG");
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
@@ -36,7 +37,7 @@ private slots:
m_coreController = new CoreController(vpnConnection, m_settings, nullptr, this);
QString vpnKey = getSHAdminConfig();
QString vpnKey = getValueFromIni("configs/TEST_SELF_HOSTED_CONFIG");
QJsonObject importedConfig = m_coreController->m_importCoreController->extractConfigFromData(vpnKey).config;
m_coreController->m_importCoreController->importConfig(importedConfig);

View File

@@ -20,6 +20,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
void initTestCase() {
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
@@ -45,9 +51,9 @@ private slots:
}
void testMultipleImports() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString xrayKey = "vpn://AAAAtXjadY7NCsJADIRfRXKui1YP0qt3L14EkRK7EQt2d0lS_0rf3awonjyFmW-YyQBNDIptIBao9sNPQgXYBXq2OL0zPqCA96kGSJHV6HK5MFP6YyCt0XsmsQqYz9zKzd3MmDIGyek6cdRoUJsE43gowNMJ-4uu_695kobbpG0MBndmTrbEV4sWcI6iG-zIQE47umOXLuSa2BlNKHKL7PMeiX5lmdH79bIsoBfiT0UOZQnjCw_AXRQ";
QString wgKey = "vpn://AAAAwXjahY89a8NADIb_StDsHLFDIHjt0C1LhgwlBNWnpgfx3SHp6hDj_15dacnYTS_Po68ZhhQVQyQW6N_mZ4QecIz0CLieAtO1IHto4Fn3M-TEat6u3XetMSnvkfSC3jOJjYN24_audRtjyhil-pfMSZPB4jMsy7kBTx9Ybvryz2ZPMnDIGlI042TktZLVkfjLmhr4TKIHHMnodHV0xzHfyA1pNJZRZEr1alAS_Yvbin6e6LoGihD_DqhSjbB8AyB_ZI8";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QString xrayKey = getValueFromIni("configs/TEST_CONFIG_WG");
QString wgKey = getValueFromIni("configs/TEST_CONFIG_XRAY");
QSignalSpy importFinishedSpy(m_coreController->m_importCoreController, &ImportController::importFinished);
QSignalSpy defaultServerChangedSpy(m_coreController->m_serversRepository, &SecureServersRepository::defaultServerChanged);
@@ -125,8 +131,8 @@ private slots:
}
void testMultipleImportsRemoval() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString xrayKey = "vpn://AAAAtXjadY7NCsJADIRfRXKui1YP0qt3L14EkRK7EQt2d0lS_0rf3awonjyFmW-YyQBNDIptIBao9sNPQgXYBXq2OL0zPqCA96kGSJHV6HK5MFP6YyCt0XsmsQqYz9zKzd3MmDIGyek6cdRoUJsE43gowNMJ-4uu_695kobbpG0MBndmTrbEV4sWcI6iG-zIQE47umOXLuSa2BlNKHKL7PMeiX5lmdH79bIsoBfiT0UOZQnjCw_AXRQ";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QString xrayKey = getValueFromIni("configs/TEST_CONFIG_XRAY");
QSignalSpy importFinishedSpy(m_coreController->m_importCoreController, &ImportController::importFinished);
QSignalSpy defaultServerChangedSpy(m_coreController->m_serversRepository, &SecureServersRepository::defaultServerChanged);

View File

@@ -31,13 +31,19 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
ServerCredentials getCredentialsFromEnv() {
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString hostName = env.value("TEST_SERVER_HOST");
QString userName = env.value("TEST_SERVER_USER");
QString password = env.value("TEST_SERVER_PASSWORD");
QString portStr = env.value("TEST_SERVER_PORT", "22");
QString hostName = getValueFromIni("TEST_SERVER_HOST");
QString userName = getValueFromIni("TEST_SERVER_USER");
QString password = getValueFromIni("TEST_SERVER_PASSWORD");
QString portStr = getValueFromIni("TEST_SERVER_PORT");
int port = portStr.toInt();
ServerCredentials credentials;

View File

@@ -23,14 +23,10 @@ private:
CoreController *m_coreController;
SecureQSettings *m_settings;
QString getSHAdminConfig()
QString getValueFromIni(const QString &key)
{
return QProcessEnvironment::systemEnvironment().value("TEST_SELF_HOSTED_CONFIG");
}
QString getKey(QString name)
{
return QProcessEnvironment::systemEnvironment().value("TEST_KEY_" + name);
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
QJsonObject extractXrayConfig(const QString &data, ConfigTypes configType, const QString &description = "") const
@@ -88,7 +84,7 @@ private slots:
m_coreController = new CoreController(vpnConnection, m_settings, nullptr, this);
QString vpnKey = getSHAdminConfig();
QString vpnKey = getValueFromIni("configs/TEST_SELF_HOSTED_CONFIG");
QJsonObject importedConfig = m_coreController->m_importCoreController->extractConfigFromData(vpnKey).config;
m_coreController->m_importCoreController->importConfig(importedConfig);
@@ -154,7 +150,7 @@ private slots:
ImportController::ImportResult importResult;
m_coreController->m_importController->extractConfigFromData(getKey("VMESS_NEW"));
m_coreController->m_importController->extractConfigFromData(getValueFromIni("configs/TEST_CONFIG_VMESS_NEW"));
QString config = m_coreController->m_importController->getConfig();
QString prefix;
@@ -180,7 +176,7 @@ private slots:
ImportController::ImportResult importResult;
m_coreController->m_importController->extractConfigFromData(getKey("VMESS"));
m_coreController->m_importController->extractConfigFromData(getValueFromIni("configs/TEST_CONFIG_VMESS"));
QString config = m_coreController->m_importController->getConfig();
QString prefix;
@@ -206,7 +202,7 @@ private slots:
ImportController::ImportResult importResult;
m_coreController->m_importController->extractConfigFromData(getKey("TROJAN"));
m_coreController->m_importController->extractConfigFromData(getValueFromIni("configs/TEST_CONFIG_TROJAN"));
QString config = m_coreController->m_importController->getConfig();
QString prefix;
@@ -232,7 +228,7 @@ private slots:
ImportController::ImportResult importResult;
m_coreController->m_importController->extractConfigFromData(getKey("SS"));
m_coreController->m_importController->extractConfigFromData(getValueFromIni("configs/TEST_CONFIG_SS"));
QString config = m_coreController->m_importController->getConfig();
QString prefix;
@@ -258,7 +254,7 @@ private slots:
ImportController::ImportResult importResult;
m_coreController->m_importController->extractConfigFromData(getKey("SSD"));
m_coreController->m_importController->extractConfigFromData(getValueFromIni("configs/TEST_CONFIG_SSD"));
QString config = m_coreController->m_importController->getConfig();
QString prefix;

View File

@@ -19,6 +19,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
void initTestCase() {
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
@@ -43,7 +49,7 @@ private slots:
}
void testInvalidIndexOperations() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
auto importResult = m_coreController->m_importCoreController->extractConfigFromData(awgKey);
m_coreController->m_importCoreController->importConfig(importResult.config);

View File

@@ -20,6 +20,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
void initTestCase() {
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
@@ -44,7 +50,7 @@ private slots:
}
void testServerEditTriggersHandlers() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QSignalSpy importFinishedSpy(m_coreController->m_importCoreController, &ImportController::importFinished);
auto importResult = m_coreController->m_importCoreController->extractConfigFromData(awgKey);
@@ -75,8 +81,8 @@ private slots:
}
void testServerEditPreservesDefault() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString xrayKey = "vpn://AAAAtXjadY7NCsJADIRfRXKui1YP0qt3L14EkRK7EQt2d0lS_0rf3awonjyFmW-YyQBNDIptIBao9sNPQgXYBXq2OL0zPqCA96kGSJHV6HK5MFP6YyCt0XsmsQqYz9zKzd3MmDIGyek6cdRoUJsE43gowNMJ-4uu_695kobbpG0MBndmTrbEV4sWcI6iG-zIQE47umOXLuSa2BlNKHKL7PMeiX5lmdH79bIsoBfiT0UOZQnjCw_AXRQ";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QString xrayKey = getValueFromIni("configs/TEST_CONFIG_XRAY");
auto importResult1 = m_coreController->m_importCoreController->extractConfigFromData(awgKey);
m_coreController->m_importCoreController->importConfig(importResult1.config);

View File

@@ -20,6 +20,12 @@ private:
CoreController* m_coreController;
SecureQSettings* m_settings;
QString getValueFromIni(const QString &key)
{
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
void initTestCase() {
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
@@ -43,7 +49,7 @@ private slots:
}
void testServersModelSyncOnOperations() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
if (!m_coreController->m_serversModel) {
QSKIP("ServersModel not available");
@@ -72,9 +78,9 @@ private slots:
}
void testServersModelDefaultIndexSync() {
QString awgKey = "vpn://AAABFHjadZBBT4QwEIX_ipkzS2wBJdyMB1cPXvbgwRgyQnclgZa0RTYS_rszXRa52Mt77TfzOu0EldEeG62sg-J9AhxPUEywF1CAuF3WTl4dRLCXhJIVpVuUEMpWdLdFKaH7FeUb9Mx3scpFk0XTRbOLvlSkKZsOz-Gi4BsdRiV_EGEydhwlg0tWynEZmd5Yz1bkoaK3xpvKtOU3_UFjOE3SsRs-tfIl1rVVzoWQOI9FzC3eonYcU4ZmgkPdwxz9fSYdYafVT4M7-lEJ80cEtTri0PrH_2q4wlW26f1lioe3p5uDsjQWoS_j_Ct2ipvGU6zO2PWtiivT8RPQudHYmqBXzl-3Yn2slBEMTtklgYt4C_Mv3ROMwA";
QString xrayKey = "vpn://AAAAtXjadY7NCsJADIRfRXKui1YP0qt3L14EkRK7EQt2d0lS_0rf3awonjyFmW-YyQBNDIptIBao9sNPQgXYBXq2OL0zPqCA96kGSJHV6HK5MFP6YyCt0XsmsQqYz9zKzd3MmDIGyek6cdRoUJsE43gowNMJ-4uu_695kobbpG0MBndmTrbEV4sWcI6iG-zIQE47umOXLuSa2BlNKHKL7PMeiX5lmdH79bIsoBfiT0UOZQnjCw_AXRQ";
QString wgKey = "vpn://AAAAwXjahY89a8NADIb_StDsHLFDIHjt0C1LhgwlBNWnpgfx3SHp6hDj_15dacnYTS_Po68ZhhQVQyQW6N_mZ4QecIz0CLieAtO1IHto4Fn3M-TEat6u3XetMSnvkfSC3jOJjYN24_audRtjyhil-pfMSZPB4jMsy7kBTx9Ybvryz2ZPMnDIGlI042TktZLVkfjLmhr4TKIHHMnodHV0xzHfyA1pNJZRZEr1alAS_Yvbin6e6LoGihD_DqhSjbB8AyB_ZI8";
QString awgKey = getValueFromIni("configs/TEST_CONFIG_AWG");
QString xrayKey = getValueFromIni("configs/TEST_CONFIG_WG");
QString wgKey = getValueFromIni("configs/TEST_CONFIG_XRAY");
if (!m_coreController->m_serversModel) {
QSKIP("ServersModel not available");

View File

@@ -21,14 +21,10 @@ private:
CoreController *m_coreController;
SecureQSettings *m_settings;
QString getPath()
QString getValueFromIni(const QString &key)
{
return QProcessEnvironment::systemEnvironment().value("TEST_DNS_LIST_PATH");
}
QString getExportPath()
{
return QProcessEnvironment::systemEnvironment().value("TEST_EXPORT_PATH");
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
@@ -77,13 +73,13 @@ private slots:
QString msg = QString("dns ip should be %1, got %2").arg(ip, dnsIp.toString());
QVERIFY2(dnsIp == ip, msg.toLocal8Bit().constData());
m_coreController->m_allowedDnsUiController->importDns(getPath(), true);
m_coreController->m_allowedDnsUiController->importDns(getValueFromIni("paths/TEST_DNS_LIST_PATH"), true);
m_coreController->m_allowedDnsUiController->updateModel();
QVERIFY2(errorOccurredSpy.count() == 0, "errorOccurred signal should not be emitted");
QVERIFY2(finishedSpy.count() == 2, "finished signal should be emitted");
QVERIFY2(m_coreController->m_allowedDnsModel->rowCount() > 1, "AllowedDnsModel should have more than 1 row");
m_coreController->m_allowedDnsUiController->exportDns(getExportPath() + "test_dns_export.json");
m_coreController->m_allowedDnsUiController->exportDns(getValueFromIni("paths/TEST_EXPORT_PATH") + "test_dns_export.json");
QVERIFY2(errorOccurredSpy.count() == 0, "errorOccurred signal should not be emitted");
QVERIFY2(finishedSpy.count() == 3, "finished signal should be emitted");

View File

@@ -21,9 +21,10 @@ private:
CoreController *m_coreController;
SecureQSettings *m_settings;
QString getPath()
QString getValueFromIni(const QString &key)
{
return QProcessEnvironment::systemEnvironment().value("TEST_APP_PATH");
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
private slots:
@@ -66,7 +67,7 @@ private slots:
QVERIFY2(isSplitTunnelingChangedSpy.count() == 2, "isSplitTunnelingChangedSpy signal should be emitted 2nd time");
QVERIFY2(m_coreController->m_appSplitTunnelingUiController->isTunnelingEnabled() == false, "AppSplitTunneling should be disabled");
QString app = getPath();
QString app = getValueFromIni("paths/TEST_APP_PATH");
m_coreController->m_appSplitTunnelingUiController->addApp(app);
m_coreController->m_appSplitTunnelingUiController->updateModel();

View File

@@ -21,14 +21,10 @@ private:
CoreController *m_coreController;
SecureQSettings *m_settings;
QString getPath()
QString getValueFromIni(const QString &key)
{
return QProcessEnvironment::systemEnvironment().value("TEST_SITES_LIST_PATH");
}
QString getExportPath()
{
return QProcessEnvironment::systemEnvironment().value("TEST_EXPORT_PATH");
QSettings settings("test_vars.ini", QSettings::IniFormat);
return settings.value(key).toString();
}
QString normalizeHostname(const QString &hostname) const
@@ -103,13 +99,13 @@ private slots:
QVERIFY2(finishedSpy.count() == 3, "finished signal should be emitted");
QVERIFY2(m_coreController->m_sitesModel->rowCount() == 1, "SitesModel should have 1 row");
m_coreController->m_sitesUiController->importSites(getPath(), true);
m_coreController->m_sitesUiController->importSites(getValueFromIni("paths/TEST_SITES_LIST_PATH"), true);
m_coreController->m_sitesUiController->updateModel();
QVERIFY2(errorOccurredSpy.count() == 0, "errorOccurred signal should not be emitted");
QVERIFY2(finishedSpy.count() == 4, "finished signal should be emitted");
QVERIFY2(m_coreController->m_sitesModel->rowCount() > 1, "SitesModel should have more than 1 row");
m_coreController->m_sitesUiController->exportSites(getExportPath() + "test_sites_export.json");
m_coreController->m_sitesUiController->exportSites(getValueFromIni("paths/TEST_EXPORT_PATH") + "test_sites_export.json");
QVERIFY2(finishedSpy.count() == 5, "finished signal should be emitted");
m_coreController->m_sitesUiController->removeSites();

View File

@@ -0,0 +1,23 @@
[configs]
TEST_SELF_HOSTED_CONFIG = self-hosted_config_string
TEST_CONFIG_ANY = any_config_string
TEST_CONFIG_AWG = awg_config_string
TEST_CONFIG_WG = wg_config_string
TEST_CONFIG_XRAY = xray_config_string
TEST_CONFIG_VMESS_NEW = vmess_new_config_string
TEST_CONFIG_VMESS = vmess_config_string
TEST_CONFIG_TROJAN = trojan_config_string
TEST_CONFIG_SS = ss_config_string
TEST_CONFIG_SSD = ssd_config_string
[paths]
TEST_APP_PATH = path/to/app
TEST_SITES_LIST_PATH = path/to/file/with/sites_list
TEST_DNS_LIST_PATH = path/to/file/with/dns_list
TEST_EXPORT_PATH = path/to/export_directory
[secrets]
TEST_SERVER_HOST = server_host
TEST_SERVER_USER = server_user
TEST_SERVER_PASSWORD = server_password
TEST_SERVER_PORT = 22