при тестировании двм задачи сортируются так что ошибки сверху
This commit is contained in:
8
.idea/workspace.xml
generated
8
.idea/workspace.xml
generated
@@ -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" />
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -643,13 +643,24 @@ 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))
|
||||||
|
hasErrors = true;
|
||||||
|
for (DVMRunTask runTask : compilationTask.runTasks) {
|
||||||
|
if (!runTask.state.equals(TaskState.Done))
|
||||||
|
hasErrors = true;
|
||||||
}
|
}
|
||||||
catch (Exception ex){
|
}
|
||||||
|
if (hasErrors)
|
||||||
|
testingPackage.state = TasksPackageState.DoneWithErrors;
|
||||||
|
//---------------------------------------------------
|
||||||
|
db.Update(testingPackage);
|
||||||
|
} catch (Exception ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user