diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 447f156d..24be9746 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,10 @@
-
-
-
+
+
+
+
diff --git a/properties b/properties
index e14be6ef..817943f7 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
{
"Workspace": "E:\\Tests",
- "ProjectsSearchDirectory": "E:\\BUG",
+ "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
"VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
index 0eb5c2a1..205bb014 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
@@ -33,8 +33,8 @@ public class MachineFields implements DialogFields {
//-
cbMachineType = new JComboBox<>();
cbMachineType.addItem(MachineType.Server);
- cbMachineType.addItem(MachineType.MVS_cluster);
- cbMachineType.addItem(MachineType.Local);
+ // cbMachineType.addItem(MachineType.MVS_cluster);
+ // cbMachineType.addItem(MachineType.Local);
}
@Override
public Component getContent() {
diff --git a/src/_VisualDVM/Passes/All/TestPass.java b/src/_VisualDVM/Passes/All/TestPass.java
index 5cf95374..558a4fe9 100644
--- a/src/_VisualDVM/Passes/All/TestPass.java
+++ b/src/_VisualDVM/Passes/All/TestPass.java
@@ -1,8 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
+import Common.Visual.UI;
import _VisualDVM.Global;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-public class TestPass extends Pass {
+import _VisualDVM.Passes.Server.TestingServerPass;
+import _VisualDVM.Repository.Server.ServerCode;
+import _VisualDVM.TestingSystem.Common.Test.Test;
+public class TestPass extends TestingServerPass {
/*
LinkedHashMap unpackConfigurationsOld(SapforPackage sapforPackage){
LinkedHashMap res = new LinkedHashMap<>();
@@ -27,7 +30,13 @@ public class TestPass extends Pass {
*/
@Override
protected void body() throws Exception {
- for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) {
- }
+ if (!SendRequest(ServerCode.TestCode));
+ /*
+ for (Test test: Global.testingServer.db.tests.Data.values()){
+ if (!SendRequest(ServerCode.DownloadTest, String.valueOf(test.id))){
+ UI.Info(String.valueOf(test.id));
+ };
+ }
+ */
}
}
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 3dee2523..f46dd747 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override
public void GetVersionInfo() {
- version = 1149;
+ version = 1150;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index b3f720f9..41c081fa 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -90,8 +90,8 @@ public enum ServerCode {
StartNecessaryMachines,
GetSapforForCompilation,
GetMaxSapforVersion,
- PerformAutoSapforTesting;
-
+ PerformAutoSapforTesting,
+ TestCode;
public String getDescription(){
switch (this){
case GetComponentsVersionsInfo:
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 8968fec1..cecc49ba 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -374,6 +374,9 @@ public class TestingServer extends RepositoryServer {
Print("Получить максимальную установленную версию Sapfor");
GetSapforMaxVersion();
break;
+ case TestCode:
+ checkUnpackedTests();
+ break;
default:
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
}
@@ -742,5 +745,18 @@ public class TestingServer extends RepositoryServer {
//--
return target;
}
+ public void checkUnpackedTests() throws Exception{
+ for (Test test: db.tests.Data.values()){
+ File testHome = test.getServerPath();
+ if (!testHome.exists()){
+ throw new RepositoryRefuseException(test.id+" не существует папка");
+ }
+ File testArchive = test.getArchive();
+ if (!testArchive.exists()){
+ throw new RepositoryRefuseException(test.id+" не существует архив");
+ }
+ }
+ response = new ServerExchangeUnit_2021(ServerCode.OK);
+ }
}
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index a5f075af..6286f224 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -61,7 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
//-
setPreferredSize(new Dimension(0, 30));
//---
- /*
+/*
add(new MenuBarButton() {
{
setIcon("/Common/icons/Apply.png");
@@ -71,7 +71,7 @@ public class MainMenuBar extends VisualiserMenuBar {
});
}
});
- */
+ */
add(new JSeparator());
add(MachineButton = new MenuBarButton() {
{