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-03-23 21:24:09 +03:00
parent dae9d58d82
commit af644f8f04
19 changed files with 94 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
View File

@@ -4,7 +4,6 @@ import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.Utils_;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import com.sun.org.glassfish.gmbal.Description;
@@ -27,7 +26,7 @@ public abstract class TestingPackage<J> extends riDBObject {
@Description("DEFAULT 0")
public int connectionErrosCount = 0;
public TasksPackageState state = TasksPackageState.Draft;
// public String packedConfigurationsJson = "";
public String packedConfigurationsJson = "";
//json где хранятся задачи----------------------------------
@Description("IGNORE")
public J package_json = null;
@@ -84,7 +83,6 @@ public abstract class TestingPackage<J> extends riDBObject {
}
//----------------------------------------------------------
public void saveConfigurations(Vector<? extends Configuration> configurations) {
}
//определить завершен пакет с ошибками или нет.
public void checkFinishState() throws Exception {

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

@@ -558,16 +558,16 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
Vector<SapforPackage> sapforPackages = new Vector<>();
for (SapforConfiguration sapforConfiguration : configurations) {
SapforPackage sapforPackage = new SapforPackage(account, sapfor,new Vector_<>(sapforConfiguration), 1, Log);
SapforPackage sapforPackage = new SapforPackage(account, sapfor, new Vector_<>(sapforConfiguration), 1, Log);
if (sapforPackage.tasksCount > 0) {
sapforPackages.add(sapforPackage);
}
}
if (sapforPackages.isEmpty()){
if (sapforPackages.isEmpty()) {
Log.Writeln_("Не сформировано ни одного пакета");
return;
}
for (SapforPackage sapforPackage: sapforPackages){
for (SapforPackage sapforPackage : sapforPackages) {
beforePublishAction(sapforPackage);
db.InsertS(sapforPackage);
afterPublishAction(sapforPackage);

22
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -98,7 +98,7 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(dvmConfigurationTests = new DVMConfigurationTestsDBTable());
addTable(dvmConfigurationSettings = new DVMConfigurationSettingsDBTable());
addTable(dvmPackages = new DVMPackageDBTable());
addTable(dvmPackageConfigurations =new DVMPackageConfigurationsDBTable());
addTable(dvmPackageConfigurations = new DVMPackageConfigurationsDBTable());
//-
addTable(serverSapfors = new ServerSapforsDBTable());
addTable(sapforSettings = new SapforSettingsDBTable());
@@ -393,6 +393,7 @@ public class TestsDatabase extends SQLiteDatabase {
Delete(file);
}
public void Patch() throws Exception {
/*
Vector<DVMPackageConfiguration> dvmPackageConfigurations_ = new Vector<>();
for (DVMPackage dvmPackage: dvmPackages.Data.values()){
if (!dvmPackage.packedConfigurationsJson.isEmpty()) {
@@ -401,6 +402,7 @@ public class TestsDatabase extends SQLiteDatabase {
DVMPackageConfiguration dvmPackageConfiguration = new DVMPackageConfiguration();
dvmPackageConfiguration.dvmpackage_id = dvmPackage.id;
dvmPackageConfiguration.dvmconfiguration_id = configurationJson.id;
dvmPackageConfiguration.description =configurationJson.description;
dvmPackageConfigurations_.add(dvmPackageConfiguration);
}
}
@@ -418,6 +420,7 @@ public class TestsDatabase extends SQLiteDatabase {
SapforPackageConfiguration sapforPackageConfiguration = new SapforPackageConfiguration();
sapforPackageConfiguration.sapforpackage_id = sapforPackage.id;
sapforPackageConfiguration.sapforconfiguration_id = configurationJson.id;
sapforPackageConfiguration.description =configurationJson.description;
sapforPackageConfigurations_.add(sapforPackageConfiguration);
}
}
@@ -426,6 +429,7 @@ public class TestsDatabase extends SQLiteDatabase {
for (SapforPackageConfiguration sapforPackageConfiguration: sapforPackageConfigurations_)
Insert(sapforPackageConfiguration);
Commit();
*/
/*
Vector<DVMConfigurationGroup> DVMConfigurationGroups=new Vector<>();
//группы dvm конфигураций
@@ -612,4 +616,20 @@ public class TestsDatabase extends SQLiteDatabase {
return res;
}
//--
public Vector<Integer> getDVMPackageConfigurationsIds(DVMPackage dvmPackage) {
Vector<Integer> res = new Vector<>();
for (DVMPackageConfiguration dvmPackageConfiguration : dvmPackageConfigurations.Data.values()) {
if (dvmPackageConfiguration.dvmpackage_id == dvmPackage.id)
res.add(dvmPackageConfiguration.dvmconfiguration_id);
}
return res;
}
public Vector<Integer> getSapforPackageConfigurationsIds(SapforPackage sapforPackage) {
Vector<Integer> res = new Vector<>();
for (SapforPackageConfiguration sapforPackageConfiguration : sapforPackageConfigurations.Data.values()) {
if (sapforPackageConfiguration.sapforpackage_id == sapforPackage.id)
res.add(sapforPackageConfiguration.sapforconfiguration_id);
}
return res;
}
}