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

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

@@ -33,7 +33,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
res.put(SapforConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforConfigurationSettings.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
res.put(SapforPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.NONE, FKCurrentObjectBehaviuor.PASSIVE));
return res;
}
@Override

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -10,7 +10,7 @@ import Common.Visual.Tables.RendererMilliseconds;
import Common.Visual.Tables.RendererProgressBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.SapforPackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
@@ -41,7 +41,7 @@ public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
new ColumnInfo<SapforPackage>("конфигурации") {
@Override
public Object getFieldAt(SapforPackage object) {
return ((PackageCache) VisualCaches.GetCache(object)).getConfifurationsDescriptionsLine();
return ((SapforPackageCache) VisualCaches.GetCache(object)).confifurationsDescriptionsLine;
}
},
new ColumnInfo<SapforPackage>("задач") {

1
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java
View File

@@ -4,4 +4,5 @@ import Common.Database.Objects.iDBObject;
public class SapforPackageConfiguration extends iDBObject {
public int sapforpackage_id = CommonConstants.Nan;
public int sapforconfiguration_id = CommonConstants.Nan;
public String description ="";
}

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java
View File

@@ -1,12 +1,11 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration;
import Common.Database.Tables.iDBTable;
import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
public class SapforPackageConfigurationsDBTable extends iDBTable<SapforPackageConfiguration> {
public SapforPackageConfigurationsDBTable() {
super(SapforPackageConfiguration.class);
}
@Override
public boolean isEqual(SapforPackageConfiguration o1, SapforPackageConfiguration o2) {
return o1.sapforpackage_id==o2.sapforpackage_id && o1.sapforconfiguration_id==o2.sapforconfiguration_id;
return o1.sapforpackage_id == o2.sapforpackage_id && o1.sapforconfiguration_id == o2.sapforconfiguration_id;
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -194,8 +194,8 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
}
Print("сравнение завершено");
log.Writeln_("Различий с эталоном: " + testingPackage.mismatchesCount);
if (testingPackage.mismatchesCount>0){
testingPackage.doneTasksCount-=testingPackage.mismatchesCount;
if (testingPackage.mismatchesCount > 0) {
testingPackage.doneTasksCount -= testingPackage.mismatchesCount;
testingPackage.state = TasksPackageState.DoneWithErrors;
}
return;