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

промежуточный. выкинул старые объекты и функционал. Осталось восстановить эксель, и отображение пакетов Сапфор

Browse Source
This commit is contained in:
02090095
2023-12-16 16:52:17 +03:00
parent 94ff786ed6
commit 0c513cec5e
57 changed files with 276 additions and 3460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
View File

@@ -6,8 +6,8 @@ import Common.Utils.Files.VDirectoryChooser;
import Common.Utils.Index;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
@@ -22,7 +22,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.util.LinkedHashMap;
import java.util.Vector;
public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
public class ExportTasksPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
//https://tproger.ru/translations/how-to-read-write-excel-file-java-poi-example
File dir;
File res;
@@ -37,7 +37,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
int total_tasks_count = 0;
long total_time = 0;
//--
LinkedHashMap<Long, Vector<TestRunTask>> packages_tasks = null;
LinkedHashMap<Integer, Vector<DVMRunTask>> packages_tasks = null;
//--
@Override
public String getIconPath() {
@@ -59,24 +59,26 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
packages_tasks = new LinkedHashMap<>();
target = null;
//--
if (Global.testingServer.account_db.packages.getCheckedCount() > 0) {
target = Global.testingServer.account_db.packages.getCheckedItems();
if (Global.testingServer.db.dvmPackages.getCheckedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getCheckedItems();
} else {
if (Current.Check(Log, Current.TasksPackage)) {
if (Current.Check(Log, Current.DVMPackage)) {
target = new Vector<>();
target.add(Current.getTasksPackage());
target.add(Current.getDVMPackage());
} else return false;
}
for (TasksPackage tasksPackage : target) {
if (!tasksPackage.state.equals(TasksPackageState.Done)) {
Log.Writeln_("Пакет " + tasksPackage.id + " не завершен.");
for (DVMPackage dvmPackage : target) {
if (!dvmPackage.state.equals(TasksPackageState.Done)) {
Log.Writeln_("Пакет " + dvmPackage.id + " не завершен.");
} else {
Vector<TestRunTask> tasks = new Vector<>();
for (TestRunTask task : Global.testingServer.account_db.testRunTasks.Data.values()) {
if (task.taskspackage_id == tasksPackage.id)
Vector<DVMRunTask> tasks = new Vector<>();
/* todo Загрузить и распаковать все выделенные пакеты
for (DVMRunTask task : Global.testingServer.db.testRunTasks.Data.values()) {
if (task.taskspackage_id == dvmPackage.id)
tasks.add(task);
}
packages_tasks.put(tasksPackage.id, tasks);
*/
packages_tasks.put(dvmPackage.id, tasks);
}
}
if (!Log.isEmpty())
@@ -90,17 +92,17 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
return true;
}
//---
String getPackageInfo(TasksPackage object) {
String getPackageInfo(DVMPackage object) {
Vector<String> lines = new Vector<>();
lines.add("задач " + object.runTasksCount);
lines.add("задач " + object.tasksCount);
lines.add("машина " + object.machine_address + ":" + object.machine_port);
lines.add("ядер " + object.kernels);
lines.add("DVM-система " + object.dvm_version);
lines.add("DVM-система " + object.version);
//--
total_tasks_count+=object.runTasksCount;
total_tasks_count += object.tasksCount;
//--
long milliseconds = object.ChangeDate - object.StartDate;
total_time+= milliseconds;
total_time += milliseconds;
//--
lines.add("время выполнения " + Utils.printSplittedDateInterval(milliseconds));
return String.join("; ", lines);
@@ -300,9 +302,9 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
styles.add(style);
}
}
void exportPackageTasks(TasksPackage tasksPackage, Index offset) {
Vector<TestRunTask> tasks = packages_tasks.get(tasksPackage.id);
for (TestRunTask task : tasks) {
void exportPackageTasks(DVMPackage dvmPackage, Index offset) {
Vector<DVMRunTask> tasks = packages_tasks.get(dvmPackage.id);
for (DVMRunTask task : tasks) {
ShowMessage2(task.test_description);
//---
Integer NUM_THREADS = extractIntegerEnvironmentValue(task.environments, "DVMH_NUM_THREADS");
@@ -345,12 +347,12 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
createStyles();
//--
Index offset = new Index();
for (TasksPackage tasksPackage : target) {
addInfoRow(offset.getValue(), getPackageInfo(tasksPackage));
for (DVMPackage dvmPackage : target) {
addInfoRow(offset.getValue(), getPackageInfo(dvmPackage));
offset.Inc();
}
if (target.size()>1){
addInfoRow(offset.getValue(), "всего задач "+total_tasks_count+"; общее время выполнения "+Utils.printSplittedDateInterval(total_time));
if (target.size() > 1) {
addInfoRow(offset.getValue(), "всего задач " + total_tasks_count + "; общее время выполнения " + Utils.printSplittedDateInterval(total_time));
offset.Inc();
}
addHeaderRow(offset.getValue(),
@@ -372,8 +374,8 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
"Прогресс (%)");
//--
offset.Inc();
for (TasksPackage tasksPackage : target) {
exportPackageTasks(tasksPackage, offset);
for (DVMPackage dvmPackage : target) {
exportPackageTasks(dvmPackage, offset);
}
//--
for (int i = 0; i < max_columns; ++i)