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
2023-10-07 21:02:01 +03:00
parent 4572214c45
commit 49805f1293
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@@ -7,13 +7,12 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/AllVariants.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/VariantsCoverage.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenarioSupervisor/SapforScenarioSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

4
src/Common/Global.java
View File

@@ -13,7 +13,7 @@ import Repository.Component.Sapfor.MessagesServer;
import Repository.Component.Sapfor.Sapfor_F; import Repository.Component.Sapfor.Sapfor_F;
import Repository.Component.Sapfor.TransformationPermission; import Repository.Component.Sapfor.TransformationPermission;
import Repository.Server.ComponentsServer; import Repository.Server.ComponentsServer;
import SapforTestingSystem.SapforTestingPlaner.SapforTestingPlanner; import SapforTestingSystem.SapforScenarioSupervisor.SapforScenarioSupervisor;
import TestingSystem.TestingServer; import TestingSystem.TestingServer;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -360,7 +360,7 @@ public class Global {
} }
}; };
Log.ClearLog(); Log.ClearLog();
SapforTestingPlanner planner = new SapforTestingPlanner(); SapforScenarioSupervisor planner = new SapforScenarioSupervisor();
planner.Start(); planner.Start();
} }
//--- //---

5
src/SapforTestingSystem/PerformSapforTask.java
View File

@@ -147,7 +147,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
} }
protected void variants() throws Exception { protected void variants() throws Exception {
//папки вариантов создается самим сапфором. //папки вариантов создается самим сапфором.
target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars -tinfo", target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars"
+ " -tinfo"
,
Constants.out_file, Constants.out_file,
Constants.err_file Constants.err_file
) ? TaskState.Done : TaskState.DoneWithErrors; ) ? TaskState.Done : TaskState.DoneWithErrors;

8
src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java → src/SapforTestingSystem/SapforScenarioSupervisor/SapforScenarioSupervisor.java
View File

@@ -1,4 +1,4 @@
package SapforTestingSystem.SapforTestingPlaner; package SapforTestingSystem.SapforScenarioSupervisor;
import Common.Constants; import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
@@ -12,10 +12,10 @@ import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.util.Date; import java.util.Date;
public class SapforTestingPlanner extends ThreadsPlanner { public class SapforScenarioSupervisor extends ThreadsPlanner {
PackageModeScenario_json scenario_json = null; PackageModeScenario_json scenario_json = null;
SapforScenarioResults_json results_json = new SapforScenarioResults_json(); SapforScenarioResults_json results_json = new SapforScenarioResults_json();
public SapforTestingPlanner() throws Exception { public SapforScenarioSupervisor() throws Exception {
super(Global.properties.threadsTimeout, Global.properties.threadsNum); super(Global.properties.threadsTimeout, Global.properties.threadsNum);
scenario_json = (PackageModeScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), PackageModeScenario_json.class); scenario_json = (PackageModeScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), PackageModeScenario_json.class);
results_json.StartDate = new Date().getTime(); results_json.StartDate = new Date().getTime();
@@ -59,7 +59,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
Utils.jsonToFile(results_json, new File(Global.Home, "results")); Utils.jsonToFile(results_json, new File(Global.Home, "results"));
// System.out.println("Очистка служебных файлов"); // System.out.println("Очистка служебных файлов");
//тут же и строить версии. //тут же и строить версии.
Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "bat","sh"); //Потом txt тоже добавить. Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep"); //Потом txt тоже добавить.
FileUtils.writeStringToFile(new File(Constants.DONE), ""); FileUtils.writeStringToFile(new File(Constants.DONE), "");
} catch (Exception e) { } catch (Exception e) {
Global.Log.PrintException(e); Global.Log.PrintException(e);

6
src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java Normal file
View File

@@ -0,0 +1,6 @@
package SapforTestingSystem.ServerSapforTestingPlanner;
public class ServerSapforTestingPlanner {
public void Perform(){
}
}

3
src/TestingSystem/TestingServer.java
View File

@@ -22,6 +22,7 @@ import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
import SapforTestingSystem.SapforScenario.SapforScenario; import SapforTestingSystem.SapforScenario.SapforScenario;
import SapforTestingSystem.SapforServerScenario_info; import SapforTestingSystem.SapforServerScenario_info;
import SapforTestingSystem.ServerSapfor.ServerSapfor; import SapforTestingSystem.ServerSapfor.ServerSapfor;
import SapforTestingSystem.ServerSapforTestingPlanner.ServerSapforTestingPlanner;
import TestingSystem.Group.Group; import TestingSystem.Group.Group;
import TestingSystem.Group.GroupInterface; import TestingSystem.Group.GroupInterface;
import TestingSystem.Tasks.TestCompilationTask; import TestingSystem.Tasks.TestCompilationTask;
@@ -222,6 +223,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} }
protected TestingPlanner testingPlanner = new TestingPlanner(); protected TestingPlanner testingPlanner = new TestingPlanner();
protected Thread testingThread = new Thread(() -> testingPlanner.Perform()); protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
protected ServerSapforTestingPlanner sapforTestingPlanner = new ServerSapforTestingPlanner();
protected Thread sapforTestingThread = new Thread(()-> sapforTestingPlanner.Perform());
//------>>> //------>>>
public static boolean checkTasks = false; public static boolean checkTasks = false;
//-- //--