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
2025-02-04 23:47:15 +03:00
parent 13cda78d47
commit dd90100bfa
9 changed files with 41 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@@ -9,9 +9,16 @@
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloneSapforSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -1,6 +1,6 @@
{
"Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1733769275\\acrred41",
"ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1738237411\\smodule114a",
"VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents",

12
src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
View File

@@ -1,14 +1,18 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
public class CheckRegistrationOnServer extends ComponentsRepositoryPass_OLD<Subscriber> {
public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount()));
target = (Subscriber) server_response.object;
protected boolean canStart(Object... args) throws Exception {
return SendRequest(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount());
}
@Override
protected void body() throws Exception {
target = (Subscriber) request.server_response.object;
Global.mainModule.getAccount().role = target.role;
}
}

24
src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
View File

@@ -3,25 +3,16 @@ import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.io.File;
public class ConvertCorrectnessTests extends TestingSystemPass_OLD<File> {
public class ConvertCorrectnessTests extends TestingServerPass<File> {
@Override
public String getIconPath() {
return "/icons/DownloadAll.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected int getTimeout() {
return 0;
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.mainModule.getAccount().isAdmin()) {
Log.Writeln_("Вы не являетесь администратором");
@@ -30,7 +21,10 @@ public class ConvertCorrectnessTests extends TestingSystemPass_OLD<File> {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false;
}
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.")&&
SendRequest(ServerCode.RefreshDVMTests,
String.valueOf(
Global.testingServer.db.serverSapfors.getUI().getCurrent().id), Global.mainModule.getAccount(),0);
}
@Override
protected boolean needsAnimation() {
@@ -47,12 +41,6 @@ public class ConvertCorrectnessTests extends TestingSystemPass_OLD<File> {
Global.mainModule.getUI().getTestingMenuBar().ShowAutoCheckTesting();
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.RefreshDVMTests,
String.valueOf(
Global.testingServer.db.serverSapfors.getUI().getCurrent().id), Global.mainModule.getAccount()));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
Global.mainModule.getPass(PassCode.SynchronizeTests).Do();

11
src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java
View File

@@ -1,17 +1,16 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class DeleteBugReportFromServer extends ComponentsRepositoryPass_OLD<BugReport> {
import javafx.util.Pair;
public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
@Override
protected boolean canStart(Object... args) {
target = (BugReport) args[0];
return !target.state.equals(BugReportState.draft);
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObject, "", target));
return !target.state.equals(BugReportState.draft)&&
SendRequest(ServerCode.DeleteObjectByPK, "",new Pair<>(BugReport.class, target.getPK()));
}
}

16
src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
View File

@@ -3,6 +3,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
@@ -10,29 +11,24 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass_OLD<File> {
public class DownloadAllBugReportsArchives extends ComponentsServerPass<File> {
@Override
public String getIconPath() {
return "/icons/DownloadAll.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected void performPreparation() throws Exception {
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.CleanDirectory(Global.BugReportsDirectory);
}
@Override
protected int getTimeout() {
return 60000;
protected boolean canStart(Object... args) throws Exception {
return SendRequest(ServerCode.ReceiveAllArchives, "", null, 60000);
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveAllArchives));
server_response.Unpack(target = Utils.getTempFileName("bugs"));
protected void body() throws Exception {
request.server_response.Unpack(target = Utils.getTempFileName("bugs"));
}
@Override
protected boolean validate() {

2
src/_VisualDVM/Passes/Server/CloneServerObject.java
View File

@@ -30,8 +30,10 @@ public abstract class CloneServerObject<S extends RepositoryServer, D extends ri
target.description += " копия";
target.sender_name = Global.mainModule.getAccount().name;
target.sender_address = Global.mainModule.getAccount().email;
additionalInitialization();
return true;
}
return false;
}
protected void additionalInitialization(){}
}

12
src/_VisualDVM/Passes/Server/RepositoryPass.java
View File

@@ -72,18 +72,6 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
break;
}
}
protected void SendFile(File src, String dst) throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.SendFile, dst, Utils_.fileToBytes(src)));
}
protected void ReceiveFile(String src, File dst) throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, src));
if (server_response.object != null)
server_response.Unpack(dst);
}
protected String ReadFile(String src) throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ReadFile, src));
return server_response.object.toString();
}
@Override
protected void body() throws Exception {
connect();

4
src/_VisualDVM/Repository/Server/ServerCode.java
View File

@@ -130,6 +130,10 @@ public enum ServerCode {
return "Скачивание пакета тестирования DVM с сервера";
case ReceiveComponent:
return "Скачивание компонента с сервера";
case DeleteObjectByPK:
return "Удаление объекта с сервера";
case CheckSubscriberRole:
return "Проверка роли подписчика на сервере";
default:
return this.toString();
}