no message

This commit is contained in:
2025-02-12 14:22:11 +03:00
parent ede6438fbf
commit b80bea4c1b
7 changed files with 37 additions and 25 deletions

5
.idea/workspace.xml generated
View File

@@ -7,8 +7,13 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.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/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.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" />

View File

@@ -0,0 +1,6 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
}

View File

@@ -355,11 +355,14 @@ public enum PassCode implements PassCode_ {
PauseDVMPackage, PauseDVMPackage,
ResumeDVMPackage, ResumeDVMPackage,
JoinSapforTestingVersionsToGroup, JoinSapforTestingVersionsToGroup,
RefreshDVMPackageResults,
; ;
//-- //--
@Override @Override
public String getDescription() { public String getDescription() {
switch (this) { switch (this) {
case RefreshDVMPackageResults:
return "Обновить результаты анализа пакета тестирования DVM";
case JoinSapforTestingVersionsToGroup: case JoinSapforTestingVersionsToGroup:
return "Присоединить итоговые версии пакета тестирования SAPFOR к текущей группе тестов"; return "Присоединить итоговые версии пакета тестирования SAPFOR к текущей группе тестов";
case ResumeDVMPackage: case ResumeDVMPackage:

View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1156; version = 1158;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

View File

@@ -821,6 +821,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
test.group_id = group.id; test.group_id = group.id;
test.description = description; test.description = description;
test.files = String.join("\n", filesNames); test.files = String.join("\n", filesNames);
test.sender_address = group.sender_address;
test.sender_name = group.sender_name;
db.Insert(test); db.Insert(test);
//--- //---
File testProject = new File(Global.TestsDirectory, String.valueOf(test.id)); File testProject = new File(Global.TestsDirectory, String.valueOf(test.id));
@@ -861,5 +863,22 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} }
//-"sh" //-"sh"
} }
public void Patch(){
try {
db.BeginTransaction();
for (Test test : db.tests.Data.values()) {
if (test.sender_address.isEmpty()) {
Group group = db.groups.get(test.group_id);
test.sender_address = group.sender_address;
test.sender_name = group.sender_name;
db.Update(test);
}
}
db.Commit();
}
catch (Exception ex){
ex.printStackTrace();
}
}
} }

View File

@@ -559,9 +559,9 @@ public class Utils {
} }
} }
TaskState state = TaskState.Finished; TaskState state = TaskState.Finished;
if (starts == 0 || ends == 0) { // if (starts == 0 || ends == 0) {
state = TaskState.WrongTestFormat; // state = TaskState.WrongTestFormat;
} else // } else
if (errors > 0) { if (errors > 0) {
state = TaskState.DoneWithErrors; state = TaskState.DoneWithErrors;
} else { } else {

View File

@@ -265,27 +265,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
roText.setText(object.getOutput()); roText.setText(object.getOutput());
reText.setText(object.getErrors()); reText.setText(object.getErrors());
stsText.setText(object.getStatistic()); stsText.setText(object.getStatistic());
switch (object.compilation_state){
case Done:
case AbortedByTimeout:
compilationTabs.setSelectedIndex(0);
break;
default:
compilationTabs.setSelectedIndex(1);
break;
}
switch (object.state){
case Done:
case Canceled:
case Inactive:
case DoneWithErrors:
case AbortedByTimeout:
runTabs.setSelectedIndex(0);
break;
default:
runTabs.setSelectedIndex(1);
break;
}
} }
@Override @Override
public void ShowNoCurrentDVMTask() { public void ShowNoCurrentDVMTask() {