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 02:05:57 +03:00
parent 54f392ea58
commit 46e050382b
5 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/workspace.xml generated
View File

@@ -7,19 +7,10 @@
</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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.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/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.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/SapforServerScenario_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.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" />

2
src/Common/Current.java
View File

@@ -487,6 +487,6 @@ public enum Current {
Normal, Normal,
Server, Server,
Testing, Testing,
Scenario Package
} }
} }

8
src/Common/Global.java
View File

@@ -347,7 +347,7 @@ public class Global {
testingServer.Start(); testingServer.Start();
System.exit(0); System.exit(0);
} }
public static void ScenarioMode() throws Exception { public static void PackageMode() throws Exception {
isWindows = System.getProperty("os.name").startsWith("Windows"); isWindows = System.getProperty("os.name").startsWith("Windows");
Log = new Loggable() { Log = new Loggable() {
@Override @Override
@@ -356,7 +356,7 @@ public class Global {
} }
@Override @Override
public String getLogName() { public String getLogName() {
return "Scenario"; return "Package";
} }
}; };
Log.ClearLog(); Log.ClearLog();
@@ -383,8 +383,8 @@ public class Global {
case Testing: case Testing:
TestingSystemMode(); TestingSystemMode();
break; break;
case Scenario: case Package:
ScenarioMode(); PackageMode();
break; break;
case Undefined: case Undefined:
break; break;

2
src/TestingSystem/TestingServer.java
View File

@@ -361,7 +361,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
FileUtils.copyFile(new File(Global.Home, "TestingSystem.jar"), visualiser); FileUtils.copyFile(new File(Global.Home, "TestingSystem.jar"), visualiser);
//создание настроек //создание настроек
GlobalProperties properties = new GlobalProperties(); GlobalProperties properties = new GlobalProperties();
properties.Mode = Current.Mode.Scenario; properties.Mode = Current.Mode.Package;
properties.threadsNum = Global.properties.threadsNum; //брать из настроек сервера же. properties.threadsNum = Global.properties.threadsNum; //брать из настроек сервера же.
properties.threadsTimeout = Global.properties.threadsTimeout; properties.threadsTimeout = Global.properties.threadsTimeout;
Utils.jsonToFile(properties, new File(sapforTasksPackage.workspace, "properties")); Utils.jsonToFile(properties, new File(sapforTasksPackage.workspace, "properties"));

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

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