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

v++

Browse Source
This commit is contained in:
02090095
2024-03-08 02:45:49 +03:00
parent b792cf80b8
commit 8f38a616d5
8 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -8,9 +8,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
</list> </list>

2
src/Repository/Component/Visualiser.java
View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1074; version = 1075;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

2
src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
View File

@@ -10,6 +10,8 @@ public class SapforConfiguration_json implements Serializable {
@Expose @Expose
public int id = Constants.Nan; public int id = Constants.Nan;
@Expose @Expose
public String name="";
@Expose
public String flags = ""; public String flags = "";
@Expose @Expose
public List<PassCode_2021> codes = new Vector<>(); public List<PassCode_2021> codes = new Vector<>();

16
src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
View File

@@ -168,4 +168,20 @@ public class SapforPackage_json implements Serializable {
} }
} }
} }
public Vector<String> getConfigurationsNames() {
Vector<String> 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<String>() {
@Override
public int compare(String o1, String o2) {
return o1.compareTo(o2);
}
});
return names;
}
} }

2
src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -14,6 +14,8 @@ import java.util.Vector;
public class SapforPackage extends TestingPackage<SapforPackage_json> { public class SapforPackage extends TestingPackage<SapforPackage_json> {
@Description("DEFAULT ''") @Description("DEFAULT ''")
public String testsNames = "";//имена тестов через ; для отображения public String testsNames = "";//имена тестов через ; для отображения
@Description("DEFAULT ''")
public String configurationsNames="";//имена конфигураций для отображения.
//--- //---
public int sapforId = Constants.Nan; // так как сапфор на машине. public int sapforId = Constants.Nan; // так как сапфор на машине.
public SapforPackage() { public SapforPackage() {

19
src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -33,10 +33,10 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false); // columns.get(0).setVisible(false);
columns.get(4).setMaxWidth(200); columns.get(4).setMaxWidth(200);
columns.get(7).setRenderer(RendererProgress); columns.get(8).setRenderer(RendererProgress);
columns.get(8).setRenderer(RendererDate);
columns.get(9).setRenderer(RendererDate); 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<SapforPackage> {
"Автор", "Автор",
"SAPFOR", "SAPFOR",
"Тесты", "Тесты",
"Конфигурации",
"Задач", "Задач",
"Ядер", "Ядер",
"Прогресс", "Прогресс",
@@ -64,16 +65,18 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
case 4: case 4:
return object.testsNames; return object.testsNames;
case 5: case 5:
return object.tasksCount; return object.configurationsNames;
case 6: case 6:
return object.kernels; return object.tasksCount;
case 7: case 7:
return object.progress; return object.kernels;
case 8: case 8:
return new Date(object.StartDate); return object.progress;
case 9: case 9:
return new Date(object.ChangeDate); return new Date(object.StartDate);
case 10: case 10:
return new Date(object.ChangeDate);
case 11:
return object.state; return object.state;
default: default:
return null; return null;

2
src/Visual_DVM_2021/Passes/All/AddTasksToSapforPackage.java
View File

@@ -228,6 +228,7 @@ public class AddTasksToSapforPackage extends Pass_2021<SapforPackage> {
//-- //--
SapforConfiguration_json configuration_json = new SapforConfiguration_json(); SapforConfiguration_json configuration_json = new SapforConfiguration_json();
configuration_json.id = configuration.id; configuration_json.id = configuration.id;
configuration_json.name=configuration.description;
configuration_json.flags = configuration.getFlags(); configuration_json.flags = configuration.getFlags();
Vector<PassCode_2021> codes = configuration.getPassCodes(); Vector<PassCode_2021> codes = configuration.getPassCodes();
//--- коррекцию кода нельзя вызвать если инклуды есть. в общем случае. //--- коррекцию кода нельзя вызвать если инклуды есть. в общем случае.
@@ -260,6 +261,7 @@ public class AddTasksToSapforPackage extends Pass_2021<SapforPackage> {
} }
target.tasksCount += new_tasks.size(); target.tasksCount += new_tasks.size();
target.testsNames = String.join(";", target.package_json.getTestsNames()); target.testsNames = String.join(";", target.package_json.getTestsNames());
target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {

8
src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
View File

@@ -57,6 +57,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
SapforConfiguration_json configurationJson = new SapforConfiguration_json(); SapforConfiguration_json configurationJson = new SapforConfiguration_json();
//-- //--
configurationJson.id = configuration.id; configurationJson.id = configuration.id;
configurationJson.name = configuration.description;
configurationJson.flags = src_configuration.flags; configurationJson.flags = src_configuration.flags;
configurationJson.codes.addAll(src_configuration.codes); configurationJson.codes.addAll(src_configuration.codes);
//-- //--
@@ -153,7 +154,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
SapforTestingSet_json dst = cloneTestingSet(src); SapforTestingSet_json dst = cloneTestingSet(src);
//-- //--
Vector<SapforTask> new_tasks = target.getActualTestingSetTasks(dst); Vector<SapforTask> new_tasks = target.getActualTestingSetTasks(dst);
if (!new_tasks.isEmpty()){ if (!new_tasks.isEmpty()) {
target.package_json.testingSets.add(dst); target.package_json.testingSets.add(dst);
target.package_json.tasks.addAll(new_tasks); target.package_json.tasks.addAll(new_tasks);
} }
@@ -161,6 +162,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
} }
target.tasksCount = target.package_json.tasks.size(); target.tasksCount = target.package_json.tasks.size();
target.testsNames = String.join(";", target.package_json.getTestsNames()); target.testsNames = String.join(";", target.package_json.getTestsNames());
target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
//-- //--
for (String test_id : inexistingTests) { for (String test_id : inexistingTests) {
System.out.println("Тест " + test_id + " не найден!"); System.out.println("Тест " + test_id + " не найден!");
@@ -180,7 +182,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
protected void body() throws Exception { protected void body() throws Exception {
Global.testingServer.db.sapforPackages.Data.put(target.id, target); Global.testingServer.db.sapforPackages.Data.put(target.id, target);
//-- //--
Utils.CheckAndCleanDirectory(target.getLocalWorkspace()); // Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
target.saveJson(); // target.saveJson();
} }
} }