механизм назначения пакета-эталона для текущей конфигурации тестирования сапфор.сравнение с эталоном пока не реализовано!

This commit is contained in:
2024-11-14 22:06:49 +03:00
parent 62e734f725
commit cd0bae2620
9 changed files with 77 additions and 16 deletions

View File

@@ -1,4 +1,5 @@
package _VisualDVM.TestingSystem.Common.Configuration;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.TextLog;
@@ -32,10 +33,13 @@ public class Configuration extends riDBObject {
public String packedTestsJson = "";
@Description("DEFAULT ''")
public String packedSettingsJson = "";
@Description("DEFAULT -1")
public int ethalon_id = CommonConstants.Nan; //пакет-эталон
//----
public String printAuto() {
return autoTesting > 0 ? "Да" : "Нет";
}
public String printEthalon(){return (ethalon_id == CommonConstants.Nan) ? "" : String.valueOf(ethalon_id);}
public void SwitchAuto() {
autoTesting = (autoTesting == 0) ? 1 : 0;
}
@@ -58,6 +62,7 @@ public class Configuration extends riDBObject {
super.SynchronizeFields(src);
Configuration c = (Configuration) src;
//--
ethalon_id=c.ethalon_id;
maxtime = c.maxtime;
autoTesting = c.autoTesting;
kernels = c.kernels;

View File

@@ -1,4 +1,5 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.CommonConstants;
import Common.Utils.TextLog;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
@@ -6,6 +7,7 @@ import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector;
public class SapforConfiguration extends Configuration {

View File

@@ -1,4 +1,5 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI;
import Common.CommonConstants;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
@@ -90,6 +91,12 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
public Object getFieldAt(SapforConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).getTestsCount();
}
},
new ColumnInfo<SapforConfiguration>("эталон") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return object.printEthalon();
}
}
);
}

View File

@@ -113,7 +113,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackages);
addPasses(PassCode.SetSapforConfigurationEthalon,PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
}