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

fix, не учитывалась настройка оповещения. оповещалось безусловно

Browse Source
This commit is contained in:
02090095
2023-12-21 18:16:14 +03:00
parent dbc05900ba
commit 52ce1e78aa
2 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml generated
View File

@@ -7,15 +7,8 @@
</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/CreateTestFromSelectedFiles.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$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.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/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.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" />
</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" />

91
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -66,11 +66,13 @@ public abstract class TestingPlanner<P extends TestingPackage> {
ServerCommand(ServerCode.EditObject, testingPackage); ServerCommand(ServerCode.EditObject, testingPackage);
} }
void EmailPackage() throws Exception { void EmailPackage() throws Exception {
EmailMessage message = new EmailMessage(); if (testingPackage.needsEmail == 1) {
message.subject = "Состояние пакета задач " + Utils.Brackets(testingPackage) + " изменилось на " + Utils.Brackets(testingPackage.state.getDescription()); EmailMessage message = new EmailMessage();
message.text = testingPackage.description; message.subject = "Состояние пакета задач " + Utils.Brackets(testingPackage) + " изменилось на " + Utils.Brackets(testingPackage.state.getDescription());
message.targets.add(testingPackage.sender_address); message.text = testingPackage.description;
ServerCommand(ServerCode.Email, message); message.targets.add(testingPackage.sender_address);
ServerCommand(ServerCode.Email, message);
}
} }
//--- //---
protected abstract ServerCode getActivePackageCode(); protected abstract ServerCode getActivePackageCode();
@@ -122,48 +124,49 @@ public abstract class TestingPlanner<P extends TestingPackage> {
} }
// --- // ---
public void Perform() { public void Perform() {
try { try {
testingPackage = null; testingPackage = null;
testingPackage = (P) ServerCommand(getActivePackageCode()); testingPackage = (P) ServerCommand(getActivePackageCode());
if (testingPackage != null) { if (testingPackage != null) {
Print(testingPackage.id + ":" + testingPackage.state.getDescription()); Print(testingPackage.id + ":" + testingPackage.state.getDescription());
//-- //--
InitSessionCredentials(); InitSessionCredentials();
if (testingPackage.state.equals(TasksPackageState.Analysis)) { if (testingPackage.state.equals(TasksPackageState.Analysis)) {
AnalyseResults(); AnalyseResults();
UpdatePackageState(TasksPackageState.Done); UpdatePackageState(TasksPackageState.Done);
EmailPackage(); EmailPackage();
} else { } else {
try { try {
if (Connect()) { if (Connect()) {
int ptk_id = (int) ServerCommand(getCheckIfNeedsKillCode(), testingPackage.id); int ptk_id = (int) ServerCommand(getCheckIfNeedsKillCode(), testingPackage.id);
if (ptk_id!= Constants.Nan) { if (ptk_id != Constants.Nan) {
Print("package " + testingPackage.id + " NEEDS TO KILL"); Print("package " + testingPackage.id + " NEEDS TO KILL");
Kill(); Kill();
UpdatePackageState(TasksPackageState.Aborted); UpdatePackageState(TasksPackageState.Aborted);
EmailPackage(); EmailPackage();
ServerCommand(ServerCode.DeleteObjectByPK, ptk_id); ServerCommand(ServerCode.DeleteObjectByPK, ptk_id);
} else { } else {
Session(); Session();
}
} }
} catch (Exception ex) { }
Print("Ошибка сеанса. Соединение будет разорвано."); } catch (Exception ex) {
Print(ex.getMessage()); Print("Ошибка сеанса. Соединение будет разорвано.");
Disconnect(); Print(ex.getMessage());
} finally {} Disconnect();
} finally {
} }
//--
testingPackage.destructor();
testingPackage = null;
System.gc();
//--
} }
//else Print(this.getClass().getSimpleName()+": no active package found"); //--
} catch (Exception ex) { testingPackage.destructor();
ex.printStackTrace(); testingPackage = null;
} finally { System.gc();
Utils.sleep(getSleepMillis()); //--
} }
//else Print(this.getClass().getSimpleName()+": no active package found");
} catch (Exception ex) {
ex.printStackTrace();
} finally {
Utils.sleep(getSleepMillis());
}
} }
} }