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-14 17:35:59 +03:00
parent 21914e3ba1
commit dbd0fd0ef5
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -7,13 +7,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -25,7 +25,7 @@
"InstructionPath": "",
"PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10,
"TestingKernels": 28,
"TestingKernels": 16,
"AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 15,
"EmailOnTestingProgress": true

3
src/SapforTestingSystem/PerformSapforTask.java
View File

@@ -16,6 +16,7 @@ import java.nio.charset.Charset;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.Vector;
import static java.lang.Character.isDigit;
@@ -349,6 +350,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
//-------------------------------------------------->>
@Override
protected void body() throws Exception {
target.StartDate = new Date().getTime();
target.versions.add(new SapforVersion_json(target.test_description, "исходная"));
for (PassCode_2021 code : sapforConfiguration_json.codes) {
if (parse()) {
@@ -359,5 +361,6 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
} else
break;
}
target.ChangeDate = new Date().getTime();
}
}

11
src/SapforTestingSystem/SapforTask/SapforTask.java
View File

@@ -12,6 +12,7 @@ import com.sun.org.glassfish.gmbal.Description;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforTask extends DBObject {
@@ -40,6 +41,10 @@ public class SapforTask extends DBObject {
public String codes = "";
@Expose
public TaskState state = TaskState.Inactive;
@Expose
public long StartDate = 0; //дата начала выполнения
@Expose
public long ChangeDate = 0;//дата окончания выполнения
//в json не выносить. это только для БД.
@Description("DEFAULT ''")
public String versionsDescription = "";
@@ -182,4 +187,10 @@ public class SapforTask extends DBObject {
task2.match = MatchState.Match;
}
}
public Date getStartDate(){
return new Date(StartDate);
}
public Date getChangeDate(){
return new Date(ChangeDate);
}
}

19
src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
View File

@@ -3,6 +3,7 @@ import Common.Current;
import Common.Database.DBTable;
import Common.UI.DataSetControlForm;
import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
public SapforTasksDBTable() {
@@ -26,17 +27,9 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
@Override
protected void AdditionalInitColumns() {
columns.get(4).setRenderer(RendererStatusEnum);
columns.get(5).setRenderer(RendererDate);
columns.get(6).setRenderer(RendererDate);
}
@Override
public void MouseAction2() throws Exception {
// Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do();
}
/*
@Override
public boolean hasCheckBox() {
return true;
}
*/
};
}
@Override
@@ -46,6 +39,8 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
"Тест",
"Флаги",
"Статус",
"Начало",
"Окончание",
"Версии"
};
}
@@ -61,6 +56,10 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
case 4:
return object.state;
case 5:
return object.getStartDate();
case 6:
return object.getChangeDate();
case 7:
return object.versionsDescription;
default:
return null;