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

Перенос кнопки синхронизации на панель тестирования. Исправление бага с формированием пакета.

Browse Source
This commit is contained in:
02090095
2023-12-18 15:44:48 +03:00
parent ed2222c163
commit ef65bb2439
24 changed files with 315 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Visual_DVM_2021/Passes/ActualizeTestingPackages.java
View File

@@ -24,16 +24,11 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
System.out.println("active packages");
for (P testingPackage : getTable().Data.values()) {
System.out.println(testingPackage.id + " " + testingPackage.state);
if (testingPackage.state.isActive()) {
System.out.println(testingPackage.state);
target.add(new Pair(testingPackage.id, testingPackage.ChangeDate));
System.out.println(testingPackage.id);
}
}
System.out.println("found " + target.size());
return !target.isEmpty();
}
@Override

5
src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
View File

@@ -75,4 +75,9 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
//черновик не вставляется в бд. идет только как элемент списка.
Global.testingServer.db.dvmPackages.Data.put(target.id, target);
}
@Override
protected void showDone() throws Exception {
super.showDone();
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
}
}

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

@@ -170,5 +170,6 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
@Override
protected void showDone() throws Exception {
Global.testingServer.db.dvmPackages.ShowUI(target.id);
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
}
}

10
src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
View File

@@ -1,7 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import Visual_DVM_2021.Passes.DeleteTestingPackages;
@@ -15,13 +14,8 @@ public class DeleteDVMPackage extends DeleteTestingPackages<DVMPackage> {
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
}
@Override
protected void performDone() throws Exception {
super.performDone();
for (Object object : target) {
int id = (int) object;
File workspace = new File(Global.PackagesDirectory, String.valueOf(id));
Utils.forceDeleteWithCheck(workspace);
}
protected File getPackagesHome() {
return Global.DVMPackagesDirectory;
}
}

8
src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java
View File

@@ -1,8 +1,16 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import Visual_DVM_2021.Passes.DeleteTestingPackages;
import java.io.File;
public class DeleteSapforPackage extends DeleteTestingPackages<SapforPackage> {
public DeleteSapforPackage() {
super(SapforPackage.class);
}
@Override
protected File getPackagesHome() {
return Global.SapforPackagesDirectory;
}
}

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

@@ -48,6 +48,7 @@ public class DownloadSapforPackage extends Pass_2021<SapforPackage> {
@Override
protected void body() throws Exception {
File workspace = target.getLocalWorkspace();
Utils.forceDeleteWithCheck(workspace);
File archive = Utils.getTempFileName(String.valueOf(target.id));
Utils.unpackFile(packed,archive);
passes.get(PassCode_2021.UnzipFolderPass).Do(archive.getAbsolutePath(), Global.SapforPackagesDirectory.getAbsolutePath());

14
src/Visual_DVM_2021/Passes/DeleteTestingPackages.java
View File

@@ -1,12 +1,13 @@
package Visual_DVM_2021.Passes;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.Common.TestingServer;
import java.io.File;
import java.util.Vector;
public class DeleteTestingPackages<P extends TestingPackage> extends DeleteServerObjects<TestingServer, P>{
public abstract class DeleteTestingPackages<P extends TestingPackage> extends DeleteServerObjects<TestingServer, P>{
boolean delete_draft;
public DeleteTestingPackages(Class<P> p) {
super(Global.testingServer, p);
@@ -25,6 +26,7 @@ public class DeleteTestingPackages<P extends TestingPackage> extends DeleteServe
*/
return true;
}
protected abstract File getPackagesHome();
@Override
protected boolean canStart(Object... args) throws Exception {
delete_draft = false;
@@ -57,5 +59,13 @@ public class DeleteTestingPackages<P extends TestingPackage> extends DeleteServe
getDb().tables.get(d).Data.remove(Constants.Nan);
getDb().tables.get(d).ShowUI();
}
@Override
protected void performDone() throws Exception {
super.performDone();
for (Object object : target) {
int id = (int) object;
File workspace = new File(getPackagesHome(), String.valueOf(id));
Utils.forceDeleteWithCheck(workspace);
}
}
}