рефакторинг конфигураций тестирования сапфор. кнфигурация сделана как пара - набор тестов+ наборы настроек. наборы настроек стали отдельным объектом
This commit is contained in:
@@ -1,10 +0,0 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Global;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
|
||||
import Visual_DVM_2021.Passes.Server.DeleteServerObjects;
|
||||
public class DeleteSapforConfigurationCommand extends DeleteServerObjects<TestingServer, SapforConfigurationCommand> {
|
||||
public DeleteSapforConfigurationCommand() {
|
||||
super(Global.testingServer, SapforConfigurationCommand.class);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Global;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
|
||||
import Visual_DVM_2021.Passes.Server.EditServerObject;
|
||||
public class EditSapforConfigurationCommand extends EditServerObject<TestingServer,SapforConfigurationCommand> {
|
||||
public EditSapforConfigurationCommand() {
|
||||
super(Global.testingServer,SapforConfigurationCommand.class);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Global;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
|
||||
import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
|
||||
import Visual_DVM_2021.Passes.Server.EditServerObject;
|
||||
public class EditSapforSettingsCommand extends EditServerObject<TestingServer, SapforSettingsCommand> {
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
|
||||
import Visual_DVM_2021.Passes.Server.PublishServerObject;
|
||||
public class PublishSapforConfigurationCommand extends PublishServerObject<TestingServer, SapforConfigurationCommand> {
|
||||
public PublishSapforConfigurationCommand() {
|
||||
super(Global.testingServer, SapforConfigurationCommand.class);
|
||||
}
|
||||
@Override
|
||||
public boolean fillObjectFields() throws Exception {
|
||||
target.sapforconfiguration_id = Current.getSapforConfiguration().id;
|
||||
return super.fillObjectFields();
|
||||
}
|
||||
@Override
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
return Current.Check(Log, Current.SapforConfiguration)&&super.canStart(args);
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
|
||||
import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
|
||||
import Visual_DVM_2021.Passes.Server.PublishServerObject;
|
||||
public class PublishSapforSettingsCommand extends PublishServerObject<TestingServer, SapforSettingsCommand> {
|
||||
|
||||
@@ -1,17 +1,11 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import TestingSystem.Common.Group.Group;
|
||||
import TestingSystem.Common.Test.Test;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||
import Visual_DVM_2021.Passes.SaveCurrentConfiguration;
|
||||
import Visual_DVM_2021.Passes.Server.EditServerObject;
|
||||
|
||||
import java.util.Vector;
|
||||
public class SaveCurrentDVMConfiguration extends SaveCurrentConfiguration<DVMConfiguration> {
|
||||
public class SaveCurrentDVMConfiguration extends SaveCurrentConfiguration<DVMConfiguration, DVMSettings> {
|
||||
public SaveCurrentDVMConfiguration() {
|
||||
super(DVMConfiguration.class);
|
||||
super(DVMConfiguration.class, DVMSettings.class);
|
||||
}
|
||||
@Override
|
||||
public Current currentName() {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Current;
|
||||
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||
import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
||||
import Visual_DVM_2021.Passes.SaveCurrentConfiguration;
|
||||
public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration<SapforConfiguration> {
|
||||
public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration<SapforConfiguration, SapforSettings> {
|
||||
public SaveCurrentSAPFORConfiguration() {
|
||||
super(SapforConfiguration.class);
|
||||
super(SapforConfiguration.class, SapforSettings.class);
|
||||
}
|
||||
@Override
|
||||
public Current currentName() {
|
||||
|
||||
@@ -1,9 +1,30 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.UI.VisualCache.ConfigurationCache;
|
||||
import Common.UI.VisualCache.SapforConfigurationCache;
|
||||
import Common.UI.VisualCache.VisualCaches;
|
||||
import TestingSystem.Common.Settings.Settings;
|
||||
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||
import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
||||
import Visual_DVM_2021.Passes.ShowCurrentConfigurationTests;
|
||||
public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests {
|
||||
|
||||
import java.util.Vector;
|
||||
public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests<SapforConfiguration> {
|
||||
@Override
|
||||
public Current currentName() {
|
||||
return Current.SapforConfiguration;
|
||||
}
|
||||
@Override
|
||||
protected void showDone() throws Exception {
|
||||
super.showDone();
|
||||
SapforConfigurationCache cache = (SapforConfigurationCache) VisualCaches.GetCache(target);
|
||||
Vector<SapforSettings> settings = cache.getSettings();
|
||||
for (SapforSettings s: settings)
|
||||
s.Select(true);
|
||||
//--
|
||||
if (!settings.isEmpty()){
|
||||
Global.testingServer.db.sapforSettings.ShowUI(settings.lastElement().id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user