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

сборка сапфора для тестирования пользователем

Browse Source
This commit is contained in:
02090095
2023-10-03 15:07:17 +03:00
parent 6372fce1ac
commit 2deecd47bf
26 changed files with 571 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Common/Constants/Constants.java
View File

@@ -1,6 +1,18 @@
package Common.Constants;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
import java.util.regex.Pattern;
public class Constants {
public static final int Nan = -1;
//SVN
public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
public static final String SAPFOR_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/sapfor";
//--
public static final String LOADED = "LOADED";
//--
//https://losst.ru/komandy-terminala-linux
public static String[] linux_system_commands = new String[]{
//<editor-fold desc="все линуксовые команды. их МНОГО">
@@ -339,8 +351,8 @@ public class Constants {
"zypper"
//</editor-fold>
};
public static final int Nan = -1;
public static char toStrike = (char) 822;
public static char boop = (char) 7;
public static final Pattern VALID_EMAIL_ADDRESS_REGEX =
Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE);
public static char[] forbidden_file_name_characters = new char[]{
@@ -356,4 +368,6 @@ public class Constants {
//все запретные символы через пробел.
public static String all_forbidden_characters_string = "";
public static String aborted = "ABORTED";
public static final Machine repository_machine = new Machine("Ubuntu", "alex-freenas.ddns.net", 23, MachineType.Server);
public static final User repository_user = new User("testuser", "mprit_2011", "");
}

9
src/Common/Current.java
View File

@@ -33,6 +33,7 @@ import java.util.LinkedHashMap;
public enum Current {
Undefined,
//--
ServerSapfor,
SapforScenario,
SapforEtalonTaskResult,//самый левый пакет
SapforTaskResult,
@@ -388,9 +389,17 @@ public enum Current {
public static SapforTestingSystem.SapforScenario.SapforScenario getSapforScenario() {
return (SapforTestingSystem.SapforScenario.SapforScenario) get(Current.SapforScenario);
}
public static boolean HasServerSapfor() {
return get(Current.ServerSapfor) != null;
}
public static SapforTestingSystem.ServerSapfor.ServerSapfor getServerSapfor() {
return (SapforTestingSystem.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
}
//--------------------------------------------
public String getDescription() {
switch (this) {
case ServerSapfor:
return "тестовая версия SAPFOR";
case SapforScenario:
return "сценарий SAPFOR";
case SapforProfile:

2
src/Common/Global.java
View File

@@ -88,6 +88,7 @@ public class Global {
public static File PerformanceAnalyzerDirectory;
public static File DataBackUpsDirectory;
public static File PackagesDirectory;
public static File SapforsDirectory;
//------------------------------------------------------------------
public static Visualiser visualiser = null;
public static Visualizer_2 visualizer_2 = null;
@@ -143,6 +144,7 @@ public class Global {
Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Tests).toFile());
Utils.CheckDirectory(RepoDirectory = Paths.get(Home, Repo).toFile());
Utils.CheckDirectory(PackagesDirectory = Paths.get(Home, Packages).toFile());
Utils.CheckDirectory(SapforsDirectory = Paths.get(Home, "Sapfors").toFile());
}
public static void CreateLog() {
Log = new Loggable() {

2
src/Common/UI/Menus_2023/RemoteSapforsMenuBar/RemoteSapforsMenuBar.java
View File

@@ -3,7 +3,7 @@ import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class RemoteSapforsMenuBar extends DataMenuBar {
public RemoteSapforsMenuBar() {
super("SAPFOR", PassCode_2021.InstallRemoteSapfor,
super("SAPFOR",
PassCode_2021.AddSapfor,
PassCode_2021.EditSapfor,
PassCode_2021.DeleteSapfor);

8
src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java Normal file
View File

@@ -0,0 +1,8 @@
package Common.UI.Menus_2023.ServerSapforsBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() {
super("SAPFOR", PassCode_2021.InstallServerSapfor);
}
}

3
src/Common/UI/UI.java
View File

@@ -22,6 +22,7 @@ import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenu
import Common.UI.Menus_2023.SapforScenariosBar.SapforScenariosBar;
import Common.UI.Menus_2023.SapforTasksMenuBar.SapforTasksMenuBar;
import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar;
import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar;
import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar;
import Common.UI.Menus_2023.TasksPackagesMenuBar.TasksPackagesMenuBar;
import Common.UI.Menus_2023.TestRunTasksMenuBar.TestRunTasksMenuBar;
@@ -71,6 +72,7 @@ import Repository.BugReport.BugReportsDBTable;
import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable;
import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
@@ -248,6 +250,7 @@ public class UI {
menuBars.put(VariantsSet.class, new VariantsMenuBar());
menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile,PassCode_2021.DeleteProfile));
menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
//---->>
}
public static void CreateWindows() {

20
src/Common/Utils/Validators/ShellParser.java
View File

@@ -1,4 +1,5 @@
package Common.Utils.Validators;
import Common.Constants.Constants;
import Common.Global;
import Common.Utils.Utils;
@@ -79,7 +80,7 @@ public class ShellParser {
test = test.toLowerCase();
state = test.endsWith(userName.toLowerCase()) ? ShellParserState.MachineName : ShellParserState.Skip;
invitationBuilder.append(c);
} else if (isNameCharacter()||(c=='['))
} else if (isNameCharacter() || (c == '['))
invitationBuilder.append(c);
else
state = ShellParserState.Skip;
@@ -132,13 +133,14 @@ public class ShellParser {
userName = userName_in;
}
public static void printChar() {
int code = c;
if ((!return_active) || (c == '\n')) {
System.out.print(c == '\r' ? ("\\r") :
(c=='\n'? "\\n\n":c));
if (isCommandSymbol())
System.out.print(Utils.RBrackets(code));
if (c != Constants.boop) {
int code = c;
if ((!return_active) || (c == '\n')) {
System.out.print(c == '\r' ? ("\\r") :
(c == '\n' ? "\\n\n" : c));
if (isCommandSymbol())
System.out.print(Utils.RBrackets(code));
}
}
}
public static void ReadInvitation(InputStreamReader fromServer) {
@@ -172,7 +174,7 @@ public class ShellParser {
break;
}
}
// System.out.println(Utils.Brackets(state));
// System.out.println(Utils.Brackets(state));
// }
} else
state = ShellParserState.End;