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 02:14:23 +03:00
parent 10c213feae
commit f6cc447481
35 changed files with 526 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
View File

@@ -24,7 +24,9 @@ public class SapforTestingSet_json implements Serializable {
public SapforTestingSet_json(Vector<Test> tests_in, SapforConfiguration configuration) {
for (Test test : tests_in)
tests.add(new SapforTest_json(test));
/*
for (SapforSettings sapforSettings : ((SapforConfigurationCache) VisualCaches.GetCache(configuration)).getSettings())
configurations.add(new SapforConfiguration_json(sapforSettings));
*/
}
}

43
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
View File

@@ -2,31 +2,47 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Utils.TextLog;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Settings.Settings;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigurationSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforConfiguration extends Configuration {
@Description("DEFAULT -1")
public int ethalon_id = CommonConstants.Nan; //пакет-эталон ( в двм тестировании не нужен.)
@Description("IGNORE")
public Vector<SapforConfigurationGroup> configurationGroups = null;
public Vector<SapforConfigurationGroup> groups = null;
@Description("IGNORE")
public Vector<SapforConfigurationTest> tests = null;
@Description("IGNORE")
public Vector<SapforConfigurationSettings> settings = null;
//--
public String printEthalon() {
return (ethalon_id == CommonConstants.Nan) ? "—" : String.valueOf(ethalon_id);
}
public void saveGroups(Vector<Group> groups) {
configurationGroups = new Vector<>();
for (Group group: groups)
configurationGroups.add(new SapforConfigurationGroup(this, group));
public void saveGroups(Vector<Group> groups_in) {
groups = new Vector<>();
for (Group group : groups_in)
groups.add(new SapforConfigurationGroup(this, group));
}
@Override
public void saveTests(Vector<Test> tests_in) {
tests = new Vector<>();
for (Test test:tests_in)
tests.add(new SapforConfigurationTest(this, test));
}
@Override
public void saveSettings(Vector<Settings> settings_in) {
settings =new Vector<>();
for (Settings sapforSettings: settings_in)
settings.add(new SapforConfigurationSettings(this, (SapforSettings) sapforSettings));
}
@Override
public void SynchronizeFields(DBObject src) {
@@ -41,10 +57,8 @@ public class SapforConfiguration extends Configuration {
}
@Override
public boolean validate(TextLog Log) {
/*
SapforConfigurationCache cache = (SapforConfigurationCache) VisualCaches.GetCache(this);
//--
Vector<Integer> groups_ids = Global.testingServer.db.getSapforConfigurationGroupsIds();
Vector<Integer>tests_ids = ;
Vector<Group> groups = cache.getGroups();
Vector<SapforSettings> settingsArray = cache.getSettings();
Vector<Test> tests = cache.getTests();
@@ -78,7 +92,6 @@ public class SapforConfiguration extends Configuration {
}
}
//-
*/
return Log.isEmpty();
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -6,10 +6,9 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Vector_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup.DVMConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationGroup.SapforConfigurationGroup;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
import javax.swing.*;
import java.util.LinkedHashMap;
@@ -30,6 +29,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
res.put(SapforConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
return res;
}
@Override

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
View File

@@ -85,7 +85,7 @@ public class SapforConfigurationsForm extends RDataSetControlForm<SapforConfigur
new ColumnInfo<SapforConfiguration>("тестов") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).getTestsCount();
return ((ConfigurationCache) VisualCaches.GetCache(object)).testsCount;
}
},
new ColumnInfo<SapforConfiguration>("эталон") {

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java
View File

@@ -22,7 +22,4 @@ public class SapforConfigurationGroup extends iDBObject {
sapforconfiguration_id = src_.sapforconfiguration_id;
group_id = src_.group_id;
}
public boolean isEqual(SapforConfigurationGroup group_in) {
return sapforconfiguration_id == group_in.sapforconfiguration_id && group_id == group_in.group_id;
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroupsDBTable.java
View File

@@ -4,5 +4,9 @@ public class SapforConfigurationGroupsDBTable extends iDBTable<SapforConfigurati
public SapforConfigurationGroupsDBTable() {
super(SapforConfigurationGroup.class);
}
@Override
public boolean isEqual(SapforConfigurationGroup o1, SapforConfigurationGroup o2) {
return o1.sapforconfiguration_id==o2.sapforconfiguration_id&&o1.group_id==o2.group_id;
}
}

14
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettings.java Normal file
View File

@@ -0,0 +1,14 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
public class SapforConfigurationSettings extends iDBObject {
public int sapforconfiguration_id = CommonConstants.Nan;
public int sapforsettings_id = CommonConstants.Nan;
public SapforConfigurationSettings(){}
public SapforConfigurationSettings(SapforConfiguration sapforConfiguration, SapforSettings settings) {
sapforconfiguration_id = sapforConfiguration.id;
sapforsettings_id = settings.id;
}
}

11
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettingsDBTable.java Normal file
View File

@@ -0,0 +1,11 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings;
import Common.Database.Tables.iDBTable;
public class SapforConfigurationSettingsDBTable extends iDBTable<SapforConfigurationSettings> {
public SapforConfigurationSettingsDBTable() {
super(SapforConfigurationSettings.class);
}
@Override
public boolean isEqual(SapforConfigurationSettings o1, SapforConfigurationSettings o2) {
return o1.sapforconfiguration_id==o2.sapforconfiguration_id && o1.sapforsettings_id==o2.sapforsettings_id;
}
}

25
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTest.java Normal file
View File

@@ -0,0 +1,25 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
public class SapforConfigurationTest extends iDBObject {
public int sapforconfiguration_id = CommonConstants.Nan;
public int test_id = CommonConstants.Nan;
public SapforConfigurationTest(){
}
public SapforConfigurationTest(SapforConfiguration sapforConfiguration, Test test) {
sapforconfiguration_id = sapforConfiguration.id;
test_id = test.id;
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
SapforConfigurationTest src_ = (SapforConfigurationTest) src;
sapforconfiguration_id = src_.sapforconfiguration_id;
test_id = src_.test_id;
}
}

11
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTestsDBTable.java Normal file
View File

@@ -0,0 +1,11 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest;
import Common.Database.Tables.iDBTable;
public class SapforConfigurationTestsDBTable extends iDBTable<SapforConfigurationTest>{
public SapforConfigurationTestsDBTable() {
super(SapforConfigurationTest.class);
}
@Override
public boolean isEqual(SapforConfigurationTest o1, SapforConfigurationTest o2) {
return o1.sapforconfiguration_id==o2.sapforconfiguration_id && o1.test_id==o2.test_id;
}
}