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-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ public class Configuration extends riDBObject {
ConfigurationCache unpacked = new ConfigurationCache(this);
List<TestJson> actualTests = new Vector<>();
for (TestJson testJson : unpacked.testsJson.array) {
if (testJson.id==test.id)
if (testJson.id == test.id)
flag = true;
else actualTests.add(testJson);
}

3
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -5,7 +5,6 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -51,5 +50,5 @@ public class GroupsDBTable extends iDBTable<Group> {
}
return null;
}
// CheckCurrent(Log) && Global.mainModule.getAccount().CheckAuthorship(getCurrent().sender_address, Log);
// CheckCurrent(Log) && Global.mainModule.getAccount().CheckAuthorship(getCurrent().sender_address, Log);
}

8
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java
View File

@@ -33,8 +33,10 @@ public class GroupDialog extends DBObjectDialog<Group, GroupFields> {
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.cbType.setEnabled(false);;
fields.cbLanguage.setEnabled(false);;
fields.tfName.setEnabled(false);
fields.cbType.setEnabled(false);
;
fields.cbLanguage.setEnabled(false);
;
}
}

9
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
View File

@@ -1,10 +1,11 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Utils.TextLog;
import Common.Visual.*;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter;
@@ -15,9 +16,10 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class GroupsForm extends DataSetControlForm<Group> {
public class GroupsForm extends RDataSetControlForm<Group> {
public static boolean filterMyOnly = false;
public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -121,7 +123,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
protected DBObjectDialog getDialog() {
return new GroupDialog();
}
@Override
protected boolean isObjectEditable(Group object) {
if (Global.mainModule.getAccount().CheckRegistered(null)) {

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

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import _VisualDVM.*;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackageCredentials;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.net.InetAddress;

3
src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.TestingSystem.Common;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Passes.PassCode_;
import _VisualDVM.GlobalData.Machine.MachinesDBTable;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackageCredentials;
import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackagesCredentialsDBTable;
import java.nio.file.Paths;

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

@@ -1,5 +1,4 @@
package _VisualDVM.TestingSystem.Common.Settings;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.TextLog;
//предопределенный набор настроек тестируемой системы. сохраняется для упрощения.

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

@@ -2,13 +2,10 @@ package _VisualDVM.TestingSystem.Common.Test;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
@@ -30,7 +27,7 @@ public class Test extends riDBObject {
@Description("DEFAULT -1")
public int group_id = CommonConstants.Nan;
@Description("DEFAULT ''")
public String extended_description="";
public String extended_description = "";
@Description("DEFAULT ''")
public String packedFilesJson = "";
//--------------------------------------------->>>
@@ -53,7 +50,7 @@ public class Test extends riDBObject {
args = t.args;
group_id = t.group_id;
extended_description = t.extended_description;
packedFilesJson=t.packedFilesJson;
packedFilesJson = t.packedFilesJson;
}
@Override
public void select(boolean flag) {
@@ -110,7 +107,7 @@ public class Test extends riDBObject {
res.put(LanguageName.c, new Vector<>());
res.put(LanguageName.cpp, new Vector<>());
//--
TestFilesJson json = Utils_.gson.fromJson(packedFilesJson,TestFilesJson.class);
TestFilesJson json = Utils_.gson.fromJson(packedFilesJson, TestFilesJson.class);
for (TestFileJson file : json.values) {
//--
if (file.type.equals(FileType.program) &&

5
src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -25,7 +24,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
+
Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);
}
Utils.validateFileShortNewName(fields.tfName.getText(),Log);
Utils.validateFileShortNewName(fields.tfName.getText(), Log);
}
@Override
public void fillFields() {
@@ -37,7 +36,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.extended_description=fields.taExtendedDescription.getText();
Result.extended_description = fields.taExtendedDescription.getText();
Result.min_dim = (int) fields.sMinDim.getValue();
Result.max_dim = (int) fields.sMaxDim.getValue();
if (!edit) {

11
src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter;
@@ -13,9 +12,10 @@ import _VisualDVM.ServerObjectsCache.TestCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class TestsForm extends DataSetControlForm<Test> {
public class TestsForm extends RDataSetControlForm<Test> {
public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -31,7 +31,7 @@ public class TestsForm extends DataSetControlForm<Test> {
new ColumnInfo<Test>("описание") {
@Override
public Object getFieldAt(Test object) {
return object.extended_description.replace("\n",";\n");
return object.extended_description.replace("\n", ";\n");
}
@Override
public Class getRendererClass() {
@@ -47,7 +47,7 @@ public class TestsForm extends DataSetControlForm<Test> {
new ColumnInfo<Test>("файлы") {
@Override
public Object getFieldAt(Test object) {
return ((TestCache)VisualCaches.GetCache(object)).srcNames;
return ((TestCache) VisualCaches.GetCache(object)).srcNames;
}
}
);
@@ -61,7 +61,7 @@ public class TestsForm extends DataSetControlForm<Test> {
return new DataMenuBar(dataSource.getPluralDescription()) {
{
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DetectSelectedTestsMinMaDim,PassCode.DownloadTest, PassCode.DeleteTest);
addPasses(PassCode.DetectSelectedTestsMinMaDim, PassCode.DownloadTest, PassCode.DeleteTest);
}
};
}
@@ -74,7 +74,6 @@ public class TestsForm extends DataSetControlForm<Test> {
protected DBObjectDialog getDialog() {
return new TestDialog();
}
@Override
protected boolean isObjectEditable(Test object) {
if (Global.mainModule.getAccount().CheckRegistered(null)) {

9
src/_VisualDVM/TestingSystem/Common/TestingClient.java
View File

@@ -1,15 +1,6 @@
package _VisualDVM.TestingSystem.Common;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.RepositoryPass;
import _VisualDVM.Repository.Server.RepositoryServerClient;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import java.io.FileWriter;
import java.io.Serializable;
import java.util.Date;
public abstract class TestingClient extends RepositoryServerClient<TestingServer> {
@Override
protected TestingServer getServer() {

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

@@ -25,9 +25,6 @@ public abstract class TestingPackage<J> extends riDBObject {
public int progress = 0; //прогресс выполнения
public long StartDate = 0;
public long ChangeDate = 0;
public long getMilliseconds() {
return ((StartDate != 0) && (ChangeDate != 0)) ? ChangeDate - StartDate : 0;
}
@Description("DEFAULT 0")
public int connectionErrosCount = 0;
public TasksPackageState state = TasksPackageState.Draft;
@@ -41,6 +38,9 @@ public abstract class TestingPackage<J> extends riDBObject {
}
public TestingPackage() {
}
public long getMilliseconds() {
return ((StartDate != 0) && (ChangeDate != 0)) ? ChangeDate - StartDate : 0;
}
//--
@Override
public void SynchronizeFields(DBObject src) {

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

@@ -159,11 +159,9 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
Kill();
UpdatePackageState(TasksPackageState.Aborted);
ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
}
else if (checkIfPaused()) {
} else if (checkIfPaused()) {
UpdatePackageState(TasksPackageState.Paused);
}
else {
} else {
//--
switch (testingPackage.state) {
case TestsSynchronize:
@@ -184,7 +182,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
UpdatePackageState(TasksPackageState.Analysis);
break;
case Paused:
if (!checkIfPaused()&&CheckNextState())
if (!checkIfPaused() && CheckNextState())
UpdatePackage();
break;
default:

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

@@ -69,19 +69,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
super(TestsDatabase.class);
name = Utils_.getDateName("testingServer");
}
@Override
public void StartAction() throws Exception {
try {
machines_db = new MachinesDatabase();
machines_db.Activate();
} catch (Exception ex) {
ex.printStackTrace();
}
}
@Override
protected void extraBackup(File todayBackUp) {
zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
}
public static void TimerOn() {
checkTimer = new Timer(Global.normalProperties.CheckTestingIntervalSeconds * 1000, e -> {
Global.mainModule.getPass(PassCode.ActualizePackages).Do();
@@ -97,6 +84,19 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
TimerOn();
}
@Override
public void StartAction() throws Exception {
try {
machines_db = new MachinesDatabase();
machines_db.Activate();
} catch (Exception ex) {
ex.printStackTrace();
}
}
@Override
protected void extraBackup(File todayBackUp) {
zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
}
@Override
public void afterPublishAction(DBObject object) throws Exception {
if (object instanceof Test) {
Test test = (Test) object;
@@ -306,7 +306,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
Log.toString()
);
for (String address : Constants.admins_mails)
EmailMessagesQueue.add(new Pair<>(address,message));
EmailMessagesQueue.add(new Pair<>(address, message));
}
void DownloadTest() throws Exception {
int test_id = Integer.parseInt(request.arg);

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

@@ -6,7 +6,6 @@ import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -204,9 +203,9 @@ public class TestsDatabase extends SQLiteDatabase {
test.sender_name = account.name;
test.sender_address = account.email;
test.group_id = group.id;
TestFilesJson testFilesJson=new TestFilesJson();
TestFilesJson testFilesJson = new TestFilesJson();
testFilesJson.values.add(new TestFileJson(new ProjectFile(file)));
test.packedFilesJson=Utils_.gson.toJson(testFilesJson);
test.packedFilesJson = Utils_.gson.toJson(testFilesJson);
Insert(test);
//->>
SaveTestFromSingleFile(sapfor, group, test, file);
@@ -282,8 +281,8 @@ public class TestsDatabase extends SQLiteDatabase {
}
return null;
}
public ServerSapfor getSapforForVersion(String version_in){
for (ServerSapfor serverSapfor: serverSapfors.Data.values()){
public ServerSapfor getSapforForVersion(String version_in) {
for (ServerSapfor serverSapfor : serverSapfors.Data.values()) {
if (serverSapfor.version.equals(version_in))
return serverSapfor;
}
@@ -319,7 +318,7 @@ public class TestsDatabase extends SQLiteDatabase {
//todo возможно рассмотреть вариант с синхроннизацией тестов для пакетов через команду серверу а не в нити
//во избежание конфликта доступа,или удалением тестов во время копирования(?)
@Override
public void DropUI(){
public void DropUI() {
super.DropUI();
dvmConfigurations.ClearUI();
groups.ClearUI();
@@ -331,7 +330,7 @@ public class TestsDatabase extends SQLiteDatabase {
dvmSettings.ClearUI();
}
@Override
public void ResetUI(){
public void ResetUI() {
VisualCaches.ClearDataForClass(DVMConfiguration.class);
VisualCaches.ClearDataForClass(SapforConfiguration.class);
VisualCaches.ClearDataForClass(DVMPackage.class);

5
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -14,9 +13,10 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
public class DVMConfigurationsForm extends RDataSetControlForm<DVMConfiguration> {
public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -124,6 +124,5 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
}
);
}
}

40
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -73,7 +73,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
Vector<Pair<String, String>> params = settingsCache.getTasksParameters();
//---
for (Pair<String, String> p: params) {
for (Pair<String, String> p : params) {
//--
String options_ = Global.normalProperties.CompleteCompilationOptions ?
completeOptions(p.getKey()) : p.getKey();
@@ -96,7 +96,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
environments_,
kernels
));
}else {
} else {
for (String matrix : matrixes) {
compilationTask.runTasks.add(new DVMRunTask(
configuration,
@@ -123,6 +123,23 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
super(p);
this.SynchronizeFields(p);
}
public static String completeOptions(String flags_in) {
if (!flags_in.contains("-shared-dvm")) {
if (flags_in.isEmpty())
return "-shared-dvm";
else return flags_in + " -shared-dvm";
} else
return flags_in;
}
public static String completeEnvironments(String environmentsSet_in) {
if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
if (environmentsSet_in.isEmpty())
return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
else
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
} else
return environmentsSet_in;
}
@Override
public Class getJsonClass() {
return DVMPackage_json.class;
@@ -151,25 +168,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
@Override
public void checkFinishState() throws Exception {
}
public String getMachineURL(){
public String getMachineURL() {
return machine_address + ":" + machine_port;
}
public static String completeOptions(String flags_in) {
if (!flags_in.contains("-shared-dvm")) {
if (flags_in.isEmpty())
return "-shared-dvm";
else return flags_in + " -shared-dvm";
} else
return flags_in;
}
public static String completeEnvironments(String environmentsSet_in) {
if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
if (environmentsSet_in.isEmpty())
return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
else
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
} else
return environmentsSet_in;
}
}

13
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -2,29 +2,24 @@ package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMilliseconds;
import Common.Visual.Tables.RendererProgressBar;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.Visual.RDataSetControlForm;
import _VisualDVM.Visual.Tables.RendererTestingPackageStatus;
import javax.swing.*;
import java.util.Comparator;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public class DVMPackagesForm extends RDataSetControlForm<DVMPackage> {
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -154,7 +149,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
{
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.PauseDVMPackage,PassCode.ResumeDVMPackage,PassCode.AbortDVMPackage);
addPasses(PassCode.PauseDVMPackage, PassCode.ResumeDVMPackage, PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.RefreshDVMPackageResults,
@@ -199,7 +194,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
return object.state.equals(TasksPackageState.DoneWithErrors);
}
}
);
);
}
@Override
protected Comparator<DVMPackage> getDefaultComparator() {

2
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
View File

@@ -49,7 +49,7 @@ public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFi
Result.Is_DVM_STAT = fields.cbDvmStat.isSelected() ? 1 : 0;
//--
Result.packedCompilationOptionsJson = Utils_.gson.toJson(fields.optionsLines.toJson());
Result.packedRunEnvironmentValuesJson= Utils_.gson.toJson(fields.environmentsLines.toJson());
Result.packedRunEnvironmentValuesJson = Utils_.gson.toJson(fields.environmentsLines.toJson());
}
@Override
public void SetReadonly() {

29
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
View File

@@ -3,13 +3,9 @@ import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsSetJson;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import _VisualDVM.GlobalData.CompilerOption.OptionsLinesSet;
import javax.swing.*;
@@ -22,22 +18,28 @@ public class DVMSettingsFields implements DialogFields {
public JCheckBox cbCube;
public JTextField tfEnvironments;
public JCheckBox cbDvmStat;
private JPanel content;
public JButton bAddFlags;
public JButton bAddEnvironments;
public JButton bDeleteFlags;
public JButton bDeleteEnvironment;
//
public OptionsLinesSet optionsLines;
public EnvironmentsLinesSet environmentsLines;
private JPanel content;
private JPanel optionsLinesPanel;
private JPanel environmentsLinesPanel;
private JSplitPane SC1;
private JSplitPane SC2;
//
public OptionsLinesSet optionsLines;
public EnvironmentsLinesSet environmentsLines;
public DVMSettingsFields() {
sMinDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
sMaxDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
sMaxProc.setModel(new SpinnerNumberModel(0, 0, 128, 1));
//-
}
//
public void fillOptionsLines(String packed) {
OptionsSetJson optionsSetJson = packed.isEmpty() ? new OptionsSetJson() : Utils_.gson.fromJson(packed, OptionsSetJson.class);
optionsLines= new OptionsLinesSet(optionsSetJson);
optionsLines = new OptionsLinesSet(optionsSetJson);
//-
//-Это нужно для того, чтобы старый меню бар был пересоздан. бары создаются один раз в целях экономии памяти.
// В противном случае бар его проходы добавления редактирования и удаления
@@ -49,20 +51,13 @@ public class DVMSettingsFields implements DialogFields {
}
public void fillEnvironmentsLines(String packed) {
EnvironmentsSetJson environmentsSetJson = packed.isEmpty() ? new EnvironmentsSetJson() : Utils_.gson.fromJson(packed, EnvironmentsSetJson.class);
environmentsLines =new EnvironmentsLinesSet(environmentsSetJson);
environmentsLines = new EnvironmentsLinesSet(environmentsSetJson);
//-
if (MainModule_.instance.getUI().menuBars.containsKey(EnvironmentsLinesSet.class))
MainModule_.instance.getUI().menuBars.remove(EnvironmentsLinesSet.class);
environmentsLines.mountUI(environmentsLinesPanel);
environmentsLines.ShowUI();
}
public DVMSettingsFields() {
sMinDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
sMaxDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
sMaxProc.setModel(new SpinnerNumberModel(0, 0, 128, 1));
//-
}
@Override
public Component getContent() {
return content;

6
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
View File

@@ -2,22 +2,20 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public class DVMSettingsForm extends RDataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}

3
src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.TestingSystem.DVM.PackageCredentials;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
public class DVMPackageCredentials extends iDBObject {
public int dvmpackage_id = CommonConstants.Nan;

7
src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java
View File

@@ -1,13 +1,12 @@
package _VisualDVM.TestingSystem.DVM.PackageCredentials;
import Common.Database.Tables.iDBTable;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
public class DVMPackagesCredentialsDBTable extends iDBTable<DVMPackageCredentials> {
public DVMPackagesCredentialsDBTable() {
super(DVMPackageCredentials.class);
}
public DVMPackageCredentials getForPackageId(int dvmPackage_id){
for (DVMPackageCredentials dvmPackageCredentials: Data.values()){
if (dvmPackageCredentials.dvmpackage_id==dvmPackage_id)
public DVMPackageCredentials getForPackageId(int dvmPackage_id) {
for (DVMPackageCredentials dvmPackageCredentials : Data.values()) {
if (dvmPackageCredentials.dvmpackage_id == dvmPackage_id)
return dvmPackageCredentials;
}
return null;

3
src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

@@ -177,8 +177,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
File unpacked_results = new File(packageLocalWorkspace.getAbsolutePath(), "results");
try {
Utils_.forceDeleteWithCheck(unpacked_results);
}
catch (Exception ex){
} catch (Exception ex) {
ex.printStackTrace();
}
}

3
src/_VisualDVM/TestingSystem/DVM/UserConnection.java
View File

@@ -252,7 +252,7 @@ public class UserConnection {
boolean planner = module_name.equals("planner");
String flags = planner ? getAvailibleCPPStandard(modulesDirectory) : "";
String command = "g++ -O3 " + flags + " " + Utils_.DQuotes(module_name + ".cpp") + " -o " + Utils_.DQuotes(module_name);
if (planner&& flags.contains("c++17")) command+=" -lstdc++fs";
if (planner && flags.contains("c++17")) command += " -lstdc++fs";
RemoteFile binary = new RemoteFile(modulesDirectory, module_name);
//--
if (Exists(binary))
@@ -476,7 +476,6 @@ public class UserConnection {
System.gc();
}
*/
public void waitForFileCreation(RemoteFile file) throws Exception {
while (!Exists(file)) {
System.out.println(file.full_name + " NOT FOUND");

7
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
View File

@@ -160,13 +160,12 @@ public class SapforVersion_json implements Serializable {
ex.printStackTrace();
}
return text1.equalsIgnoreCase(text2);
// if (!Utils.compareFortranTexts(text1, text2)) {
// return false;
// }
// if (!Utils.compareFortranTexts(text1, text2)) {
// return false;
// }
}
return true;
}
public MessageError unpackMessage(String line_in) throws Exception {
MessageError res = new MessageError();
res.file = "";

2
src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
View File

@@ -60,7 +60,7 @@ public class PerformSapforTask extends Pass<SapforTask> {
}
//слегка изменить подход.
protected boolean transformation(PassCode code) throws Exception {
task = new File(parentTask, code.equals(PassCode.SPF_SharedMemoryParallelization)?"p1":"v1" );
task = new File(parentTask, code.equals(PassCode.SPF_SharedMemoryParallelization) ? "p1" : "v1");
Utils_.CheckAndCleanDirectory(task); //папка для преобразования.
//если версия пустая, это тоже результат тестирования. Поэтому должна учитываться в древе.
target.versions.add(version_json = new SapforVersion_json(

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

@@ -22,7 +22,7 @@ public class SapforConfiguration extends Configuration {
//--
Vector<Group> groups = cache.getGroups();
Vector<SapforSettings> settingsArray = cache.getSettings();
Vector<Test> tests= cache.getTests();
Vector<Test> tests = cache.getTests();
//--
Vector<LanguageName> groupsLanguages = new Vector<>();
for (Group group : groups) {

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

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -15,11 +14,12 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.Visual.RDataSetControlForm;
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
import javax.swing.*;
public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
public class SapforConfigurationsForm extends RDataSetControlForm<SapforConfiguration> {
public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -117,9 +117,9 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
@Override
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
if (current.ethalon_id!=CommonConstants.Nan){
if (current.ethalon_id != CommonConstants.Nan) {
Global.testingServer.db.sapforPackages.getUI().SetCurrentByPK(current.ethalon_id);
}else {
} else {
Global.testingServer.db.sapforPackages.getUI().ClearSelection();
}
}

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -75,7 +75,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
SapforPackage p = (SapforPackage) src;
sapforId = p.sapforId;
ethalon_id = p.ethalon_id;
mismatchesCount=p.mismatchesCount;
mismatchesCount = p.mismatchesCount;
}
@Override
public Class getJsonClass() {
@@ -107,9 +107,9 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
double percent = (((double) (good)) / tasksCount) * 100.0;
description = "Выполнено на " + ((int) percent) + "%\n" +
"Всего задач: " + tasksCount + ", из них с ошибками " + bad;
doneTasksCount= good;
doneTasksCount = good;
}
public boolean canCompare(SapforPackage package2, TextLog log){
public boolean canCompare(SapforPackage package2, TextLog log) {
if (package_json.tasks.size() != package2.package_json.tasks.size()) {
log.Writeln_("Количество задач в пакетах не совпадает!");
return false;

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

@@ -2,22 +2,24 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.*;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMilliseconds;
import Common.Visual.Tables.RendererProgressBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.RDataSetControlForm;
import _VisualDVM.Visual.Tables.RendererTestingPackageStatus;
import javax.swing.*;
import java.util.Comparator;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -178,8 +180,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return object.state.equals(TasksPackageState.DoneWithErrors);
}
}
);
);
}
}

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -11,9 +10,10 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
public class SapforSettingsForm extends RDataSetControlForm<SapforSettings> {
public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -40,7 +40,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
}
);
}
@Override
protected void createFilters() {
AddFilters(new HeaderTextFilter<>(dataSource, 2, 65),

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -9,9 +8,10 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> {
public class SapforSettingsCommandsForm extends RDataSetControlForm<SapforSettingsCommand> {
public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}

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

@@ -226,13 +226,12 @@ public class SapforTask extends DBObject {
}
@Override
public String toString() {
return
"#" + id + " группа "
+ Utils_.Brackets(group_description) +
" тест " + Utils_.Brackets(test_description)
+ " параметры "
+ Utils_.Brackets(configuration_description.isEmpty()?sapfor_configuration_id: configuration_description);
+ Utils_.Brackets(configuration_description.isEmpty() ? sapfor_configuration_id : configuration_description);
// getUniqueKey();
}
public String getPassesInfo() {

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
View File

@@ -1,11 +1,9 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Utils.Utils_;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
public ImageIcon getIcon() {
// Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
// Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
ImageIcon res = new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
return (getImageKey() != null) ? res : null;
}

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

@@ -43,7 +43,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
repo = new File(Utils_.getHomeDirectory(), "Repo");
repo_sapfor = new File(repo, "SAPFOR");
//-
repo_sapfor_installation_directory =new File(repo_sapfor, "install");
repo_sapfor_installation_directory = new File(repo_sapfor, "install");
repo_out = new File(repo_sapfor_installation_directory, Constants.out_file);
repo_err = new File(repo_sapfor_installation_directory, Constants.err_file);
repo_sapfor_assembly = new File(repo_sapfor_installation_directory, "Sapfor_F");
@@ -238,7 +238,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
Utils.CleanDirectory(repo);
Utils.startScript(repo, repo, "git_clone",
"git clone " + Constants.SAPFOR_REPOSITORY + " " +
Utils_.DQuotes(repo_sapfor)+
Utils_.DQuotes(repo_sapfor) +
" 1>spf_out.txt 2>spf_err.txt\n").waitFor();
}
void CompileSapfor() throws Exception {
@@ -247,7 +247,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
Utils_.CheckAndCleanDirectory(repo_sapfor_installation_directory);
//--
Utils.startScript(repo_sapfor_installation_directory, repo_sapfor_installation_directory, "build_sapfor",
"cmake .. 1>" + Constants.out_file + " 2>" + Constants.err_file +
"cmake .. 1>" + Constants.out_file + " 2>" + Constants.err_file +
"\nmake -j 14 1>>" +
Constants.out_file +
" 2>>" +
@@ -293,7 +293,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
FileUtils.copyFile(repo_sapfor_assembly, sapforBin);
sapforBin.setExecutable(true, false);
//--
sapfor.call_command = sapforBin.getAbsolutePath();
sapfor.buildDate = new Date().getTime();
//--

8
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -22,18 +22,18 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ServerSapforsForm(this, mountPanel);
}
public ServerSapfor getLastDoneVersion(){
public ServerSapfor getLastDoneVersion() {
Vector<ServerSapfor> versions = new Vector<>();
for (ServerSapfor serverSapfor: Data.values()){
for (ServerSapfor serverSapfor : Data.values()) {
if (serverSapfor.state.equals(ServerSapforState.Done))
versions.add(serverSapfor);
}
versions.sort(new Comparator<ServerSapfor>() {
@Override
public int compare(ServerSapfor o1, ServerSapfor o2) {
return Long.compare(o1.buildDate,o2.buildDate);
return Long.compare(o1.buildDate, o2.buildDate);
}
});
return versions.isEmpty()?null:versions.lastElement();
return versions.isEmpty() ? null : versions.lastElement();
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate;
@@ -9,10 +8,11 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
import java.util.Comparator;
public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
public class ServerSapforsForm extends RDataSetControlForm<ServerSapfor> {
public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}