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

промежуточный. часть большого рефакторинга, касательно проходов связанных с сервером. Обновлена публикация групп.

Browse Source
This commit is contained in:
02090095
2023-11-16 16:20:20 +03:00
parent 3f00d0f300
commit 4545cf2d26
80 changed files with 346 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ import TestingSystem.Group.Group;
import TestingSystem.TasksPackage.TasksPackageState;
import TestingSystem.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.TestingSystemPass;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.io.File;
import java.util.Date;
@@ -23,7 +23,7 @@ import java.util.Vector;
public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
protected int allTasksCount = 0;
//--
protected LinkedHashMap<String, Vector<String>> groupsTests = null;
protected LinkedHashMap<Integer, Vector<Integer>> groupsTests = null;
//--
protected LinkedHashMap<String, Test> allTests = null;
protected Vector<String> testsNames_lower = null; //все тесты что участвуют здесь
@@ -53,12 +53,12 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
testsNames_lower.add(name);
return true;
}
protected boolean getGroupTests(String groupId) {
Vector<String> groupTests = new Vector<>();
Vector<String> selectedGroupTests = new Vector<>();
protected boolean getGroupTests(int groupId) {
Vector<Integer> groupTests = new Vector<>();
Vector<Integer> selectedGroupTests = new Vector<>();
//---
for (Test test : Global.testingServer.db.tests.Data.values()) {
if (test.group_id.equals(groupId)) {
if (test.group_id==groupId) {
groupTests.add(test.id);
if (test.isSelected())
selectedGroupTests.add(test.id);
@@ -72,7 +72,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
return false;
}
//--
for (String testId : groupTests) {
for (int testId : groupTests) {
Test test = Global.testingServer.db.tests.get(testId);
if (!checkTestName(test))
return false;
@@ -189,7 +189,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
}
//--
for (int i = 0; i < Global.testingServer.db.sapforConfigurations.getCheckedCount(); ++i) {
for (Vector<String> tests : groupsTests.values())
for (Vector<Integer> tests : groupsTests.values())
allTasksCount += tests.size();
}
//--
@@ -206,7 +206,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
Vector<String> testsIds = new Vector<>();
Vector<String> configurationsIds = new Vector<>();
for (Test test : allTests.values())
testsIds.add(test.id);
testsIds.add(String.valueOf(test.id));
//--
for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems())
configurationsIds.add(configuration.id);