промежуточный. редактирование пакетов тестирования ДВМ, и возможность их перезапуска.

This commit is contained in:
2024-09-14 01:16:08 +03:00
parent 222163c557
commit 1e782daa3d
7 changed files with 29 additions and 4 deletions

7
.idea/workspace.xml generated
View File

@@ -7,7 +7,12 @@
</component> </component>
<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$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.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" />

View File

@@ -10,7 +10,7 @@
"SMTPHost": "smtp.mail.ru", "SMTPHost": "smtp.mail.ru",
"SMTPPort": 465, "SMTPPort": 465,
"MailSocketPort": 465, "MailSocketPort": 465,
"collapseCredentials": false, "collapseCredentials": true,
"collapseFileGraphs": false, "collapseFileGraphs": false,
"collapseFileMessages": false, "collapseFileMessages": false,
"collapseProjectTrees": false, "collapseProjectTrees": false,

View File

@@ -130,6 +130,21 @@ public abstract class TestingPackage<J> extends riDBObject {
res.add(Global.testingServer.db.tests.get(o_id)); res.add(Global.testingServer.db.tests.get(o_id));
return res; return res;
} }
public void Reset() {
StartDate = 0;
ChangeDate = 0;
progress = 0;
state = TasksPackageState.Inactive;
//--
File loaded = new File(getLocalWorkspace(), Constants.LOADED);
if (loaded.exists()) {
try {
Utils.forceDeleteWithCheck(loaded);
} catch (Exception ex) {
ex.printStackTrace();
}
}
}
/* /*
public void printCGT() { public void printCGT() {
try { try {

View File

@@ -72,6 +72,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
//-- //--
LinkedHashMap<Integer, File> tests = getTestsFromJson(); LinkedHashMap<Integer, File> tests = getTestsFromJson();
//создать папку для пакета. //создать папку для пакета.
user.connection.RMDIR(packageRemoteWorkspace.full_name);
user.connection.sftpChannel.mkdir(packageRemoteWorkspace.full_name); user.connection.sftpChannel.mkdir(packageRemoteWorkspace.full_name);
//положить туда запакованные тексты задач. //положить туда запакованные тексты задач.
Vector<String> compilationLines = new Vector<>(); Vector<String> compilationLines = new Vector<>();

View File

@@ -27,6 +27,9 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
case Aborted: case Aborted:
Log.Writeln_("Пакет уже завершен."); Log.Writeln_("Пакет уже завершен.");
break; break;
case Inactive:
Log.Writeln_("Пакет неактивен.");
break;
default: default:
packageToKill = new TestingPackageToKill(); packageToKill = new TestingPackageToKill();
packageToKill.packageId = target.id; packageToKill.packageId = target.id;

View File

@@ -167,6 +167,7 @@ public class SaveCurrentDVMPackage extends EditServerObject<TestingServer, DVMPa
target.saveTests(tests); target.saveTests(tests);
//-- //--
target.saveTasks(tasks, tasks_count); target.saveTasks(tasks, tasks_count);
target.Reset();
super.ServerAction(); super.ServerAction();
} }
@Override @Override

View File

@@ -22,8 +22,8 @@ public class StartDVMPackage extends EditServerObject<TestingServer, DVMPackage>
if (Current.Check(Log,Current.DVMPackage)) { if (Current.Check(Log,Current.DVMPackage)) {
target = Current.getDVMPackage(); target = Current.getDVMPackage();
//- //-
if (target.state.isActive()) { if (!target.state.equals(TasksPackageState.Inactive)) {
Log.Writeln_("Пакет уже запущен."); Log.Writeln_("Возможно запустить только неактивный пакет.");
return false; return false;
} }
if (target.tasksCount == 0) { if (target.tasksCount == 0) {