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

fix. при клонировании пакета сапфор, задачам не раздавались ид

Browse Source
This commit is contained in:
02090095
2024-03-24 18:02:29 +03:00
parent e83ecac005
commit aaddd55152
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml generated
View File

@@ -7,14 +7,9 @@
</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 afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTestingServer.java" afterDir="false" />
<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/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingTestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.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" />

2
properties
View File

@@ -35,7 +35,7 @@
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"TestingKernels": 16, "TestingKernels": 16,
"AutoCheckTesting": false, "AutoCheckTesting": true,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false, "EmailOnTestingProgress": false,
"eraseTestingWorkspaces": true "eraseTestingWorkspaces": true

10
src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
View File

@@ -86,7 +86,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
return false; return false;
//-- //--
srcPackages = Global.testingServer.db.sapforPackages.getCheckedOrCurrent(); srcPackages = Global.testingServer.db.sapforPackages.getCheckedOrCurrent();
if (srcPackages.isEmpty()){ if (srcPackages.isEmpty()) {
Log.Writeln_("Не отмечено или не выбрано ни одного пакета SAPFOR"); Log.Writeln_("Не отмечено или не выбрано ни одного пакета SAPFOR");
return false; return false;
} }
@@ -158,6 +158,10 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
} }
} }
} }
for (SapforTask task : target.package_json.tasks) {
task.id = target.package_json.getMaxTaskId();
target.package_json.tasks.add(task);
}
target.tasksCount = target.package_json.tasks.size(); target.tasksCount = target.package_json.tasks.size();
target.testsNames = String.join(";", target.package_json.getTestsNames()); target.testsNames = String.join(";", target.package_json.getTestsNames());
target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames()); target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
@@ -180,7 +184,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
protected void body() throws Exception { protected void body() throws Exception {
Global.testingServer.db.sapforPackages.Data.put(target.id, target); Global.testingServer.db.sapforPackages.Data.put(target.id, target);
//-- //--
// Utils.CheckAndCleanDirectory(target.getLocalWorkspace()); // Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
// target.saveJson(); // target.saveJson();
} }
} }