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-19 17:37:34 +03:00
parent 54d86d6e4d
commit 25cd097445
12 changed files with 379 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -4,32 +4,47 @@ import Common.Current;
import Common.Database.DBObject;
import Common.Global;
import Common.Utils.Utils;
import TestingSystem.Common.Group.GroupsDBTable;
import GlobalData.Account.Account;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.SAPFOR.Json.SapforPackage_json;
import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import com.sun.org.glassfish.gmbal.Description;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import java.io.File;
import java.util.Vector;
public class SapforPackage extends TestingPackage<SapforPackage_json> {
@Description("DEFAULT ''")
public String testsNames = "";//имена тестов через ; для отображения
@Description("DEFAULT ''")
public String configurationsNames="";//имена конфигураций для отображения.
//---
public int sapforId = Constants.Nan; // так как сапфор на машине.
public SapforPackage() {
}
public SapforPackage(SapforPackage sapforPackage) {
SynchronizeFields(sapforPackage);
}
public SapforPackage(Account account, ServerSapfor serverSapfor) {
id = Constants.Nan;
//-
sender_name = account.name;
sender_address = account.email;
//-
sapforId = serverSapfor.id;
//-
drv = serverSapfor.call_command;
version = serverSapfor.version;
kernels = Global.properties.TestingKernels;
needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
///-------------------------------
package_json = new SapforPackage_json();
package_json.kernels = kernels;
package_json.sapfor_drv = serverSapfor.call_command;
//-
state = TasksPackageState.Queued;
//-
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
SapforPackage p = (SapforPackage) src;
testsNames = p.testsNames;
sapforId = p.sapforId;
}
@Override
@@ -49,7 +64,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
package_json = null; // объект больше не нужен.
}
//-проверка, какие задачи из набора, не пересекаются с уже имеющимися в пакете.
public Vector<SapforTask> getActualTestingSetTasks(SapforTestingSet_json testingSet){
public Vector<SapforTask> getActualTestingSetTasks(SapforTestingSet_json testingSet) {
Vector<SapforTask> possible_tasks = testingSet.createTasks();
Vector<String> keys = package_json.getTasksKeys();
Vector<SapforTask> new_tasks = new Vector<>();
@@ -65,8 +80,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
}
@Override
public boolean isVisible() {
return (!SapforPackageDBTable.filterMyOnly ||Current.getAccount().email.equals(sender_address)) &&
(!SapforPackageDBTable.filterActive || state.isActive() )
return (!SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
(!SapforPackageDBTable.filterActive || state.isActive())
;
}
}