упорядочил папки с кодом.
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
package Repository.TestingSystem.SAPFOR.SapforTask;
|
||||
import Common.Current;
|
||||
import Common.UI.StatusEnum;
|
||||
import Common.UI.Themes.VisualiserFonts;
|
||||
|
||||
import java.awt.*;
|
||||
public enum MatchState implements StatusEnum {
|
||||
Unknown,
|
||||
NotMatch,
|
||||
Match;
|
||||
public String getDescription() {
|
||||
switch (this) {
|
||||
case Unknown:
|
||||
return "неизвестно";
|
||||
case Match:
|
||||
return "совпадений";
|
||||
case NotMatch:
|
||||
return "различий";
|
||||
default:
|
||||
return "?";
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public Font getFont() {
|
||||
switch (this) {
|
||||
case Unknown:
|
||||
return Current.getTheme().Fonts.get(VisualiserFonts.UnknownState);
|
||||
case Match:
|
||||
return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
|
||||
case NotMatch:
|
||||
return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
|
||||
default:
|
||||
return StatusEnum.super.getFont();
|
||||
}
|
||||
}
|
||||
}
|
||||
196
src/Repository/TestingSystem/SAPFOR/SapforTask/SapforTask.java
Normal file
196
src/Repository/TestingSystem/SAPFOR/SapforTask/SapforTask.java
Normal file
@@ -0,0 +1,196 @@
|
||||
package Repository.TestingSystem.SAPFOR.SapforTask;
|
||||
import Common.Constants;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Utils.Utils;
|
||||
import GlobalData.Tasks.TaskState;
|
||||
import Repository.TestingSystem.SAPFOR.Json.SapforVersion_json;
|
||||
import Repository.TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionSummary;
|
||||
import Common.Passes.PassCode_2021;
|
||||
import com.google.gson.annotations.Expose;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
import javax.swing.tree.DefaultMutableTreeNode;
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Vector;
|
||||
public class SapforTask extends DBObject {
|
||||
//------------------------------------>>
|
||||
@Description("PRIMARY KEY, UNIQUE")
|
||||
@Expose
|
||||
public long id = Constants.Nan;
|
||||
@Description("DEFAULT '-1'")
|
||||
@Expose
|
||||
public int sapfor_configuration_id = Constants.Nan;
|
||||
@Expose
|
||||
@Description("DEFAULT '-1'")
|
||||
public int sapfortaskspackage_id = Constants.Nan;
|
||||
//------------------------------------->>
|
||||
@Description("DEFAULT ''")
|
||||
@Expose
|
||||
public String test_description = "";
|
||||
@Description("DEFAULT ''")
|
||||
@Expose
|
||||
public String group_description = "";
|
||||
@Description("DEFAULT ''")
|
||||
@Expose
|
||||
public String flags = "";
|
||||
@Description("DEFAULT ''")
|
||||
@Expose
|
||||
public String codes = "";
|
||||
@Expose
|
||||
public TaskState state = TaskState.Inactive;
|
||||
@Expose
|
||||
public long StartDate = 0; //дата начала выполнения
|
||||
@Expose
|
||||
public long ChangeDate = 0;//дата окончания выполнения
|
||||
//в json не выносить. это только для БД.
|
||||
@Description("DEFAULT ''")
|
||||
public String versionsDescription = "";
|
||||
//------
|
||||
@Description("IGNORE")
|
||||
@Expose
|
||||
public Vector<SapforVersion_json> versions = new Vector<>();
|
||||
//----------
|
||||
@Description("IGNORE")
|
||||
@Expose
|
||||
public Vector<SapforVersion_json> variants = new Vector<>();
|
||||
//----------
|
||||
@Description("IGNORE")
|
||||
public MatchState match = MatchState.Unknown;
|
||||
//-----------
|
||||
public String getUniqueKey() {
|
||||
return sapfor_configuration_id + "_" + group_description + "_" + test_description;
|
||||
}
|
||||
public String getSummary() {
|
||||
Vector<String> lines = new Vector<>();
|
||||
lines.add(group_description);
|
||||
lines.add(test_description);
|
||||
lines.add(codes);
|
||||
lines.add(flags);
|
||||
return String.join(" ", lines);
|
||||
}
|
||||
//-----------
|
||||
public SapforTask() {
|
||||
}
|
||||
public DefaultMutableTreeNode getVersionsTree(File configurationRoot) {
|
||||
DefaultMutableTreeNode root = null;
|
||||
DefaultMutableTreeNode child = null;
|
||||
DefaultMutableTreeNode parent = null;
|
||||
//--
|
||||
for (SapforVersion_json version_json : versions) {
|
||||
version_json.init(configurationRoot);
|
||||
version_json.task = this;
|
||||
//-
|
||||
child = new VersionSummary(version_json);
|
||||
if (parent == null) {
|
||||
root = child;
|
||||
parent = child;
|
||||
} else {
|
||||
parent.add(child);
|
||||
parent = child;
|
||||
}
|
||||
//-
|
||||
}
|
||||
if (parent != null) {
|
||||
for (SapforVersion_json version_json : variants) {
|
||||
version_json.init(configurationRoot);
|
||||
version_json.task = this;
|
||||
parent.add(new VersionSummary(version_json));
|
||||
}
|
||||
}
|
||||
//--
|
||||
return root;
|
||||
}
|
||||
public void Reset() {
|
||||
state = TaskState.Inactive;
|
||||
versions.clear();
|
||||
variants.clear();
|
||||
}
|
||||
public SapforTask(SapforTask src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
@Override
|
||||
public Object getPK() {
|
||||
return id;
|
||||
}
|
||||
@Override
|
||||
public void SynchronizeFields(DBObject object) {
|
||||
super.SynchronizeFields(object);
|
||||
SapforTask t = (SapforTask) object;
|
||||
id = t.id;
|
||||
sapfor_configuration_id = t.sapfor_configuration_id;
|
||||
sapfortaskspackage_id = t.sapfortaskspackage_id;
|
||||
//-
|
||||
test_description = t.test_description;
|
||||
group_description = t.group_description;
|
||||
versionsDescription = t.versionsDescription;
|
||||
//--
|
||||
codes = t.codes;
|
||||
state = t.state;
|
||||
//--
|
||||
}
|
||||
public String getVersionsChain() {
|
||||
Vector<String> versionsLines = new Vector<>();
|
||||
for (int i = 1; i < versions.size(); ++i) {
|
||||
versionsLines.add(Utils.Brackets(versions.get(i).description));
|
||||
}
|
||||
if (!variants.isEmpty()) {
|
||||
versionsLines.add(Utils.Brackets(PassCode_2021.CreateParallelVariants.getDescription()));
|
||||
}
|
||||
return String.join("→", versionsLines);
|
||||
}
|
||||
@Override
|
||||
public boolean isVisible() {
|
||||
return Current.HasSapforTasksPackage() && Current.getSapforTasksPackage().id == this.sapfortaskspackage_id;
|
||||
}
|
||||
public LinkedHashMap<String, SapforVersion_json> getSortedVersions() {
|
||||
LinkedHashMap<String, SapforVersion_json> res = new LinkedHashMap<>();
|
||||
for (SapforVersion_json version_json : versions)
|
||||
res.put(version_json.version, version_json);
|
||||
//--
|
||||
for (SapforVersion_json version_json : variants)
|
||||
res.put(version_json.version, version_json);
|
||||
return res;
|
||||
}
|
||||
public void checkMatch(SapforTask task2) {
|
||||
if (!state.equals(task2.state)) {
|
||||
System.out.println("Не совпадение цепочки версий в задаче " + getUniqueKey());
|
||||
} else if (versions.size() != task2.versions.size()) {
|
||||
System.out.println("Не совпадение длины цепочки версий в задаче " + getUniqueKey());
|
||||
} else if (variants.size() != task2.variants.size()) {
|
||||
System.out.println("Не совпадение длины цепочки вариантов в задаче " + getUniqueKey());
|
||||
} else {
|
||||
LinkedHashMap<String, SapforVersion_json> versions1 = getSortedVersions();
|
||||
LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
|
||||
//---
|
||||
for (String name1 : versions1.keySet()) {
|
||||
if (!versions2.containsKey(name1)) {
|
||||
System.out.println("Не совпадение имен версий в задаче " + getUniqueKey());
|
||||
return;
|
||||
}
|
||||
}
|
||||
System.out.println("сравнение версий.");
|
||||
//--
|
||||
for (String name1 : versions1.keySet()) {
|
||||
System.out.println("version name=" + name1);
|
||||
SapforVersion_json version1 = versions1.get(name1);
|
||||
SapforVersion_json version2 = versions2.get(name1);
|
||||
//---
|
||||
if (!version1.isMatch(version2)) {
|
||||
System.out.println("Не совпадение версий в задаче " + getUniqueKey());
|
||||
return;
|
||||
}
|
||||
}
|
||||
match = MatchState.Match;
|
||||
task2.match = MatchState.Match;
|
||||
}
|
||||
}
|
||||
public Date getStartDate() {
|
||||
return new Date(StartDate);
|
||||
}
|
||||
public Date getChangeDate() {
|
||||
return new Date(ChangeDate);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package Repository.TestingSystem.SAPFOR.SapforTask;
|
||||
import Common.Current;
|
||||
import Common.Database.DBTable;
|
||||
import Common.UI.DataSetControlForm;
|
||||
|
||||
import static Common.UI.Tables.TableRenderers.RendererDate;
|
||||
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
|
||||
public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
|
||||
public SapforTasksDBTable() {
|
||||
super(Long.class, SapforTask.class);
|
||||
}
|
||||
@Override
|
||||
public String getSingleDescription() {
|
||||
return "задача";
|
||||
}
|
||||
@Override
|
||||
public String getPluralDescription() {
|
||||
return "задачи";
|
||||
}
|
||||
@Override
|
||||
public Current CurrentName() {
|
||||
return Current.SapforTask;
|
||||
}
|
||||
@Override
|
||||
protected DataSetControlForm createUI() {
|
||||
return new DataSetControlForm(this) {
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
columns.get(4).setRenderer(RendererStatusEnum);
|
||||
columns.get(5).setRenderer(RendererDate);
|
||||
columns.get(6).setRenderer(RendererDate);
|
||||
}
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public String[] getUIColumnNames() {
|
||||
return new String[]{
|
||||
"Группа",
|
||||
"Тест",
|
||||
"Флаги",
|
||||
"Статус",
|
||||
"Начало",
|
||||
"Окончание",
|
||||
"Версии"
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(SapforTask object, int columnIndex) {
|
||||
switch (columnIndex) {
|
||||
case 1:
|
||||
return object.group_description;
|
||||
case 2:
|
||||
return object.test_description;
|
||||
case 3:
|
||||
return object.flags;
|
||||
case 4:
|
||||
return object.state;
|
||||
case 5:
|
||||
return object.getStartDate();
|
||||
case 6:
|
||||
return object.getChangeDate();
|
||||
case 7:
|
||||
return object.versionsDescription;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user