рефакторинг кода тестового сервера
This commit is contained in:
4
.idea/workspace.xml
generated
4
.idea/workspace.xml
generated
@@ -8,9 +8,7 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import _VisualDVM.TestingSystem.Common.Test.TestType;
|
|||||||
import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
|
import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage_json;
|
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMTestingChecker;
|
import _VisualDVM.TestingSystem.DVM.DVMTestingChecker;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
|
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
|
||||||
@@ -261,7 +260,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
throw new RepositoryRefuseException("Актуальная версия SAPFOR " + max_installed_version + " уже установлена");
|
throw new RepositoryRefuseException("Актуальная версия SAPFOR " + max_installed_version + " уже установлена");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//основа
|
|
||||||
@Override
|
@Override
|
||||||
public int getPort() {
|
public int getPort() {
|
||||||
return Constants.TestingServerPort;
|
return Constants.TestingServerPort;
|
||||||
@@ -270,16 +268,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
protected void startAdditionalThreads() {
|
protected void startAdditionalThreads() {
|
||||||
testingThread.start();
|
testingThread.start();
|
||||||
}
|
}
|
||||||
@Override
|
void PerformAutoSapforTesting() throws Exception {
|
||||||
protected void Session() throws Exception {
|
|
||||||
Test test;
|
|
||||||
int test_id;
|
|
||||||
switch (code) {
|
|
||||||
case PerformAutoSapforTesting:
|
|
||||||
Print("Запустить автоматическое тестирование SAPFOR");
|
|
||||||
TextLog Log = new TextLog();
|
TextLog Log = new TextLog();
|
||||||
SapforPackage autoPackage = tryAutoSapforTesting(Log);
|
SapforPackage autoPackage = tryAutoSapforTesting(Log);
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
EmailMessage message = Log.isEmpty() ?
|
EmailMessage message = Log.isEmpty() ?
|
||||||
new EmailMessage(
|
new EmailMessage(
|
||||||
"Запущено автоматическое тестирование версии " + request.arg + " системы SAPFOR",
|
"Запущено автоматическое тестирование версии " + request.arg + " системы SAPFOR",
|
||||||
@@ -291,101 +282,18 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
for (String address : Constants.admins_mails) {
|
for (String address : Constants.admins_mails) {
|
||||||
Email(message, address);
|
Email(message, address);
|
||||||
}
|
}
|
||||||
break;
|
}
|
||||||
case DownloadTest:
|
void DownloadTest() throws Exception {
|
||||||
Print("Отправить клиенту тест " + request.arg);
|
int test_id = Integer.parseInt(request.arg);
|
||||||
test_id = Integer.parseInt(request.arg);
|
|
||||||
if (db.tests.containsKey(test_id)) {
|
if (db.tests.containsKey(test_id)) {
|
||||||
test = db.tests.get(test_id);
|
Test test = db.tests.get(test_id);
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils_.fileToBytes(test.getArchive()));
|
response = new ServerExchangeUnit_2021(ServerCode.OK, "", Utils_.fileToBytes(test.getArchive()));
|
||||||
} else
|
} else
|
||||||
throw new RepositoryRefuseException("Теста с именем " + request.arg + " не существует");
|
throw new RepositoryRefuseException("Теста с именем " + request.arg + " не существует");
|
||||||
break;
|
}
|
||||||
case ReceiveTestsDatabase:
|
void ReceiveTestsDatabase() throws Exception {
|
||||||
Print("Получить базу данных тестов");
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = Utils_.fileToBytes(db.getFile());
|
response.object = Utils_.fileToBytes(db.getFile());
|
||||||
break;
|
|
||||||
//---
|
|
||||||
case RefreshDVMTests:
|
|
||||||
Print("Синхронизировать репозиторий тестов ");
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
RefreshDVMTests((Account) request.object, Integer.parseInt(request.arg));
|
|
||||||
break;
|
|
||||||
case DVMPackageNeedsKill:
|
|
||||||
Print("Проверить нуждается ли пакет DVM в убийстве");
|
|
||||||
DVMPackageNeedsKill();
|
|
||||||
break;
|
|
||||||
case UpdateActiveDVMPackages:
|
|
||||||
Print("Получить данные по пакетам DVM");
|
|
||||||
UpdateActiveDVMPackages();
|
|
||||||
break;
|
|
||||||
case GetFirstActiveSapforPackages:
|
|
||||||
Print("Получить первый активный пакет задач SAPFOR");
|
|
||||||
GetFirstActiveSapforPackages();
|
|
||||||
break;
|
|
||||||
case SapforPackageNeedsKill:
|
|
||||||
Print("Проверить нуждает ли пакет SAPFOR в убийстве");
|
|
||||||
SapforPackageNeedsKill();
|
|
||||||
break;
|
|
||||||
case UpdateActiveSapforPackages:
|
|
||||||
Print("Получить данные по пакетам Sapfor");
|
|
||||||
UpdateActiveSapforPackages();
|
|
||||||
break;
|
|
||||||
case DownloadDVMPackages:
|
|
||||||
Print("Загрузить пакеты DVM");
|
|
||||||
DownloadDVMPackages();
|
|
||||||
break;
|
|
||||||
case DownloadSapforPackage:
|
|
||||||
Print("Загрузить пакет SAPFOR");
|
|
||||||
DownloadSapforPackage();
|
|
||||||
break;
|
|
||||||
case ReplaceTestCode:
|
|
||||||
Print("Заменить код теста");
|
|
||||||
ReplaceTestCode();
|
|
||||||
break;
|
|
||||||
case ReplaceTestsCodes:
|
|
||||||
Print("Заменить код тестов");
|
|
||||||
ReplaceTestsCodes();
|
|
||||||
break;
|
|
||||||
case GetFirstActiveDVMPackageForMachineURL:
|
|
||||||
Print("Получить первый активный пакет задач DVM на машине с адресом");
|
|
||||||
GetFirstActiveDVMPackageForMachineURL();
|
|
||||||
break;
|
|
||||||
case GetServerName:
|
|
||||||
Print("Получить имя сервера");
|
|
||||||
GetServerName();
|
|
||||||
break;
|
|
||||||
case StartNecessaryMachines:
|
|
||||||
Print("Проверка процессов машин");
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
StartNecessaryMachines();
|
|
||||||
break;
|
|
||||||
case GetSapforForCompilation:
|
|
||||||
Print("Получить первую активную версию Sapfor для сборки");
|
|
||||||
GetSapforForCompilation();
|
|
||||||
break;
|
|
||||||
case GetMaxSapforVersion:
|
|
||||||
Print("Получить максимальную установленную версию Sapfor");
|
|
||||||
GetSapforMaxVersion();
|
|
||||||
break;
|
|
||||||
case JoinSapforVersionsToGroup:
|
|
||||||
Print("Получить финальные версии пакета тестирования SAPFOR");
|
|
||||||
JoinSapforPackageToGroup();
|
|
||||||
break;
|
|
||||||
case ReplaceDVMPackageResults:
|
|
||||||
Print("Заменить json DVM пакета");
|
|
||||||
ReplaceDVMPackageJson();
|
|
||||||
break;
|
|
||||||
case DetectTestsMinMaxDim:
|
|
||||||
Print("Определить размерность тестов");
|
|
||||||
DetectTestsMinMaxDim();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
//->>
|
|
||||||
Pair<Group, Vector<File>> ConvertDirectoryToGroup(File src, LanguageName languageName, TestType
|
Pair<Group, Vector<File>> ConvertDirectoryToGroup(File src, LanguageName languageName, TestType
|
||||||
testType, Account account) throws Exception {
|
testType, Account account) throws Exception {
|
||||||
Group object = new Group();
|
Group object = new Group();
|
||||||
@@ -409,7 +317,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
//->>
|
//->>
|
||||||
return new Pair<>(object, groupFiles);
|
return new Pair<>(object, groupFiles);
|
||||||
}
|
}
|
||||||
public void RefreshDVMTests(Account account, int sapfor_id) throws Exception {
|
void RefreshDVMTests() throws Exception {
|
||||||
|
Account account = (Account) request.object;
|
||||||
|
int sapfor_id = Integer.parseInt(request.arg);
|
||||||
ServerSapfor sapfor = null;
|
ServerSapfor sapfor = null;
|
||||||
if (!db.serverSapfors.containsKey(sapfor_id))
|
if (!db.serverSapfors.containsKey(sapfor_id))
|
||||||
throw new RepositoryRefuseException("Версия SAPFOR с ключом " + sapfor_id + " не найдена.");
|
throw new RepositoryRefuseException("Версия SAPFOR с ключом " + sapfor_id + " не найдена.");
|
||||||
@@ -459,16 +369,13 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
for (Pair<Group, Vector<File>> p : groups)
|
for (Pair<Group, Vector<File>> p : groups)
|
||||||
db.RefreshGroup(account, sapfor, p);
|
db.RefreshGroup(account, sapfor, p);
|
||||||
}
|
}
|
||||||
private void GetFirstActiveSapforPackages() throws Exception {
|
void GetFirstActiveSapforPackages() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = db.getFirstActiveSapforPackagesCopies();
|
response.object = db.getFirstActiveSapforPackagesCopies();
|
||||||
}
|
}
|
||||||
void GetSapforMaxVersion() throws Exception {
|
void GetSapforMaxVersion() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = db.getInstalledSapforMaxVersion();
|
response.object = db.getInstalledSapforMaxVersion();
|
||||||
}
|
}
|
||||||
void UpdateActiveDVMPackages() throws Exception {
|
void UpdateActiveDVMPackages() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
Vector<Pair<Integer, Long>> keys_pairs = (Vector<Pair<Integer, Long>>) request.object;
|
Vector<Pair<Integer, Long>> keys_pairs = (Vector<Pair<Integer, Long>>) request.object;
|
||||||
Vector<DVMPackage> res = new Vector<>();
|
Vector<DVMPackage> res = new Vector<>();
|
||||||
//--
|
//--
|
||||||
@@ -481,8 +388,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
response.object = res;
|
response.object = res;
|
||||||
}
|
}
|
||||||
private void UpdateActiveSapforPackages() {
|
void UpdateActiveSapforPackages() {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
Vector<Pair<Integer, Long>> keys_pairs = (Vector<Pair<Integer, Long>>) request.object;
|
Vector<Pair<Integer, Long>> keys_pairs = (Vector<Pair<Integer, Long>>) request.object;
|
||||||
Vector<SapforPackage> res = new Vector<>();
|
Vector<SapforPackage> res = new Vector<>();
|
||||||
//--
|
//--
|
||||||
@@ -495,8 +401,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
response.object = res;
|
response.object = res;
|
||||||
}
|
}
|
||||||
private void DVMPackageNeedsKill() {
|
void DVMPackageNeedsKill() {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = CommonConstants.Nan;
|
response.object = CommonConstants.Nan;
|
||||||
int packageId = (int) request.object;
|
int packageId = (int) request.object;
|
||||||
for (TestingPackageToKill packageToKill : db.testingPackagesToKill.Data.values()) {
|
for (TestingPackageToKill packageToKill : db.testingPackagesToKill.Data.values()) {
|
||||||
@@ -506,8 +411,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void SapforPackageNeedsKill() throws Exception {
|
void SapforPackageNeedsKill() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = CommonConstants.Nan;
|
response.object = CommonConstants.Nan;
|
||||||
int packageId = (int) request.object;
|
int packageId = (int) request.object;
|
||||||
for (TestingPackageToKill packageToKill : db.testingPackagesToKill.Data.values()) {
|
for (TestingPackageToKill packageToKill : db.testingPackagesToKill.Data.values()) {
|
||||||
@@ -517,7 +421,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void DownloadDVMPackages() throws Exception {
|
void DownloadDVMPackages() throws Exception {
|
||||||
Vector<Integer> ids = (Vector<Integer>) request.object;
|
Vector<Integer> ids = (Vector<Integer>) request.object;
|
||||||
Vector<Pair<Integer, Pair<byte[], byte[]>>> res = new Vector<>();
|
Vector<Pair<Integer, Pair<byte[], byte[]>>> res = new Vector<>();
|
||||||
for (int dvmPackage_id : ids) {
|
for (int dvmPackage_id : ids) {
|
||||||
@@ -529,14 +433,12 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
File package_json = dvmPackage.getJsonFile();
|
File package_json = dvmPackage.getJsonFile();
|
||||||
res.add(new Pair<>(dvmPackage_id, new Pair(Utils_.fileToBytes(results_zip), Utils_.fileToBytes(package_json))));
|
res.add(new Pair<>(dvmPackage_id, new Pair(Utils_.fileToBytes(results_zip), Utils_.fileToBytes(package_json))));
|
||||||
}
|
}
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = res;
|
response.object = res;
|
||||||
}
|
}
|
||||||
private void DownloadSapforPackage() throws Exception {
|
void DownloadSapforPackage() throws Exception {
|
||||||
int sapforPackage_id = (int) request.object;
|
int sapforPackage_id = (int) request.object;
|
||||||
if (!db.sapforPackages.containsKey(sapforPackage_id))
|
if (!db.sapforPackages.containsKey(sapforPackage_id))
|
||||||
throw new RepositoryRefuseException("Не найдено пакета тестирования SAPFOR с ключом " + sapforPackage_id);
|
throw new RepositoryRefuseException("Не найдено пакета тестирования SAPFOR с ключом " + sapforPackage_id);
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
SapforPackage sapforPackage = db.sapforPackages.get(sapforPackage_id);
|
SapforPackage sapforPackage = db.sapforPackages.get(sapforPackage_id);
|
||||||
File workspace = sapforPackage.getLocalWorkspace();
|
File workspace = sapforPackage.getLocalWorkspace();
|
||||||
File results_zip = Utils.getTempFileName("results");
|
File results_zip = Utils.getTempFileName("results");
|
||||||
@@ -547,10 +449,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
else
|
else
|
||||||
throw new RepositoryRefuseException("Не удалось заархивировать пакет тестирования SAPFOR с ключом " + sapforPackage_id);
|
throw new RepositoryRefuseException("Не удалось заархивировать пакет тестирования SAPFOR с ключом " + sapforPackage_id);
|
||||||
}
|
}
|
||||||
private void ReplaceTestCode() throws Exception {
|
void ReplaceTestCode() throws Exception {
|
||||||
Test test = (Test) request.object;
|
Test test = (Test) request.object;
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
//---
|
|
||||||
if (!test.unpackProjectOnServer()) {
|
if (!test.unpackProjectOnServer()) {
|
||||||
db.Delete(test);
|
db.Delete(test);
|
||||||
throw new RepositoryRefuseException(
|
throw new RepositoryRefuseException(
|
||||||
@@ -559,9 +459,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
);
|
);
|
||||||
} else db.Update(test); //обновить список файлов и размерность.
|
} else db.Update(test); //обновить список файлов и размерность.
|
||||||
}
|
}
|
||||||
private void ReplaceTestsCodes() throws Exception {
|
void ReplaceTestsCodes() throws Exception {
|
||||||
Vector<Test> tests = (Vector<Test>) request.object;
|
Vector<Test> tests = (Vector<Test>) request.object;
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
for (Test test : tests) {
|
for (Test test : tests) {
|
||||||
if (!test.unpackProjectOnServer()) {
|
if (!test.unpackProjectOnServer()) {
|
||||||
db.Delete(test);
|
db.Delete(test);
|
||||||
@@ -572,43 +471,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
} else db.Update(test); //обновить список файлов и размерность.
|
} else db.Update(test); //обновить список файлов и размерность.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void GetDVMPackagesJson() throws Exception {
|
void GetServerName() throws Exception {
|
||||||
Vector<Integer> packages_ids = (Vector<Integer>) request.object;
|
|
||||||
Vector<DVMPackage_json> jsons = new Vector<>();
|
|
||||||
for (int package_id : packages_ids) {
|
|
||||||
if (!db.dvmPackages.containsKey(package_id))
|
|
||||||
throw new RepositoryRefuseException("Пакета задач DVM " + Utils_.Brackets(package_id) + " не существует.");
|
|
||||||
DVMPackage dvmPackage = db.dvmPackages.get(package_id);
|
|
||||||
File json = dvmPackage.getJsonFile();
|
|
||||||
if (!json.exists())
|
|
||||||
throw new RepositoryRefuseException("Не найден JSON файл для пакета задач DVM " + Utils_.Brackets(package_id));
|
|
||||||
jsons.add(Utils_.jsonFromFile(json, DVMPackage_json.class));
|
|
||||||
}
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = jsons;
|
|
||||||
}
|
|
||||||
private void GetSapforPackagesJson() throws Exception {
|
|
||||||
Vector<Integer> packages_ids = (Vector<Integer>) request.object;
|
|
||||||
Vector<SapforPackage_json> jsons = new Vector<>();
|
|
||||||
for (int package_id : packages_ids) {
|
|
||||||
if (!db.sapforPackages.containsKey(package_id))
|
|
||||||
throw new RepositoryRefuseException("Пакета задач SAPFOR " + Utils_.Brackets(package_id) + " не существует.");
|
|
||||||
SapforPackage sapforPackage = db.sapforPackages.get(package_id);
|
|
||||||
File json = sapforPackage.getJsonFile();
|
|
||||||
if (!json.exists())
|
|
||||||
throw new RepositoryRefuseException("Не найден JSON файл для пакета задач SAPFOR " + Utils_.Brackets(package_id));
|
|
||||||
jsons.add(Utils_.jsonFromFile(json, SapforPackage_json.class));
|
|
||||||
}
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = jsons;
|
|
||||||
}
|
|
||||||
private void GetServerName() throws Exception {
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = name;
|
response.object = name;
|
||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
private void GetFirstActiveDVMPackageForMachineURL() {
|
void GetFirstActiveDVMPackageForMachineURL() {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = db.getFirstActiveDVMPackageCopyForMachineURL(request.arg);
|
response.object = db.getFirstActiveDVMPackageCopyForMachineURL(request.arg);
|
||||||
}
|
}
|
||||||
void StartNecessaryMachines() {
|
void StartNecessaryMachines() {
|
||||||
@@ -647,7 +514,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
void GetSapforActualVersion() throws Exception {
|
void GetSapforActualVersion() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
File versionFile = new File(Global.TempDirectory, "version.h");
|
File versionFile = new File(Global.TempDirectory, "version.h");
|
||||||
if (versionFile.exists())
|
if (versionFile.exists())
|
||||||
FileUtils.forceDelete(versionFile);
|
FileUtils.forceDelete(versionFile);
|
||||||
@@ -698,7 +564,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
db.Insert(serverSapfor);
|
db.Insert(serverSapfor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
response.object = serverSapfor;
|
response.object = serverSapfor;
|
||||||
}
|
}
|
||||||
SapforPackage tryAutoSapforTesting(TextLog Log) throws Exception {
|
SapforPackage tryAutoSapforTesting(TextLog Log) throws Exception {
|
||||||
@@ -738,20 +603,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
//--
|
//--
|
||||||
return target;
|
return target;
|
||||||
}
|
}
|
||||||
public void checkUnpackedTests() throws Exception {
|
Vector<String> getSapforTaskResults(SapforTask task) throws Exception {
|
||||||
for (Test test : db.tests.Data.values()) {
|
|
||||||
File testHome = test.getServerPath();
|
|
||||||
if (!testHome.exists()) {
|
|
||||||
throw new RepositoryRefuseException(test.id + " не существует папка");
|
|
||||||
}
|
|
||||||
File testArchive = test.getArchive();
|
|
||||||
if (!testArchive.exists()) {
|
|
||||||
throw new RepositoryRefuseException(test.id + " не существует архив");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
}
|
|
||||||
public Vector<String> getSapforTaskResults(SapforTask task) throws Exception {
|
|
||||||
Vector<String> res = new Vector<>();
|
Vector<String> res = new Vector<>();
|
||||||
//--
|
//--
|
||||||
if (!task.variants.isEmpty()) {
|
if (!task.variants.isEmpty()) {
|
||||||
@@ -765,8 +617,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
private void JoinSapforPackageToGroup() throws Exception {
|
void JoinSapforPackageToGroup() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
String[] packed = request.arg.split("\n");
|
String[] packed = request.arg.split("\n");
|
||||||
int groupId = Integer.parseInt(packed[0]);
|
int groupId = Integer.parseInt(packed[0]);
|
||||||
int packageId = Integer.parseInt(packed[1]);
|
int packageId = Integer.parseInt(packed[1]);
|
||||||
@@ -855,8 +706,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
//-"sh"
|
//-"sh"
|
||||||
}
|
}
|
||||||
private void ReplaceDVMPackageJson() throws Exception {
|
void ReplaceDVMPackageJson() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
Pair<DVMPackage, byte[]> p = (Pair<DVMPackage, byte[]>) request.object;
|
Pair<DVMPackage, byte[]> p = (Pair<DVMPackage, byte[]>) request.object;
|
||||||
DVMPackage src = p.getKey();
|
DVMPackage src = p.getKey();
|
||||||
byte[] packed_file = p.getValue();
|
byte[] packed_file = p.getValue();
|
||||||
@@ -868,8 +718,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
db.Update(dst);
|
db.Update(dst);
|
||||||
Utils_.bytesToFile(packed_file, dst.getJsonFile());
|
Utils_.bytesToFile(packed_file, dst.getJsonFile());
|
||||||
}
|
}
|
||||||
private void DetectTestsMinMaxDim() throws Exception {
|
void DetectTestsMinMaxDim() throws Exception {
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
Vector<Object> keys = (Vector<Object>) request.object;
|
Vector<Object> keys = (Vector<Object>) request.object;
|
||||||
for (Object key : keys) {
|
for (Object key : keys) {
|
||||||
if (!db.tests.containsKey(key))
|
if (!db.tests.containsKey(key))
|
||||||
@@ -898,5 +747,76 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//--
|
||||||
|
@Override
|
||||||
|
protected void Session() throws Exception {
|
||||||
|
switch (code) {
|
||||||
|
case PerformAutoSapforTesting:
|
||||||
|
PerformAutoSapforTesting();
|
||||||
|
break;
|
||||||
|
case DownloadTest:
|
||||||
|
DownloadTest();
|
||||||
|
break;
|
||||||
|
case ReceiveTestsDatabase:
|
||||||
|
ReceiveTestsDatabase();
|
||||||
|
break;
|
||||||
|
case RefreshDVMTests:
|
||||||
|
RefreshDVMTests();
|
||||||
|
break;
|
||||||
|
case DVMPackageNeedsKill:
|
||||||
|
DVMPackageNeedsKill();
|
||||||
|
break;
|
||||||
|
case UpdateActiveDVMPackages:
|
||||||
|
UpdateActiveDVMPackages();
|
||||||
|
break;
|
||||||
|
case GetFirstActiveSapforPackages:
|
||||||
|
GetFirstActiveSapforPackages();
|
||||||
|
break;
|
||||||
|
case SapforPackageNeedsKill:
|
||||||
|
SapforPackageNeedsKill();
|
||||||
|
break;
|
||||||
|
case UpdateActiveSapforPackages:
|
||||||
|
UpdateActiveSapforPackages();
|
||||||
|
break;
|
||||||
|
case DownloadDVMPackages:
|
||||||
|
DownloadDVMPackages();
|
||||||
|
break;
|
||||||
|
case DownloadSapforPackage:
|
||||||
|
DownloadSapforPackage();
|
||||||
|
break;
|
||||||
|
case ReplaceTestCode:
|
||||||
|
ReplaceTestCode();
|
||||||
|
break;
|
||||||
|
case ReplaceTestsCodes:
|
||||||
|
ReplaceTestsCodes();
|
||||||
|
break;
|
||||||
|
case GetFirstActiveDVMPackageForMachineURL:
|
||||||
|
GetFirstActiveDVMPackageForMachineURL();
|
||||||
|
break;
|
||||||
|
case GetServerName:
|
||||||
|
GetServerName();
|
||||||
|
break;
|
||||||
|
case StartNecessaryMachines:
|
||||||
|
StartNecessaryMachines();
|
||||||
|
break;
|
||||||
|
case GetSapforForCompilation:
|
||||||
|
GetSapforForCompilation();
|
||||||
|
break;
|
||||||
|
case GetMaxSapforVersion:
|
||||||
|
GetSapforMaxVersion();
|
||||||
|
break;
|
||||||
|
case JoinSapforVersionsToGroup:
|
||||||
|
JoinSapforPackageToGroup();
|
||||||
|
break;
|
||||||
|
case ReplaceDVMPackageResults:
|
||||||
|
ReplaceDVMPackageJson();
|
||||||
|
break;
|
||||||
|
case DetectTestsMinMaxDim:
|
||||||
|
DetectTestsMinMaxDim();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user