no message

This commit is contained in:
2024-09-11 17:00:36 +03:00
parent 151572fd82
commit 4da2187f42
8 changed files with 102 additions and 41 deletions

21
.idea/workspace.xml generated
View File

@@ -7,27 +7,14 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMPackage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowTestingPackage.java" afterDir="false" />
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.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" />

View File

@@ -53,6 +53,11 @@ public abstract class TestingPackage<J> extends riDBObject {
ChangeDate = tp.ChangeDate; ChangeDate = tp.ChangeDate;
connectionErrosCount = tp.connectionErrosCount; connectionErrosCount = tp.connectionErrosCount;
state = tp.state; state = tp.state;
//--
packedConfigurations=tp.packedConfigurations;
packedGroups=tp.packedGroups;
packedTests=tp.packedTests;
//--
} }
public TestingPackage(TestingPackage p) { public TestingPackage(TestingPackage p) {
SynchronizeFields(p); SynchronizeFields(p);
@@ -106,6 +111,7 @@ public abstract class TestingPackage<J> extends riDBObject {
res.add(Global.testingServer.db.tests.get(o_id)); res.add(Global.testingServer.db.tests.get(o_id));
return res; return res;
} }
/*
public void printCGT() { public void printCGT() {
try { try {
System.out.println("package="+id); System.out.println("package="+id);
@@ -135,6 +141,7 @@ public abstract class TestingPackage<J> extends riDBObject {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
*/
public void addConfigurations(Vector<Configuration> new_configurations){ public void addConfigurations(Vector<Configuration> new_configurations){
Vector<String> res= Utils.unpack_s(packedConfigurations); Vector<String> res= Utils.unpack_s(packedConfigurations);
//--- //---

View File

@@ -51,33 +51,12 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent()); Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent());
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison(); UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
//-- //--
System.out.println("show dvmpackage");
if (getCurrent().package_json!=null){
getCurrent().printCGT();
}
// Global.testingServer.db.UnselectAllGTC();
//отметить все группы, тесты, конфигурации, что относятся к пакету.
/*
if (getCurrent().package_json != null) {
for (DVMCompilationTask compilationTask : getCurrent().package_json.compilationTasks) {
for (DVMRunTask runTask : compilationTask.runTasks) {
Data.put(runTask.id, runTask);
}
}
ShowUI();
//--
}
*/
} }
@Override @Override
public void ShowNoCurrentObject() throws Exception { public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject(); super.ShowNoCurrentObject();
Global.testingServer.db.dvmRunTasks.ShowNoPackage(); Global.testingServer.db.dvmRunTasks.ShowNoPackage();
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison(); UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
//--
System.out.println("show no dvmpackage");
// Global.testingServer.db.UnselectAllGTC();
} }
}; };
} }

View File

@@ -14,7 +14,7 @@ public class DVMPackagesBar extends DataMenuBar {
//addMenus(new AddDVMPackageMenu()); //addMenus(new AddDVMPackageMenu());
addPasses(PassCode_2021.AddDVMPackage, PassCode_2021.AddTasksToDVMPackage); addPasses(PassCode_2021.AddDVMPackage, PassCode_2021.AddTasksToDVMPackage);
addSeparator(); addSeparator();
addPasses(PassCode_2021.CloneDVMPackage); addPasses(PassCode_2021.ShowCurrentDVMPackage, PassCode_2021.CloneDVMPackage);
addSeparator(); addSeparator();
addPasses(PassCode_2021.DeleteDVMPackage); addPasses(PassCode_2021.DeleteDVMPackage);
addSeparator(); addSeparator();

View File

@@ -181,7 +181,7 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
target.tasksCount += tasks_count; target.tasksCount += tasks_count;
Global.testingServer.db.Update(target); Global.testingServer.db.Update(target);
//-- //--
target.printCGT(); // target.printCGT();
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {

View File

@@ -0,0 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import TestingSystem.Common.TestingPackage.TestingPackage;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.ShowTestingPackage;
public class ShowCurrentDVMPackage extends ShowTestingPackage {
@Override
public Current currentName() {
return Current.DVMPackage;
}
}

View File

@@ -341,12 +341,17 @@ public enum PassCode_2021 {
//-- //--
ShowSapforCompilationOut, ShowSapforCompilationOut,
ShowSapforCompilationErr, ShowSapforCompilationErr,
GetOldBugReports; GetOldBugReports,
ShowCurrentDVMPackage
;
//-- //--
public String getDescription() { public String getDescription() {
switch (this) { switch (this) {
case Undefined: case Undefined:
return "?"; return "?";
case ShowCurrentDVMPackage:
return "Показать состав пакета тестирования DVM";
case GetOldBugReports: case GetOldBugReports:
return "Получить неиспользуемые баг репорты"; return "Получить неиспользуемые баг репорты";
case SPF_RenameIncludes: case SPF_RenameIncludes:

View File

@@ -0,0 +1,72 @@
package Visual_DVM_2021.Passes;
import Common.Current;
import Common.Global;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.DVM.Configuration.Configuration;
import java.util.Vector;
public abstract class ShowTestingPackage extends Pass_2021<TestingPackage> {
@Override
public String getIconPath() {
return "/icons/LastOpened.png";
}
@Override
public String getButtonText() {
return "";
}
public abstract Current currentName();
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Current.Check(Log, currentName())) {
target = (TestingPackage) Current.get(currentName());
return true;
}
return false;
}
@Override
protected void showPreparation() throws Exception {
Global.testingServer.db.UnselectAllGTC();
}
@Override
protected void showDone() throws Exception {
System.out.println("package="+target.id);
Vector<Configuration> configurations = target.getConfigurations();
Vector<Group> groups = target.getGroups();
Vector<Test> tests = target.getTests();
//-----
Vector<String> res = new Vector<>();
res.add("конфигурации: " + configurations.size());
for (Configuration configuration : configurations)
res.add(configuration.description);
//--
res.add("группы: " + groups.size());
for (Group group : groups)
res.add(group.description);
//--
res.add("тесты: " + tests.size());
for (Test test : tests)
res.add(test.description);
System.out.println(String.join("\n", res));
//--
for (Configuration configuration: configurations)
configuration.Select(true);
for (Group group: groups)
group.Select(true);
for (Test test: tests)
test.Select(true);
//--
if (!groups.isEmpty()){
Global.testingServer.db.groups.ShowUI(groups.lastElement().id);
}
if (!tests.isEmpty()){
Global.testingServer.db.tests.ShowUI(tests.lastElement().id);
}
if (!configurations.isEmpty()){
Global.testingServer.db.configurations.ShowUI(configurations.lastElement().id);
}
}
}