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

процесс рефакторинга. Так как нужно запускать тесты на многих флагах, понадобилось внести дополнительные объекты.

Browse Source
This commit is contained in:
02090095
2023-09-27 00:43:23 +03:00
parent 0026701347
commit 42338700f4
25 changed files with 297 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SapforTestingSystem/Json/ScenarioResults_json.java
View File

@@ -1,10 +1,10 @@
package SapforTestingSystem.Json;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import com.google.gson.annotations.Expose;
import java.util.List;
import java.util.Vector;
public class ScenarioResults_json {
@Expose
public List<SapforTask_2023> tasks = new Vector<>();
public List<SapforTask> tasks = new Vector<>();
}

23
src/SapforTestingSystem/SapforScenario/SapforScenario.java Normal file
View File

@@ -0,0 +1,23 @@
package SapforTestingSystem.SapforScenario;
import Common.Current;
import Common.Database.iDBObject;
import TestingSystem.TasksPackage.TasksPackageState;
import com.sun.org.glassfish.gmbal.Description;
public class SapforScenario extends iDBObject {
@Description("DEFAULT ''")
public String passesNames = ""; //имена преобразований через ;
@Description("DEFAULT ''")
public String testsNames = "";//имена тестов через ;
//---
public String sapfor_version = "?";
//---
public String workspace = "";
//---
public int tasksCount = 0;
//---
public double Time; //время выполнения.
public long StartDate = 0; //дата начала выполнения
public long ChangeDate = 0;//дата окончания выполнения
//-
public TasksPackageState state = TasksPackageState.Queued;
}

89
src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java Normal file
View File

@@ -0,0 +1,89 @@
package SapforTestingSystem.SapforScenario;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTask.SapforTask;
import java.util.Date;
import java.util.LinkedHashMap;
import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class SapforScenariosDBTable extends iDBTable<SapforScenario> {
public SapforScenariosDBTable() {
super(SapforScenario.class);
}
@Override
public Current CurrentName() {
return Current.SapforScenario;
}
@Override
public String getSingleDescription() {
return "сценарий Sapfor";
}
@Override
public String getPluralDescription() {
return "сценарии Sapfor";
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(5).setRenderer(RendererDate);
columns.get(6).setRenderer(RendererDate);
columns.get(7).setRenderer(RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
// UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
// UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
};
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"SAPFOR",
"Проходы",
"Тесты",
"Задач",
"Начало",
"Изменено",
"Статус"
};
}
@Override
public Object getFieldAt(SapforScenario object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.sapfor_version;
case 2:
return object.passesNames;
case 3:
return object.testsNames;
case 4:
return object.tasksCount;
case 5:
return new Date(object.StartDate);
case 6:
return new Date(object.ChangeDate);
case 7:
return object.state;
default:
return null;
}
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
}

8
src/SapforTestingSystem/SapforTask/SapforTask_2023.java → src/SapforTestingSystem/SapforTask/SapforTask.java
View File

@@ -7,7 +7,7 @@ import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector;
public class SapforTask_2023 extends DBObject {
public class SapforTask extends DBObject {
//------------------------------------>>
@Description("PRIMARY KEY, UNIQUE")
@Expose
@@ -34,9 +34,9 @@ public class SapforTask_2023 extends DBObject {
@Expose
public int versions_tree_built = 0;
//-----------
public SapforTask_2023() {
public SapforTask() {
}
public SapforTask_2023(SapforTask_2023 src) {
public SapforTask(SapforTask src) {
this.SynchronizeFields(src);
}
@Override
@@ -46,7 +46,7 @@ public class SapforTask_2023 extends DBObject {
@Override
public void SynchronizeFields(DBObject object) {
super.SynchronizeFields(object);
SapforTask_2023 t = (SapforTask_2023) object;
SapforTask t = (SapforTask) object;
id = t.id;
sapfortaskspackage_2023_id = t.sapfortaskspackage_2023_id;
test_description = t.test_description;

8
src/SapforTestingSystem/SapforTask/SapforTaskResult.java
View File

@@ -1,15 +1,15 @@
package SapforTestingSystem.SapforTask;
import Common.Database.DBObject;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
public class SapforTaskResult extends DBObject {
public SapforTasksPackage_2023 sapforTasksPackage;
public SapforTask_2023 task;
public SapforTasksPackage sapforTasksPackage;
public SapforTask task;
public MatchState match_state = MatchState.Unknown;
@Override
public Object getPK() {
return task.test_description;
}
public SapforTaskResult(SapforTasksPackage_2023 package_in, SapforTask_2023 task_in) {
public SapforTaskResult(SapforTasksPackage package_in, SapforTask task_in) {
sapforTasksPackage = package_in;
task = task_in;
}

6
src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
View File

@@ -6,9 +6,9 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class SapforTasksDBTable extends DBTable<Long, SapforTask_2023> {
public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
public SapforTasksDBTable() {
super(Long.class, SapforTask_2023.class);
super(Long.class, SapforTask.class);
}
@Override
public String getSingleDescription() {
@@ -43,7 +43,7 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask_2023> {
};
}
@Override
public Object getFieldAt(SapforTask_2023 object, int columnIndex) {
public Object getFieldAt(SapforTask object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.test_description;

43
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java → src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
View File

@@ -1,15 +1,16 @@
package SapforTestingSystem.SapforTasksPackage;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.iDBObject;
import Common.Utils.Utils;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector;
public class SapforTasksPackage_2023 extends iDBObject {
public String summary = "";
public class SapforTasksPackage extends iDBObject {
public int sapforscenario_id = Utils.Nan;
//----
public int FREE_FORM = 0; //"Свободный выходной стиль"; -f90
public int STATIC_SHADOW_ANALYSIS = 0;//"Оптимизация теневых обменов"; -sh
@@ -20,39 +21,15 @@ public class SapforTasksPackage_2023 extends iDBObject {
//---
@Description("DEFAULT ''")
public String flags = "";
@Description("DEFAULT ''")
public String passesNames = ""; //имена преобразований через ;
@Description("DEFAULT ''")
public String testsNames = "";//имена тестов через ;
//---
public String sapfor_version = "?";
//---
public String workspace = "";
//---
public int tasksCount = 0;
@Description("DEFAULT 0")
public int versions_tree_built = 0;
//---
public double Time; //время выполнения.
public long StartDate = 0; //дата начала выполнения
public long ChangeDate = 0;//дата окончания выполнения
@Description("DEFAULT ''")
public String sapforconfiguration_id = "";
//-
public TasksPackageState state = TasksPackageState.Queued;
//--
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
SapforTasksPackage_2023 tasksPackage = (SapforTasksPackage_2023) src;
summary = tasksPackage.summary;
sapfor_version = tasksPackage.sapfor_version;
tasksCount = tasksPackage.tasksCount;
Time = tasksPackage.Time;
StartDate = tasksPackage.StartDate;
ChangeDate = tasksPackage.ChangeDate;
state = tasksPackage.state;
workspace = tasksPackage.workspace;
SapforTasksPackage tasksPackage = (SapforTasksPackage) src;
//---
flags = tasksPackage.flags;
//---
@@ -63,17 +40,21 @@ public class SapforTasksPackage_2023 extends iDBObject {
KEEP_SPF_DIRECTIVES = tasksPackage.KEEP_SPF_DIRECTIVES;
KEEP_DVM_DIRECTIVES = tasksPackage.KEEP_DVM_DIRECTIVES;
}
public SapforTasksPackage_2023(SapforTasksPackage_2023 src) {
public SapforTasksPackage(SapforTasksPackage src) {
this.SynchronizeFields(src);
}
public SapforTasksPackage_2023() {
public SapforTasksPackage() {
}
//----
@Description("IGNORE")
public Vector<Test> tests = null;
@Description("IGNORE")
public Vector<PassCode_2021> codes = null;
public SapforTasksPackage_2023(SapforConfiguration configuration_in, Vector<Test> tests_in) {
public SapforTasksPackage(SapforConfiguration configuration_in, Vector<Test> tests_in) {
}
@Override
public boolean isVisible() {
return Current.HasSapforScenario() && Current.getSapforScenario().id == sapforscenario_id;
}
}

44
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
View File

@@ -2,16 +2,12 @@ package SapforTestingSystem.SapforTasksPackage;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTask.SapforTask;
import java.util.Date;
import java.util.LinkedHashMap;
import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage_2023> {
public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage> {
public SapforTasksPackagesDBTable() {
super(SapforTasksPackage_2023.class);
super(SapforTasksPackage.class);
}
@Override
public Current CurrentName() {
@@ -28,12 +24,6 @@ public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage_2023
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(7).setRenderer(RendererDate);
columns.get(8).setRenderer(RendererDate);
columns.get(9).setRenderer(RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
@@ -53,44 +43,22 @@ public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage_2023
@Override
public String[] getUIColumnNames() {
return new String[]{
"SAPFOR",
"Флаги",
"Проходы",
"Тесты",
"Задач",
"Начало",
"Изменено",
"Статус"
};
}
@Override
public Object getFieldAt(SapforTasksPackage_2023 object, int columnIndex) {
public Object getFieldAt(SapforTasksPackage object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.sapfor_version;
case 3:
case 1:
return object.flags;
case 4:
return object.passesNames;
case 5:
return object.testsNames;
case 6:
return object.tasksCount;
case 7:
return new Date(object.StartDate);
case 8:
return new Date(object.ChangeDate);
case 9:
return object.state;
default:
return null;
}
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforTask_2023.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
res.put(SapforTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
}