обновление конфигураций для тестирования сапфора. нужно будет еще проверить и рефакторить.
This commit is contained in:
@@ -9,7 +9,9 @@ public class SapforConfigurationsMenuBar extends DataMenuBar {
|
||||
PassCode_2021.EditSapforConfiguration,
|
||||
PassCode_2021.ShowCurrentSAPFORConfigurationTests,
|
||||
PassCode_2021.SaveCurrentSAPFORConfiguration,
|
||||
PassCode_2021.DeleteSapforConfiguration
|
||||
PassCode_2021.DeleteSapforConfiguration,
|
||||
|
||||
PassCode_2021.StartSelectedSAPFORConfigurations
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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())
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@ package TestingSystem.SAPFOR.SapforPackage;
|
||||
import Common.Current;
|
||||
import Common.Database.iDBTable;
|
||||
import Common.UI.DataSetControlForm;
|
||||
import Common.UI.VisualCache.ConfigurationCache;
|
||||
import Common.UI.VisualCache.PackageCache;
|
||||
import Common.UI.VisualCache.VisualCaches;
|
||||
import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
|
||||
|
||||
import javax.security.auth.login.CredentialNotFoundException;
|
||||
@@ -38,15 +41,11 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
||||
}
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
// columns.get(0).setVisible(false);
|
||||
columns.get(4).setVisible(false);
|
||||
// columns.get(5).setVisible(false);
|
||||
columns.get(5).setRenderer(RendererMultiline);
|
||||
columns.get(4).setMaxWidth(200);
|
||||
columns.get(8).setRenderer(RendererProgress);
|
||||
columns.get(4).setRenderer(RendererMultiline);
|
||||
columns.get(7).setRenderer(RendererProgress);
|
||||
columns.get(8).setRenderer(RendererDate);
|
||||
columns.get(9).setRenderer(RendererDate);
|
||||
columns.get(10).setRenderer(RendererDate);
|
||||
columns.get(11).setRenderer(RendererStatusEnum);
|
||||
columns.get(10).setRenderer(RendererStatusEnum);
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -55,7 +54,6 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
||||
return new String[]{
|
||||
"Автор",
|
||||
"SAPFOR",
|
||||
"Тесты",
|
||||
"Конфигурации",
|
||||
"Задач",
|
||||
"Ядер",
|
||||
@@ -65,32 +63,27 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
||||
"Статус"
|
||||
};
|
||||
}
|
||||
public static Vector<String> getConfigurationsNames(SapforPackage object){
|
||||
String[] data = object.configurationsNames.split(";");
|
||||
return new Vector<String>(Arrays.asList(data));
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(SapforPackage object, int columnIndex) {
|
||||
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return object.sender_name;
|
||||
case 3:
|
||||
return object.version;
|
||||
case 4:
|
||||
return object.testsNames;
|
||||
return cache.getConfigurationsDescriptions();
|
||||
case 5:
|
||||
return getConfigurationsNames(object);//object.configurationsNames;
|
||||
case 6:
|
||||
return object.tasksCount;
|
||||
case 7:
|
||||
case 6:
|
||||
return object.kernels;
|
||||
case 8:
|
||||
case 7:
|
||||
return object.progress;
|
||||
case 9:
|
||||
case 8:
|
||||
return new Date(object.StartDate);
|
||||
case 10:
|
||||
case 9:
|
||||
return new Date(object.ChangeDate);
|
||||
case 11:
|
||||
case 10:
|
||||
return object.state;
|
||||
default:
|
||||
return null;
|
||||
|
||||
@@ -12,18 +12,11 @@ public class SapforPackagesBar extends DataMenuBar {
|
||||
super("пакеты задач SAPFOR");
|
||||
addPasses(PassCode_2021.SynchronizeTests);
|
||||
addSeparator();
|
||||
// addMenus(new AddSapforPackageMenu());
|
||||
addPasses(PassCode_2021.AddSapforPackage, PassCode_2021.AddTasksToSapforPackage);
|
||||
addSeparator();
|
||||
addPasses(PassCode_2021.CloneSapforPackage);
|
||||
addPasses(PassCode_2021.DeleteSapforPackage);
|
||||
addSeparator();
|
||||
addPasses(
|
||||
PassCode_2021.StartSapforPackage,
|
||||
PassCode_2021.AbortSapforPackage
|
||||
);
|
||||
addPasses(PassCode_2021.AbortSapforPackage);
|
||||
addSeparator();
|
||||
addPasses(PassCode_2021.CompareSapforPackages);
|
||||
addSeparator();
|
||||
addPasses(PassCode_2021.DeleteSapforPackage);
|
||||
add(new JSeparator());
|
||||
add(new MenuBarButton() {
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user