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

no message

Browse Source
This commit is contained in:
02090095
2023-10-30 21:15:39 +03:00
parent bfc9efe834
commit 9d491999a3
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -8,12 +8,7 @@
<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/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

34
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
View File

@@ -5,6 +5,7 @@ import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile; import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileType; import ProjectData.Files.FileType;
import SapforTestingSystem.Json.SapforTasksResults_json; import SapforTestingSystem.Json.SapforTasksResults_json;
import SapforTestingSystem.Json.SapforVersion_json;
import SapforTestingSystem.SapforTask.SapforTask; import SapforTestingSystem.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
@@ -51,6 +52,29 @@ public class SapforTasksPackageInterface {
res.add(flagsNode); res.add(flagsNode);
return res; return res;
} }
public static DefaultMutableTreeNode getTaskVersionsTree(SapforTask task) {
DefaultMutableTreeNode root = null;
DefaultMutableTreeNode child = null;
DefaultMutableTreeNode parent = null;
//--
for (SapforVersion_json version_json : task.versions) {
child = new DefaultMutableTreeNode(version_json.description);
if (parent == null) {
root = child;
parent = child;
} else {
parent.add(child);
parent = child;
}
}
if (parent != null) {
for (SapforVersion_json version_json : task.variants) {
parent.add(new DefaultMutableTreeNode(version_json.description));
}
}
//--
return root;
}
public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) { public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
SapforTasksResults_json results_json = getLocalResults(package_in); SapforTasksResults_json results_json = getLocalResults(package_in);
//-- флаги группы //-- флаги группы
@@ -61,18 +85,20 @@ public class SapforTasksPackageInterface {
// root.add(configurationsTitleNode); // root.add(configurationsTitleNode);
for (String configuration_id : tasksByConfigurations.keySet()) { for (String configuration_id : tasksByConfigurations.keySet()) {
DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configuration_id); DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configuration_id);
// DefaultMutableTreeNode groupsTitleNode = new DefaultMutableTreeNode("Группы тестов"); // DefaultMutableTreeNode groupsTitleNode = new DefaultMutableTreeNode("Группы тестов");
// Vector<DefaultMutableTreeNode> configurationDescription = null; // Vector<DefaultMutableTreeNode> configurationDescription = null;
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id); LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
for (String group : groups_tasks.keySet()) { for (String group : groups_tasks.keySet()) {
DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group); DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
for (SapforTask task : groups_tasks.get(group)) { for (SapforTask task : groups_tasks.get(group)) {
/* /*
if (configurationDescription == null) if (configurationDescription == null)
configurationDescription = getTaskConfigurationDescription(task); configurationDescription = getTaskConfigurationDescription(task);
*/ */
DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description); DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
//--
taskNode.add(getTaskVersionsTree(task));
//--
groupNode.add(taskNode); groupNode.add(taskNode);
} }
/* /*
@@ -81,10 +107,10 @@ public class SapforTasksPackageInterface {
configurationNode.add(node); configurationNode.add(node);
} }
*/ */
// groupsTitleNode.add(groupNode); // groupsTitleNode.add(groupNode);
configurationNode.add(groupNode); configurationNode.add(groupNode);
} }
// configurationNode.add(groupsTitleNode); // configurationNode.add(groupsTitleNode);
// configurationsTitleNode.add(configurationNode); // configurationsTitleNode.add(configurationNode);
root.add(configurationNode); root.add(configurationNode);
} }