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

чистка лишних импортов.и фикс бага с сохранением тестов

Browse Source
This commit is contained in:
02090095
2025-03-23 14:28:20 +03:00
parent 811acba5a7
commit b763c2c266
69 changed files with 134 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java
View File

@@ -22,15 +22,15 @@ public class CompareDVMRunTaskToEthalon extends Pass<DVMRunTask> {
//есть ли эталон у этой задачи.
target = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
if (target.ethalon_id != CommonConstants.Nan && Global.testingServer.db.dvmRunTasks.containsKey(target.ethalon_id)) {
ethalon= Global.testingServer.db.dvmRunTasks.get(target.ethalon_id);
ethalon = Global.testingServer.db.dvmRunTasks.get(target.ethalon_id);
return true;
}else Log.Writeln_("Не найдено эталона для задачи "+ Utils_.Brackets(target.id)+" !");
} else Log.Writeln_("Не найдено эталона для задачи " + Utils_.Brackets(target.id) + " !");
}
return false;
}
@Override
protected void body() throws Exception {
Global.mainModule.getUI().getMainWindow().getTestingWindow().CompareCurrentDVMTaskToEthalon(ethalon,target);
Global.mainModule.getUI().getMainWindow().getTestingWindow().CompareCurrentDVMTaskToEthalon(ethalon, target);
}
@Override
protected void showFinish() throws Exception {

2
src/_VisualDVM/Passes/All/CreateTestFromFile.java
View File

@@ -33,7 +33,7 @@ public class CreateTestFromFile extends Pass<Test> {
@Override
protected boolean canStart(Object... args) throws Exception {
testFile = null;
file = (File) args[0];
file = (File) args[0];
group = (Group) args[1];
//--
if (Utils_.ContainsCyrillic(file.getName()) || Utils_.ContainsForbiddenName(file.getName())) {

3
src/_VisualDVM/Passes/All/DeleteUserAccount.java
View File

@@ -4,9 +4,6 @@ import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.DeleteServerObject;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import javafx.util.Pair;
public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, UserAccount> {
public DeleteUserAccount() {
super(Global.componentsServer, UserAccount.class);

9
src/_VisualDVM/Passes/All/DownloadDvmTestsRepository.java
View File

@@ -1,15 +1,6 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.ProcessPass;
import _VisualDVM.Passes.Repository.DownloadRepositoryPass;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
public class DownloadDvmTestsRepository extends DownloadRepositoryPass {
/*
git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm DST

9
src/_VisualDVM/Passes/All/DownloadSapforRepository.java
View File

@@ -1,15 +1,6 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.ProcessPass;
import _VisualDVM.Passes.Repository.DownloadRepositoryPass;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
public class DownloadSapforRepository extends DownloadRepositoryPass {
@Override
protected boolean canStart(Object... args) throws Exception {

2
src/_VisualDVM/Passes/All/EditUserAccount.java
View File

@@ -4,8 +4,6 @@ import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.EditServerObject;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
public class EditUserAccount extends EditServerObject<ComponentsServer, UserAccount> {
public EditUserAccount() {
super(Global.componentsServer, UserAccount.class);

1
src/_VisualDVM/Passes/All/InitialiseUser.java
View File

@@ -10,7 +10,6 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
public class InitialiseUser extends Pass {
@Override
public String getIconPath() {

2
src/_VisualDVM/Passes/All/PublishUserAccount.java
View File

@@ -4,8 +4,6 @@ import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
public class PublishUserAccount extends PublishServerObject<ComponentsServer, UserAccount> {
public PublishUserAccount() {
super(Global.componentsServer, UserAccount.class);

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

@@ -1,25 +1,14 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.Vector;
public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
@Override
public String getIconPath() {

6
src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java
View File

@@ -1,13 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationSettings.DVMConfigurationSettings;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import java.util.Vector;
public class ShowCurrentDVMConfigurationTests extends ShowCurrentConfigurationTests<DVMConfiguration> {
@Override
public Class currentClass() {

5
src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
View File

@@ -1,12 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import java.util.Vector;
public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests<SapforConfiguration> {
@Override
public Class currentClass() {

8
src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
View File

@@ -66,9 +66,9 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
return false;
}
Vector<DVMConfiguration> configurations = Global.testingServer.db.dvmConfigurations.getUI().getSelectedOrCurrent();
// for (DVMConfiguration configuration:configurations){
// Global.testingServer.db.actualizeConfigurationGroups(configuration);
// }
// for (DVMConfiguration configuration:configurations){
// Global.testingServer.db.actualizeConfigurationGroups(configuration);
// }
//---
//проверить конфигурации на соответствие группам.
//если конфигурации количество тестов 0, но есть группы.проверить на пустоту этих групп,и заполнить заново всеми их тестами.
@@ -91,7 +91,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
}
@Override
protected void showPreparation() throws Exception {
getDb().getTable(DVMConfiguration.class).ShowUI();
getDb().getTable(DVMConfiguration.class).ShowUI();
}
@Override
protected void ServerAction() throws Exception {

1
src/_VisualDVM/Passes/All/TestPass.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Utils;
import java.io.BufferedReader;
import java.io.File;

8
src/_VisualDVM/Passes/Repository/DownloadRepositoryPass.java
View File

@@ -33,22 +33,22 @@ public class DownloadRepositoryPass extends ProcessPass {
Vector<String> scriptLines = new Vector<>();
File loadedFile = Paths.get(dst.getAbsolutePath(), CommonConstants.LOADED).toFile();
boolean pull = loadedFile.exists();
if (pull){
if (pull) {
System.out.println("PULL");
scriptLines.add("cd " + dst.getAbsolutePath());
scriptLines.add("git pull");
}else {
} else {
Utils.CleanDirectory(dst);
System.out.println("CLONE");
scriptLines.add("cd " + Utils_.DQuotes(Global.RepoDirectory.getAbsolutePath()));
scriptLines.add("git clone " + Utils_.DQuotes(url)+" "+Utils_.DQuotes(dst.getAbsolutePath()));
scriptLines.add("git clone " + Utils_.DQuotes(url) + " " + Utils_.DQuotes(dst.getAbsolutePath()));
}
if (hasSubmodules()) {
scriptLines.add("cd " + Utils_.DQuotes(dst));
scriptLines.add("GIT_SSL_NO_VERIFY=true git submodule update --init");
}
PerformScript(String.join("\n", scriptLines));
if (!pull){
if (!pull) {
FileUtils.write(loadedFile, "");
}
ShowProgress(1, 1, true);

4
src/_VisualDVM/Passes/Server/ServerObjectPass.java
View File

@@ -26,7 +26,9 @@ public abstract class ServerObjectPass<S extends RepositoryServer, D extends DBO
protected Database getDb() {
return server.db;
}
protected String getDBName(){return "";}
protected String getDBName() {
return "";
}
@Override
protected void performFinish() throws Exception {
super.performFinish();

6
src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java
View File

@@ -1,13 +1,7 @@
package _VisualDVM.Passes.Testing;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import java.util.Vector;
public abstract class ShowCurrentConfigurationTests<C extends Configuration> extends Pass<C> {
@Override
public String getIconPath() {