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

7
src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
View File

@@ -3,16 +3,12 @@ import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
import _VisualDVM.TestingSystem.Common.Settings.Settings;
import _VisualDVM.TestingSystem.Common.Test.Test;
import com.sun.org.glassfish.gmbal.Description;
import javax.swing.*;
import java.util.List;
import java.util.Vector;
public class Configuration extends riDBObject {
//конфигурация = данные для пакета.
@@ -41,7 +37,7 @@ public class Configuration extends riDBObject {
return autoTesting != 0 ? "Да" : "Нет";
}
public String printGroupsOnly() {
return groupsOnly !=0 ? "Да" : "Нет";
return groupsOnly != 0 ? "Да" : "Нет";
}
public void SwitchAuto() {
autoTesting = (autoTesting == 0) ? 1 : 0;
@@ -55,7 +51,6 @@ public class Configuration extends riDBObject {
public void saveTests(Vector<Test> tests) {
}
public void saveSettings(Vector<Settings> settings_in) {
}
//--
@Override

1
src/_VisualDVM/TestingSystem/Common/Group/Group.java
View File

@@ -6,7 +6,6 @@ import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description;

2
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -93,7 +93,7 @@ public class Test extends riDBObject {
//--
return true;
}
public Vector<File> getServerFiles(){
public Vector<File> getServerFiles() {
File path = getServerPath();
Vector<File> res = new Vector<>();
for (TestFile testFile : Global.testingServer.db.getVectorByFK(this, TestFile.class))

26
src/_VisualDVM/TestingSystem/Common/TestFile/TestFile.java
View File

@@ -13,6 +13,19 @@ public class TestFile extends projectFile_ {
public int id;
public int test_id = CommonConstants.Nan;
public String name; //имя относительно корневой папки проекта. не ключ.
public TestFile() {
}
public TestFile(Test test) {
test_id = test.id;
}
public TestFile(File file_in) {
super(file_in);
name = file_in.getName();
}
public TestFile(Test test, File file_in) {
this(file_in);
test_id = test.id;
}
@Override
public Object getPK() {
return id;
@@ -29,17 +42,4 @@ public class TestFile extends projectFile_ {
test_id = src_.test_id;
name = src_.name;
}
public TestFile() {
}
public TestFile(Test test) {
test_id = test.id;
}
public TestFile(File file_in){
super(file_in);
name = file_in.getName();
}
public TestFile(Test test, File file_in){
this(file_in);
test_id = test.id;
}
}

4
src/_VisualDVM/TestingSystem/Common/TestFile/TestFilesDBTable.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.TestFile;
import Common.Database.Tables.DBTable;
public class TestFilesDBTable extends DBTable<Integer,TestFile> {
public class TestFilesDBTable extends DBTable<Integer, TestFile> {
public TestFilesDBTable() {
super(Integer.class,TestFile.class);
super(Integer.class, TestFile.class);
}
}

1
src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.Common;
import Common.CommonConstants;
import Common.Utils.Loggable;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;

21
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -159,40 +159,39 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
@Override
protected void afterEditAction(DBObject object) throws Exception {
if (object instanceof DVMConfiguration){
if (object instanceof DVMConfiguration) {
DVMConfiguration dvmConfiguration = (DVMConfiguration) object;
//--
if (dvmConfiguration.groups!=null)
if (dvmConfiguration.groups != null)
db.dvmConfigurationGroups.ActualizeData(
db.getVectorByFK(dvmConfiguration, DVMConfigurationGroup.class),
dvmConfiguration.groups);
if (dvmConfiguration.tests!=null)
if (dvmConfiguration.tests != null)
db.dvmConfigurationTests.ActualizeData(
db.getVectorByFK(dvmConfiguration, DVMConfigurationTest.class),
dvmConfiguration.tests);
if (dvmConfiguration.settings!=null)
if (dvmConfiguration.settings != null)
db.dvmConfigurationSettings.ActualizeData(
db.getVectorByFK(dvmConfiguration, DVMConfigurationSettings.class),
dvmConfiguration.settings);
dvmConfiguration.settings);
//--
}else if (object instanceof SapforConfiguration){
} else if (object instanceof SapforConfiguration) {
SapforConfiguration sapforConfiguration = (SapforConfiguration) object;
if (sapforConfiguration.groups!=null)
if (sapforConfiguration.groups != null)
db.sapforConfigurationGroups.ActualizeData(
db.getVectorByFK(sapforConfiguration, SapforConfigurationGroup.class),
sapforConfiguration.groups
);
if (sapforConfiguration.tests!=null)
if (sapforConfiguration.tests != null)
db.sapforConfigurationTests.ActualizeData(
db.getVectorByFK(sapforConfiguration, SapforConfigurationTest.class),
sapforConfiguration.tests
);
if (sapforConfiguration.settings!=null)
if (sapforConfiguration.settings != null)
db.sapforConfigurationSettings.ActualizeData(
db.getVectorByFK(sapforConfiguration, SapforConfigurationSettings.class),
sapforConfiguration.settings
);
}
}
@Override
@@ -693,7 +692,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
void GetDVMPackageCredentials() throws Exception {
int package_id = (int) request.object;
checkExistense(package_id,DVMPackage.class);
checkExistense(package_id, DVMPackage.class);
DVMPackageCredentials res = machines_db.dvmPackagesCredentials.getForPackageId(package_id);
if (res == null)
throw new RepositoryRefuseException("Не найдено учетных данных для пакета " + Utils_.Brackets(package_id));