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-08 01:57:25 +03:00
parent e9bd430d56
commit 54f392ea58
13 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SapforTestingSystem/Json/SapforTasksPackage_json.java
View File

@@ -9,5 +9,5 @@ public class SapforTasksPackage_json {
@Expose
public List<String> tests = new Vector<>();
@Expose
public List<SapforConfiguration_json> packages = new Vector<>();
public List<SapforConfiguration_json> configurations = new Vector<>();
}

8
src/SapforTestingSystem/PerformSapforTask.java
View File

@@ -282,7 +282,6 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
}
//--
protected void createVersionProjectData(SapforVersion_json version, boolean isTransformation) throws Exception {
System.out.println("Checking version " + version);
db_project_info project = new db_project_info();
project.Home = new File(version.version);
project.name = project.Home.getName();
@@ -314,12 +313,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
//--
}
project.CreateVisualiserData();
System.out.println("visualiser data created");
//---
if (isTransformation && !messages.isEmpty()) {
project.Open();
project.db.BeginTransaction();
System.out.println("messages size=" + messages.size());
for (MessageError m : messages) {
if (project.db.files.containsKey(m.file)) {
DBProjectFile file = project.db.files.Data.get(m.file);
@@ -335,10 +332,8 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
//-------------------------------------------------->>
@Override
protected void body() throws Exception {
System.out.println(target.root + " " + Utils.Brackets(sapforConfiguration_json.flags));//!!
target.versions.add(new SapforVersion_json(target.root, "исходная"));
for (PassCode_2021 code : sapforConfiguration_json.codes) {
System.out.println(code); //!!
if (parse()) {
if (code.equals(PassCode_2021.CreateParallelVariants))
variants();
@@ -351,12 +346,9 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
@Override
protected void performFinish() throws Exception {
//теперь строим деревья версий. нельзя делать в body. так как могут быть исключения например неверный код процесса.
System.out.println("Построение дерева версий..");
for (SapforVersion_json version : target.versions)
createVersionProjectData(version, true);
for (SapforVersion_json version : target.variants)
createVersionProjectData(version, false);
//---->>>>
System.out.println("DONE");
}
}

4
src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
View File

@@ -17,11 +17,11 @@ public class SapforTasksPackageSupervisor extends ThreadsPlanner {
SapforTasksResults_json results_json = new SapforTasksResults_json();
public SapforTasksPackageSupervisor() throws Exception {
super(Global.properties.threadsTimeout, Global.properties.threadsNum);
package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), SapforTasksPackage_json.class);
package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, "package_json"), SapforTasksPackage_json.class);
results_json.StartDate = new Date().getTime();
//формирование списка задач.
File sapfor_drv = new File(Global.Home, package_json.sapfor_drv);
for (SapforConfiguration_json sapforConfiguration_json : package_json.packages) {
for (SapforConfiguration_json sapforConfiguration_json : package_json.configurations) {
for (String testName : package_json.tests) {
//--- чтобы было можно на нее сослаться после выполнения всех нитей.
SapforTask task = new SapforTask();

2
src/SapforTestingSystem/SapforServerScenario_info.java → src/SapforTestingSystem/SapforTasksPackage_info.java
View File

@@ -5,7 +5,7 @@ import com.google.gson.annotations.Expose;
import java.io.Serializable;
import java.util.List;
import java.util.Vector;
public class SapforServerScenario_info implements Serializable {
public class SapforTasksPackage_info implements Serializable {
@Expose
public int sapforId = Constants.Nan; //файл с сапфором
@Expose