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

рефакторинг. ввел оберточные методы работы с json объектами

Browse Source
This commit is contained in:
02090095
2023-09-29 22:17:44 +03:00
parent 760707e6fb
commit 7d40091878
13 changed files with 58 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java
View File

@@ -1,13 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.Json.ScenarioResults_json;
import SapforTestingSystem.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.charset.Charset;
public class AnalyseSapforPackageResults extends Pass_2021<ScenarioResults_json> {
File packageWorkspace;
File scenarioFile;
@@ -23,8 +20,8 @@ public class AnalyseSapforPackageResults extends Pass_2021<ScenarioResults_json>
packageWorkspace = new File((String) args[0]);
scenarioFile = new File(packageWorkspace, "results.txt");
//--
String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
target = Utils.gson.fromJson(packed, ScenarioResults_json.class);
// String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
// target = Utils.gson.fromJson(packed, ScenarioResults_json.class);
//---
return true;
}

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

@@ -71,7 +71,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
@Override
protected void performFinish() throws Exception {
//в пакетном режиме вариант всегда один. поэтому, сообщения надо распаковать сразу.
if (Current.mode.equals(Current.Mode.Package))
if (Current.mode.equals(Current.Mode.Scenario))
super.performFinish();
}
@Override

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

@@ -224,9 +224,9 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
FileUtils.copyFile(Global.visualiser.getFile(), visualiser);
ShowMessage2("Создание настроек");
GlobalProperties properties = new GlobalProperties();
properties.Mode = Current.Mode.Package;
File propertiesFile = new File(target.workspace, "properties");
FileUtils.write(propertiesFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(properties)));
properties.Mode = Current.Mode.Scenario;
//----
Utils.jsonToFile(properties, new File(target.workspace, "properties"));
//----
File scenarioFile = new File(target.workspace, "scenario.txt");
SapforScenario_json scenario_json = new SapforScenario_json();
@@ -275,7 +275,7 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
scenario_json.packages.add(package_json);
}
//--
FileUtils.write(scenarioFile, Utils.jsonToPrettyFormat(Utils.gson.toJson(scenario_json)));
Utils.jsonToFile(scenario_json, scenarioFile);
}
@Override
protected void showFinish() throws Exception {