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-11-02 23:42:53 +03:00
parent 6dbece2d92
commit b4070b41cb
4 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/workspace.xml generated
View File

@@ -8,8 +8,6 @@
<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/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.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" />

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

@@ -14,6 +14,11 @@ public class SapforTasksPackageInterface {
public static File getPackageArchive(SapforTasksPackage package_in) { public static File getPackageArchive(SapforTasksPackage package_in) {
return new File(Global.SapforPackagesDirectory, package_in.id + ".zip"); return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
} }
/*
getTaskConfigurationDescription(SapforTask task){
}
*/
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);
@@ -21,37 +26,21 @@ public class SapforTasksPackageInterface {
LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups(); LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = results_json.sortTasksByConfigurationsAndGroups();
//-- //--
DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id); DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
// DefaultMutableTreeNode configurationsTitleNode = new DefaultMutableTreeNode("Конфигурации");
// 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("Группы тестов");
// 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)
configurationDescription = getTaskConfigurationDescription(task);
*/
DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description); DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
//-- //--
taskNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id))); taskNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
//-- //--
groupNode.add(taskNode); groupNode.add(taskNode);
} }
/*
if (configurationDescription != null) {
for (DefaultMutableTreeNode node : configurationDescription)
configurationNode.add(node);
}
*/
// groupsTitleNode.add(groupNode);
configurationNode.add(groupNode); configurationNode.add(groupNode);
} }
// configurationNode.add(groupsTitleNode);
// configurationsTitleNode.add(configurationNode);
root.add(configurationNode); root.add(configurationNode);
} }
return root; return root;

2
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java → src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTasksPackage; package SapforTestingSystem.SapforTasksPackage.UI;
import Common.Current; import Common.Current;
import Common.UI.Trees.DataTree; import Common.UI.Trees.DataTree;
import Common.UI.UI; import Common.UI.UI;

2
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -7,7 +7,7 @@ import Common.UI.UI;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface; import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree; import SapforTestingSystem.SapforTasksPackage.UI.SapforTasksPackageTree;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;