улучшение описания пакетов

This commit is contained in:
2024-10-03 16:21:11 +03:00
parent 76b6a36de6
commit 4ad0a32238
12 changed files with 88 additions and 44 deletions

View File

@@ -114,5 +114,9 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
return (!DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
(!DVMPackageDBTable.filterActive || state.isActive());
}
@Override
public void checkFinishState() throws Exception {
}
}

View File

@@ -55,6 +55,10 @@ public class LocalDVMTestingPlanner extends DVMTestingPlanner {
return true;
}
@Override
public String packageDescription() {
return "DVM";
}
@Override
protected void TestsSynchronize() throws Exception {
testingPackage.readJson();
LinkedHashMap<Integer, File> tests = getTestsFromJson();

View File

@@ -104,6 +104,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
//--
int ct_count = 0;
int rt_count = 0;
int good=0;
//--
for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
compilationTask.dvm_package_id = testingPackage.id;
@@ -154,13 +155,18 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
}
if (!runTask.state.equals(TaskState.Done))
hasErrors = true;
else good++;
}
}
}
testingPackage.progress = 100;
testingPackage.saveJson(); //запись обновленных результатов пакета в json!
Print("analysis done, ct_count=" + ct_count + " rt count=" + rt_count);
UpdatePackageState(hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done);
testingPackage.state = hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
double percent = ( ((double)(good))/testingPackage.tasksCount)*100.0;
testingPackage.description = "Выполнено на "+((int)percent)+"%\n"+
"Всего задач: "+testingPackage.tasksCount+", из них с ошибками "+(testingPackage.tasksCount-good);
UpdatePackageState();
}
@Override
protected void PackageStart() throws Exception {
@@ -263,4 +269,8 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
}
return true;
}
@Override
public String packageDescription() {
return "DVM";
}
}