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

оповещение по почте о тестировании сапфор. пока просто ид пакета.

Browse Source
This commit is contained in:
02090095
2023-10-17 22:53:38 +03:00
parent 07d35c876d
commit d19307ac2b
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@@ -8,15 +8,9 @@
<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/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.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/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.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/Configuration/UI/ConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.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" />

10
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
View File

@@ -11,17 +11,18 @@ public class SapforTasksPackage extends nDBObject {
public int sapforId = Constants.Nan; public int sapforId = Constants.Nan;
public String sapfor_version = "?"; //тестируемая версия SAPFOR public String sapfor_version = "?"; //тестируемая версия SAPFOR
public long sapfor_build_date = 0; public long sapfor_build_date = 0;
public String sapfor_drv=""; public String sapfor_drv = "";
public String sapfor_process_name=""; public String sapfor_process_name = "";
//--- //---
public String workspace = ""; //домашняя папка public String workspace = ""; //домашняя папка
//--- //---
public int tasksCount = 0; //Общее число задач public int tasksCount = 0; //Общее число задач
//--- //---
public int needsEmail = 0;
public long StartDate = 0; //дата начала выполнения public long StartDate = 0; //дата начала выполнения
public long ChangeDate = 0;//дата окончания выполнения public long ChangeDate = 0;//дата окончания выполнения
//- //-
public int kernels=1; //количество потоков. public int kernels = 1; //количество потоков.
@Description("DEFAULT 'TestsSynchronize'") @Description("DEFAULT 'TestsSynchronize'")
public TasksPackageState state = TasksPackageState.TestsSynchronize; public TasksPackageState state = TasksPackageState.TestsSynchronize;
@Description("DEFAULT ''") @Description("DEFAULT ''")
@@ -41,7 +42,7 @@ public class SapforTasksPackage extends nDBObject {
sapforId = p.sapforId; sapforId = p.sapforId;
testsNames = p.testsNames; testsNames = p.testsNames;
sapfor_version = p.sapfor_version; sapfor_version = p.sapfor_version;
sapfor_build_date =p.sapfor_build_date; sapfor_build_date = p.sapfor_build_date;
workspace = p.workspace; workspace = p.workspace;
tasksCount = p.tasksCount; tasksCount = p.tasksCount;
StartDate = p.StartDate; StartDate = p.StartDate;
@@ -49,5 +50,6 @@ public class SapforTasksPackage extends nDBObject {
kernels = p.kernels; kernels = p.kernels;
sapfor_process_name = p.sapfor_process_name; sapfor_process_name = p.sapfor_process_name;
state = p.state; state = p.state;
needsEmail = p.needsEmail;
} }
} }

9
src/TestingSystem/TestingPlanner.java
View File

@@ -209,5 +209,14 @@ public class TestingPlanner {
public void UpdateSapforPackage(SapforTasksPackage package_in) throws Exception { public void UpdateSapforPackage(SapforTasksPackage package_in) throws Exception {
package_in.ChangeDate = new Date().getTime(); package_in.ChangeDate = new Date().getTime();
ServerCommand(ServerCode.EditAccountObject, package_in); ServerCommand(ServerCode.EditAccountObject, package_in);
if ((package_in.needsEmail == 1) &&
(package_in.state.equals(TasksPackageState.RunningExecution) ||
(package_in.state.equals(TasksPackageState.Done)))) {
EmailMessage message = new EmailMessage();
message.subject = "Состояние пакета задач SAPFOR" + Utils.Brackets(package_in.id) + " изменилось на " + Utils.Brackets(package_in.state.getDescription());
// message.text = package_in.summary;
message.targets.add(email);
ServerCommand(ServerCode.Email, message);
}
} }
} }

1
src/Visual_DVM_2021/Passes/All/StartSapforTests.java
View File

@@ -225,6 +225,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
target.StartDate = new Date().getTime(); target.StartDate = new Date().getTime();
target.kernels = TestingServer.kernels; target.kernels = TestingServer.kernels;
target.state = TasksPackageState.Queued; target.state = TasksPackageState.Queued;
target.needsEmail = TestingServer.email ? 1 : 0;
//--- //---
Vector<SapforTasksPackage> packages = new Vector<>(); Vector<SapforTasksPackage> packages = new Vector<>();
packages.add(target); packages.add(target);

1
src/Visual_DVM_2021/UI/Main/CallbackForm.java
View File

@@ -166,7 +166,6 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
//- //-
if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone()) { if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone()) {
accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton()); accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
UI.Info("+");
} }
//-- //--
BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() { BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() {