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

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

Browse Source
This commit is contained in:
02090095
2024-11-14 22:06:49 +03:00
parent 62e734f725
commit cd0bae2620
9 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/workspace.xml generated
View File

@@ -7,16 +7,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

1
src/_VisualDVM/Passes/All/EditSapforConfiguration.java
View File

@@ -3,6 +3,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.Server.EditServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
public class EditSapforConfiguration extends EditServerObject<TestingServer, SapforConfiguration> {
public EditSapforConfiguration() {
super(Global.testingServer, SapforConfiguration.class);

40
src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java Normal file
View File

@@ -0,0 +1,40 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
public class SetSapforConfigurationEthalon extends EditSapforConfiguration {
@Override
public String getIconPath() {
return "/icons/Back.png";
}
@Override
public String getDescription_() {
return "Назначить пакет эталоном для конфигурации";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (getDb().CheckCurrent(Log, d, SapforPackage.class)) {
target = getDb().getTable(d).getUI().getCurrent();
SapforPackage sapforPackage = getDb().getTable(SapforPackage.class).getUI().getCurrent();
//-
PackageCache cache = (PackageCache) VisualCaches.GetCache(sapforPackage);
if (cache.configurationsJson.array.size() != 1) {
Log.Writeln_("В текущем пакете присутствует несколько конфигураций!");
return false;
}
ConfigurationJson configurationJson = cache.configurationsJson.array.get(0);
if (configurationJson.id != target.id) {
Log.Writeln_(
"Конфигурация пакета " + Utils_.Brackets(configurationJson.description) +
"\nне совпадает с текущей конфигурацией " + Utils_.Brackets(target.description) + "!");
return false;
}
//-
target.ethalon_id = sapforPackage.id;
return true;
}
return false;
}
}

13
src/_VisualDVM/Passes/PassCode.java
View File

@@ -349,19 +349,22 @@ public enum PassCode implements PassCode_ {
EditDVMSettings,
DeleteDVMSettings,
CloneDVMSettings,
CloneSapforSettings;
CloneSapforSettings,
SetSapforConfigurationEthalon
;
//--
//--
@Override
public String getDescription() {
switch (this) {
case StartSelectedSAPFORConfigurations:
return "Запустить отмеченные конфигурации тестирования SAPFOR";
return "Запустить отмеченные конфигурации";
case ShowCurrentSAPFORConfigurationTests:
return "Отметить группы и тесты, участвующие в текущей конфигурации SAPFOR";
return "Отметить группы и тесты, участвующие в текущей конфигурации";
case StartSelectedDVMConfigurations:
return "Запустить отмеченные конфигурации тестирования DVM";
return "Запустить отмеченные конфигурации";
case ShowCurrentDVMConfigurationTests:
return "Отметить группы и тесты, участвующие в текущей конфигурации DVM";
return "Отметить группы и тесты, участвующие в текущей конфигурации";
case GetOldBugReports:
return "Получить неиспользуемые баг репорты";
case SPF_RenameIncludes:

6
src/_VisualDVM/Passes/Server/EditServerObject.java
View File

@@ -17,9 +17,13 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
}
//--
@Override
public boolean fillObjectFields() throws Exception {
return getDb().getTable(d).getUI().ShowEditObjectDialog(target);
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().getTable(d).getUI().getCurrent();
return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).getUI().ShowEditObjectDialog(target);
return getDb().getTable(d).getUI().CheckCurrent(Log) && fillObjectFields();
}
//--
@Override

5
src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
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;

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
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 {

7
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
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();
}
}
);
}

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
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);
}