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

промежуточный. ухожу. надо сделать чтобы не сравнивало файлы вывода в каждой версии.

Browse Source
This commit is contained in:
02090095
2023-11-09 15:20:34 +03:00
parent 3d9248a158
commit 93808bfa7b
4 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/workspace.xml generated
View File

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

15
src/SapforTestingSystem/Json/SapforTasksResults_json.java
View File

@@ -14,6 +14,10 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
public class SapforTasksResults_json { public class SapforTasksResults_json {
//---
public PackageSummary root = null;
public DefaultMutableTreeNode comparison_root = null;
//---
@Expose @Expose
public long StartDate = 0; public long StartDate = 0;
@Expose @Expose
@@ -26,10 +30,6 @@ public class SapforTasksResults_json {
//-- задачи, отсортированные для сравнения. //-- задачи, отсортированные для сравнения.
public LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> comparisonSortedTasks = new LinkedHashMap<>(); public LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> comparisonSortedTasks = new LinkedHashMap<>();
//---- //----
public PackageSummary root = null;
//--
public DefaultMutableTreeNode comparison_root = null;
//---
public void buildTree(SapforTasksPackage package_in) { public void buildTree(SapforTasksPackage package_in) {
root = new PackageSummary(); root = new PackageSummary();
//--- //---
@@ -206,6 +206,12 @@ public class SapforTasksResults_json {
} }
} }
} }
public void DropComparison(){
comparison_root = null;
comparisonSortedTasks.clear();
for (SapforTask task : allTasks.values())
task.match = MatchState.NotMatch;
}
//--- //---
public String getEmailSummary() { public String getEmailSummary() {
String res = ""; String res = "";
@@ -256,4 +262,5 @@ public class SapforTasksResults_json {
res = String.join("\n", summary_lines); res = String.join("\n", summary_lines);
return res; return res;
} }
//---
} }

2
src/SapforTestingSystem/SapforTask/SapforTask.java
View File

@@ -156,8 +156,10 @@ public class SapforTask extends DBObject {
return; return;
} }
} }
System.out.println("сравнение версий.");
//-- //--
for (String name1 : versions1.keySet()) { for (String name1 : versions1.keySet()) {
System.out.println("version name="+name1);
SapforVersion_json version1 = versions1.get(name1); SapforVersion_json version1 = versions1.get(name1);
SapforVersion_json version2 = versions2.get(name1); SapforVersion_json version2 = versions2.get(name1);
//--- //---

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

@@ -5,7 +5,6 @@ import Common.UI.Label.ShortLabel;
import Common.UI.Menus_2023.VisualiserMenuBar; import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.UI; import Common.UI.UI;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import SapforTestingSystem.SapforTask.MatchState;
import SapforTestingSystem.SapforTask.SapforTask; import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.UI.SapforTasksPackageTree; import SapforTestingSystem.SapforTasksPackage.UI.SapforTasksPackageTree;
@@ -185,14 +184,8 @@ public class SapforPackagesComparisonForm {
} }
@Override @Override
protected void performPreparation() throws Exception { protected void performPreparation() throws Exception {
package1.results.comparisonSortedTasks.clear(); package1.results.DropComparison();
package2.results.comparisonSortedTasks.clear(); package2.results.DropComparison();
//сброс всех состояний задач.
for (SapforTask task : package1.results.allTasks.values())
task.match = MatchState.NotMatch;
//--
for (SapforTask task : package2.results.allTasks.values())
task.match = MatchState.NotMatch;
} }
@Override @Override
protected void showPreparation() throws Exception { protected void showPreparation() throws Exception {
@@ -202,19 +195,25 @@ public class SapforPackagesComparisonForm {
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
System.out.println(package1.results.allTasks.size());
System.out.println(package2.results.allTasks.size());
//теперь сравниваем задачи //теперь сравниваем задачи
int i = 1;
for (String key1 : package1.results.allTasks.keySet()) { for (String key1 : package1.results.allTasks.keySet()) {
System.out.println(i + "=" + key1);
SapforTask task1 = package1.results.allTasks.get(key1); SapforTask task1 = package1.results.allTasks.get(key1);
SapforTask task2 = package2.results.allTasks.get(key1); SapforTask task2 = package2.results.allTasks.get(key1);
//-- //--
task1.checkMatch(task2); task1.checkMatch(task2);
//--
++i;
} }
//-- //--
package1.results.SortTasksForComparison(); // package1.results.SortTasksForComparison();
package2.results.SortTasksForComparison(); // package2.results.SortTasksForComparison();
//- //-
package1.results.buildComparisonTree(package1); // package1.results.buildComparisonTree(package1);
package2.results.buildTree(package2); // package2.results.buildTree(package2);
} }
@Override @Override
protected boolean validate() { protected boolean validate() {
@@ -227,8 +226,8 @@ public class SapforPackagesComparisonForm {
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
showComparisonTree(); // showComparisonTree();
slave.showComparisonTree(); // slave.showComparisonTree();
} }
}; };
pass.Do(); pass.Do();