diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a5704bae..48ef300b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,9 +8,10 @@ - - + + + diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java index 03c45853..7f688533 100644 --- a/src/Repository/Component/Visualiser.java +++ b/src/Repository/Component/Visualiser.java @@ -62,7 +62,7 @@ public class Visualiser extends Component { //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html @Override public void GetVersionInfo() { - version = 1074; + version = 1075; String pattern = "MMM dd yyyy HH:mm:ss"; DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); date_text = df.format(getClassBuildTime()); diff --git a/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java index 93d866bf..33b787de 100644 --- a/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java +++ b/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java @@ -10,6 +10,8 @@ public class SapforConfiguration_json implements Serializable { @Expose public int id = Constants.Nan; @Expose + public String name=""; + @Expose public String flags = ""; @Expose public List codes = new Vector<>(); diff --git a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java index eb6bb59b..baa49768 100644 --- a/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java +++ b/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java @@ -168,4 +168,20 @@ public class SapforPackage_json implements Serializable { } } } + public Vector getConfigurationsNames() { + Vector names = new Vector<>(); + for (SapforTestingSet_json set: testingSets){ + for (SapforConfiguration_json configurationJson: set.configurations){ + if (!names.contains(configurationJson.name)) + names.add(configurationJson.name); + } + } + names.sort(new Comparator() { + @Override + public int compare(String o1, String o2) { + return o1.compareTo(o2); + } + }); + return names; + } } diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java index 8d9410dc..b0d87d16 100644 --- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java +++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java @@ -14,6 +14,8 @@ import java.util.Vector; public class SapforPackage extends TestingPackage { @Description("DEFAULT ''") public String testsNames = "";//имена тестов через ; для отображения + @Description("DEFAULT ''") + public String configurationsNames="";//имена конфигураций для отображения. //--- public int sapforId = Constants.Nan; // так как сапфор на машине. public SapforPackage() { diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java index fef24793..c6124f46 100644 --- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java +++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java @@ -33,10 +33,10 @@ public class SapforPackageDBTable extends iDBTable { protected void AdditionalInitColumns() { // columns.get(0).setVisible(false); columns.get(4).setMaxWidth(200); - columns.get(7).setRenderer(RendererProgress); - columns.get(8).setRenderer(RendererDate); + columns.get(8).setRenderer(RendererProgress); columns.get(9).setRenderer(RendererDate); - columns.get(10).setRenderer(RendererStatusEnum); + columns.get(10).setRenderer(RendererDate); + columns.get(11).setRenderer(RendererStatusEnum); } }; } @@ -46,6 +46,7 @@ public class SapforPackageDBTable extends iDBTable { "Автор", "SAPFOR", "Тесты", + "Конфигурации", "Задач", "Ядер", "Прогресс", @@ -64,16 +65,18 @@ public class SapforPackageDBTable extends iDBTable { case 4: return object.testsNames; case 5: - return object.tasksCount; + return object.configurationsNames; case 6: - return object.kernels; + return object.tasksCount; case 7: - return object.progress; + return object.kernels; case 8: - return new Date(object.StartDate); + return object.progress; case 9: - return new Date(object.ChangeDate); + return new Date(object.StartDate); case 10: + return new Date(object.ChangeDate); + case 11: return object.state; default: return null; diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java index 07fba39d..ed53ed0d 100644 --- a/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java +++ b/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java @@ -228,6 +228,7 @@ public class AddTasksToSapforPackage extends Pass_2021 { //-- SapforConfiguration_json configuration_json = new SapforConfiguration_json(); configuration_json.id = configuration.id; + configuration_json.name=configuration.description; configuration_json.flags = configuration.getFlags(); Vector codes = configuration.getPassCodes(); //--- коррекцию кода нельзя вызвать если инклуды есть. в общем случае. @@ -260,6 +261,7 @@ public class AddTasksToSapforPackage extends Pass_2021 { } target.tasksCount += new_tasks.size(); target.testsNames = String.join(";", target.package_json.getTestsNames()); + target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames()); } @Override protected void showDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java index 95147c61..e7bda341 100644 --- a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java +++ b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java @@ -57,6 +57,7 @@ public class CloneSapforPackage extends AddObjectPass { SapforConfiguration_json configurationJson = new SapforConfiguration_json(); //-- configurationJson.id = configuration.id; + configurationJson.name = configuration.description; configurationJson.flags = src_configuration.flags; configurationJson.codes.addAll(src_configuration.codes); //-- @@ -153,7 +154,7 @@ public class CloneSapforPackage extends AddObjectPass { SapforTestingSet_json dst = cloneTestingSet(src); //-- Vector new_tasks = target.getActualTestingSetTasks(dst); - if (!new_tasks.isEmpty()){ + if (!new_tasks.isEmpty()) { target.package_json.testingSets.add(dst); target.package_json.tasks.addAll(new_tasks); } @@ -161,6 +162,7 @@ public class CloneSapforPackage extends AddObjectPass { } target.tasksCount = target.package_json.tasks.size(); target.testsNames = String.join(";", target.package_json.getTestsNames()); + target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames()); //-- for (String test_id : inexistingTests) { System.out.println("Тест " + test_id + " не найден!"); @@ -180,7 +182,7 @@ public class CloneSapforPackage extends AddObjectPass { protected void body() throws Exception { Global.testingServer.db.sapforPackages.Data.put(target.id, target); //-- - Utils.CheckAndCleanDirectory(target.getLocalWorkspace()); - target.saveJson(); + // Utils.CheckAndCleanDirectory(target.getLocalWorkspace()); + // target.saveJson(); } } \ No newline at end of file