M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
02090095
2024-09-14 01:16:08 +03:00
parent 222163c557
commit 1e782daa3d
7 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -7,7 +7,12 @@
</component>
<component name="ChangeListManager">
<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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

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

15
src/TestingSystem/Common/TestingPackage/TestingPackage.java
View File

@@ -130,6 +130,21 @@ public abstract class TestingPackage<J> extends riDBObject {
res.add(Global.testingServer.db.tests.get(o_id));
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() {
try {

1
src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

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

3
src/Visual_DVM_2021/Passes/AbortTestingPackage.java
View File

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

1
src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java
View File

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

4
src/Visual_DVM_2021/Passes/All/StartDVMPackage.java
View File

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