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

сравнение с эталоном начальная версия

Browse Source 
v++
This commit is contained in:
02090095
2024-11-22 02:54:17 +03:00
parent d5b6d9dd55
commit f66790f67a
12 changed files with 199 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -15,13 +15,19 @@ import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import com.sun.org.glassfish.gmbal.Description;
import java.io.File;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforPackage extends TestingPackage<SapforPackage_json> {
public int sapforId = CommonConstants.Nan; // так как сапфор на машине.
//--------------
//--
@Description("DEFAULT -1")
public int ethalon_id = CommonConstants.Nan;
@Description("DEFAULT 0")
public int mismatchesCount = 0; //различия с эталоном
//--
public SapforPackage() {
}
public SapforPackage(SapforPackage sapforPackage) {
@@ -73,6 +79,9 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
package_json = new SapforPackage_json(serverSapfor, testsByDescriptions, configurations, kernels);
tasksCount = package_json.tasks.size();
saveConfigurationsAsJson(configurations);
if (configurations.size() == 1 && configurations.get(0).ethalon_id != CommonConstants.Nan) {
ethalon_id = configurations.get(0).ethalon_id;
}
}
}
@Override
@@ -80,6 +89,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
super.SynchronizeFields(src);
SapforPackage p = (SapforPackage) src;
sapforId = p.sapforId;
ethalon_id = p.ethalon_id;
mismatchesCount=p.mismatchesCount;
}
@Override
public Class getJsonClass() {
@@ -112,4 +123,16 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
description = "Выполнено на " + ((int) percent) + "%\n" +
"Всего задач: " + tasksCount + ", из них с ошибками " + bad;
}
public boolean canCompare(SapforPackage package2, TextLog log){
if (package_json.tasks.size() != package2.package_json.tasks.size()) {
log.Writeln_("Количество задач в пакетах не совпадает!");
return false;
}
for (SapforTask task : package_json.tasks) {
if (!package2.package_json.containsKey(task.getUniqueKey())) {
log.Writeln_("Задача эталона " + task.getUniqueKey() + "не найдена в сравниваемом пакете!");
}
}
return log.isEmpty();
}
}

24
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -21,7 +21,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
@Override
protected void createColumns() {
AddColumns(
new ColumnInfo<SapforPackage>("Автор") {
new ColumnInfo<SapforPackage>("автор") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.sender_name;
@@ -33,7 +33,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return object.version;
}
},
new ColumnInfo<SapforPackage>("Конфигурации") {
new ColumnInfo<SapforPackage>("конфигурации") {
@Override
public Object getFieldAt(SapforPackage object) {
return ((PackageCache) VisualCaches.GetCache(object)).getConfigurationsDescriptions();
@@ -43,19 +43,19 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return RendererMultiline.class;
}
},
new ColumnInfo<SapforPackage>("Задач") {
new ColumnInfo<SapforPackage>("задач") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.tasksCount;
}
},
new ColumnInfo<SapforPackage>("Ядер") {
new ColumnInfo<SapforPackage>("ядер") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.kernels;
}
},
new ColumnInfo<SapforPackage>("Прогресс") {
new ColumnInfo<SapforPackage>("прогресс") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.progress;
@@ -65,7 +65,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return RendererProgressBar.class;
}
},
new ColumnInfo<SapforPackage>("Начало") {
new ColumnInfo<SapforPackage>("начало") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.StartDate;
@@ -75,7 +75,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return RendererDate.class;
}
},
new ColumnInfo<SapforPackage>("Изменено") {
new ColumnInfo<SapforPackage>("изменено") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.ChangeDate;
@@ -85,7 +85,13 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return RendererDate.class;
}
},
new ColumnInfo<SapforPackage>("Статус") {
new ColumnInfo<SapforPackage>("различия") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.mismatchesCount;
}
},
new ColumnInfo<SapforPackage>("статус") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.state;
@@ -113,7 +119,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.SetSapforConfigurationEthalon,PassCode.CompareSapforPackages);
addPasses(PassCode.SetSapforConfigurationEthalon, PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
}