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

при тестировании двм задачи сортируются так что ошибки сверху

Browse Source
This commit is contained in:
02090095
2024-09-27 02:01:14 +03:00
parent 1be569e294
commit 30b51180c4
5 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -8,14 +8,10 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.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/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.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" />

1
src/Common/Global.java
View File

@@ -373,6 +373,7 @@ public class Global {
CreateLogAtComponentsPath(); CreateLogAtComponentsPath();
testingServer = new TestingServer(); testingServer = new TestingServer();
testingServer.ActivateDB(); testingServer.ActivateDB();
// testingServer.PATCH();
testingServer.Start(); testingServer.Start();
System.exit(0); System.exit(0);
} }

39
src/TestingSystem/Common/TestingServer.java
View File

@@ -173,15 +173,15 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
TextLog Log = new TextLog(); TextLog Log = new TextLog();
tryAutoSapforTesting(Log); tryAutoSapforTesting(Log);
response = new ServerExchangeUnit_2021(ServerCode.OK); response = new ServerExchangeUnit_2021(ServerCode.OK);
EmailMessage message = Log.isEmpty()? EmailMessage message = Log.isEmpty() ?
new EmailMessage( new EmailMessage(
"Запущено автоматической тестирование версии "+request.arg+" системы SAPFOR", "Запущено автоматической тестирование версии " + request.arg + " системы SAPFOR",
"", new Vector<>()): "", new Vector<>()) :
new EmailMessage( new EmailMessage(
"Не удалось запустить автоматическое тестирование версии "+request.arg+" системы SAPFOR", "Не удалось запустить автоматическое тестирование версии " + request.arg + " системы SAPFOR",
Log.toString(), Log.toString(),
new Vector<>() new Vector<>()
); );
Email(message); Email(message);
break; break;
case DownloadTest: case DownloadTest:
@@ -642,14 +642,25 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//-- //--
} }
/* /*
public void PATCH(){ public void PATCH() {
for (SapforPackage sapforPackage: db.sapforPackages.Data.values()){ for (DVMPackage testingPackage : db.dvmPackages.Data.values()) {
boolean hasErrors = false;
try { try {
sapforPackage.readJson(); testingPackage.readJson();
sapforPackage.state=sapforPackage.package_json.getState(); //---------------------------------------------------
db.Update(sapforPackage); for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
} if (!compilationTask.state.equals(TaskState.Done))
catch (Exception ex){ hasErrors = true;
for (DVMRunTask runTask : compilationTask.runTasks) {
if (!runTask.state.equals(TaskState.Done))
hasErrors = true;
}
}
if (hasErrors)
testingPackage.state = TasksPackageState.DoneWithErrors;
//---------------------------------------------------
db.Update(testingPackage);
} catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
} }
} }

1
src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -66,6 +66,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public void MouseAction2() throws Exception { public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.DownloadDVMPackage).Do(); Pass_2021.passes.get(PassCode_2021.DownloadDVMPackage).Do();
} }
}; };
} }
@Override @Override

12
src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -7,6 +7,8 @@ import Common.UI.DataSetControlForm;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
import TestingSystem.DVM.DVMPackage.DVMPackage; import TestingSystem.DVM.DVMPackage.DVMPackage;
import java.util.Comparator;
import static Common.UI.Tables.TableRenderers.RendererProgress; import static Common.UI.Tables.TableRenderers.RendererProgress;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum; import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> { public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
@@ -150,4 +152,14 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
Data.clear(); Data.clear();
target = null; target = null;
} }
@Override
public Comparator<DVMRunTask> getComparator() {
return new Comparator<DVMRunTask>() {
@Override
public int compare(DVMRunTask o1, DVMRunTask o2) {
return o1.state.ordinal() - o2.state.ordinal();
}
};
// return Comparator.comparingInt(o -> o.).reversed();
}
} }