M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

промежуточный. тестирование в пакетном режиме работает в том числе и на пареллельных нитях. осталось анализ результатов сделать, и проверить линукс

Browse Source
This commit is contained in:
02090095
2023-09-30 01:58:18 +03:00
parent 846dc71802
commit 3373d2e704
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -8,6 +8,9 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

4
properties
View File

@@ -25,5 +25,7 @@
"InstructionPath": "",
"PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10,
"SapforTaskMaxId": 4212
"SapforTaskMaxId": 4212,
"threadsNum": 1,
"threadsTimeout": 2000
}

4
src/Common/GlobalProperties.java
View File

@@ -66,6 +66,10 @@ public class GlobalProperties extends Properties {
public int ComponentsBackUpsCount=10;
@Expose
public long SapforTaskMaxId = 0; //вероятно, временно. когда перейдем на удаленную машину.
@Expose
public int threadsNum=1;//для пакетного режима.
@Expose
public int threadsTimeout = 2000; //для пакетного режима.
//-
@Override
public String getFieldDescription(String fieldName) {

2
src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
View File

@@ -10,7 +10,7 @@ import java.io.File;
import java.nio.file.Paths;
public class SapforTestingPlanner extends ThreadsPlanner {
public SapforTestingPlanner() throws Exception {
super(2000, 1);
super(Global.properties.threadsTimeout, Global.properties.threadsNum);
SapforScenario_json scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario.txt"), SapforScenario_json.class);
//формирование списка задач.
for (SapforPackage_json sapforPackage_json : scenario_json.packages) {

2
src/Visual_DVM_2021/Passes/All/StartSapforTests.java
View File

@@ -225,6 +225,8 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
ShowMessage2("Создание настроек");
GlobalProperties properties = new GlobalProperties();
properties.Mode = Current.Mode.Scenario;
properties.threadsNum = 1;
properties.threadsTimeout = 5000;
//----
Utils.jsonToFile(properties, new File(target.workspace, "properties"));
//----