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

исправил баг в функции отвечающей за рекурсивное удаление файлов с определенными расширениями.

Browse Source
This commit is contained in:
02090095
2023-10-02 01:02:07 +03:00
parent bf25aae4d9
commit 6271d6272a
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -7,14 +7,10 @@
</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/Common/UI/Menus_2023/SapforScenariosBar/SapforScenariosBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.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/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenarioResults_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.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" />
</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" />

8
src/Common/Utils/Utils.java
View File

@@ -669,13 +669,17 @@ public class Utils {
if (files != null) { if (files != null) {
for (File file : files) { for (File file : files) {
if (file.isFile()) { if (file.isFile()) {
String file_extension = getExtension(file);
for (String ext : extensions) { for (String ext : extensions) {
if (getExtension(file).equalsIgnoreCase(ext)) if (file_extension.equalsIgnoreCase(ext)) {
res.add(file); res.add(file);
// System.out.println(file.getAbsolutePath() + ":" + Utils.Brackets(file_extension));
// System.out.println("MATCH");
}
} }
} }
if (file.isDirectory()) if (file.isDirectory())
getFilesByExtensions_r(file, res); getFilesByExtensions_r(file, res, extensions);
} }
} }
} }

10
src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
View File

@@ -15,7 +15,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
SapforScenarioResults_json results_json = new SapforScenarioResults_json(); SapforScenarioResults_json results_json = new SapforScenarioResults_json();
public SapforTestingPlanner() throws Exception { public SapforTestingPlanner() throws Exception {
super(Global.properties.threadsTimeout, Global.properties.threadsNum); super(Global.properties.threadsTimeout, Global.properties.threadsNum);
scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario.txt"), SapforScenario_json.class); scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), SapforScenario_json.class);
results_json.StartDate = new Date().getTime(); results_json.StartDate = new Date().getTime();
//формирование списка задач. //формирование списка задач.
File sapfor_drv = new File(Global.Home, scenario_json.sapfor_drv); File sapfor_drv = new File(Global.Home, scenario_json.sapfor_drv);
@@ -49,10 +49,14 @@ public class SapforTestingPlanner extends ThreadsPlanner {
@Override @Override
protected void finalize() { protected void finalize() {
results_json.EndDate = new Date().getTime(); results_json.EndDate = new Date().getTime();
System.out.println("Запись результатов");
//записать результаты всех задач. //записать результаты всех задач.
try { try {
Utils.jsonToFile(results_json, new File(Global.Home, "results.txt")); System.out.println("Запись результатов");
Utils.jsonToFile(results_json, new File(Global.Home, "results"));
// System.out.println("Очистка служебных файлов"); очистку проводить извне чтобы удалялись джарники и ехе
//тут же и строить версии.
//Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "txt", "bat", "sh", "exe", "jar");
System.out.println("Нажмите любую клавишу для выхода..."); System.out.println("Нажмите любую клавишу для выхода...");
System.in.read(); System.in.read();
} catch (Exception e) { } catch (Exception e) {

2
src/Visual_DVM_2021/Passes/All/StartSapforTests.java
View File

@@ -233,7 +233,7 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
//---- //----
Utils.jsonToFile(properties, new File(target.workspace, "properties")); Utils.jsonToFile(properties, new File(target.workspace, "properties"));
//---- //----
File scenarioFile = new File(target.workspace, "scenario.txt"); File scenarioFile = new File(target.workspace, "scenario");
SapforScenario_json scenario_json = new SapforScenario_json(); SapforScenario_json scenario_json = new SapforScenario_json();
scenario_json.sapfor_drv = sapfor.getName(); scenario_json.sapfor_drv = sapfor.getName();
scenario_json.tests.addAll(allTests.keySet()); scenario_json.tests.addAll(allTests.keySet());