Отображение текущей задачи тестирования ДВМ

.idea/workspace.xml

@@ -8,11 +8,15 @@
   <component name="ChangeListManager">
     <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" 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/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" 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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/_VisualDVM/Passes/All/CompareDVMRunTasks.java

@@ -1,56 +0,0 @@
-package _VisualDVM.Passes.All;
-import Common.Passes.Pass;
-import Common.Utils.Utils_;
-import Common.Visual.UI;
-import _VisualDVM.Global;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
-
-import java.util.Vector;
-public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
-    DVMRunTask master;
-    DVMRunTask slave;
-    @Override
-    public String getIconPath() {
-        return "/icons/Comparsion.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        master = null;
-        slave = null;
-        //--
-        target = Global.testingServer.db.dvmRunTasks.getUI().getSelectedItems();
-        if (target.size() == 2) {
-            if (UI.Question("Назначить задачу " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
-                    "\n(в случае отказа, будет назначена задача " + Utils_.Brackets(target.get(1).getPK()) + ")")) {
-                master = target.get(0);
-                slave = target.get(1);
-            } else {
-                master = target.get(1);
-                slave = target.get(0);
-            }
-            return true;
-        } else if (target.size() == 1) {
-            master = target.get(0);
-            slave = null;
-            return true;//UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
-        } else if ((target.size() == 0) && (Global.testingServer.db.dvmRunTasks.getUI().getCurrent() != null)) {
-            master = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
-            slave = null;
-            return true; //UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK()));
-        } else {
-            Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу,или выделить её.");
-            return false;
-        }
-    }
-    @Override
-    protected void body() throws Exception {
-        if (slave != null)
-            Global.mainModule.getUI().getMainWindow().getTestingWindow().CompareDVMRunTasks(master, slave);
-        else
-            Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowDVMRunTask(master);
-    }
-}

src/_VisualDVM/Passes/All/DownloadDVMPackage.java

@@ -9,7 +9,7 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
     DVMPackage dvmPackage;
     @Override
     public String getIconPath() {
-        return "/icons/Comparsion.png";
+        return "/icons/DownloadBugReport.png";
     }
     protected boolean canStart(Object... args) throws Exception {
         if (Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log)) {

src/_VisualDVM/Passes/PassCode.java

@@ -310,7 +310,6 @@ public enum PassCode implements PassCode_ {
     SPF_RemoveDeadCode,
     ReplaceTestProject,
     ReplaceTestsFromFiles,
-    CompareDVMRunTasks,
     CompareSapforPackages,
     CreateDVMPackageFromCurrentProject,
     //--
@@ -417,8 +416,6 @@ public enum PassCode implements PassCode_ {
                 return "Тестировать текущий проект";
             case CompareSapforPackages:
                 return "Сравнить пакеты задач SAPFOR";
-            case CompareDVMRunTasks:
-                return "Сравнить тестовые задачи на запуск";
             case ReplaceTestsFromFiles:
                 return "Заменить тесты группы на выбранные файлы";
             case ReplaceTestProject:

src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java

@@ -112,7 +112,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DownloadTaskTest);
     }
     @Override
     protected void createFilters() {
@@ -173,8 +173,20 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
         };
     }
     @Override
+    protected void ShowCurrentObject() throws Exception {
+        super.ShowCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentDVMTask();
+    }
+    @Override
+    protected void ShowNoCurrentObject() throws Exception {
+        super.ShowNoCurrentObject();
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoCurrentDVMTask();
+    }
+    /*
+    @Override
     protected void MouseAction2() throws Exception {
         SelectAll(false);
         Global.mainModule.getPass(PassCode.CompareDVMRunTasks).Do();
     }
+     */
 }

src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java

@@ -118,7 +118,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
                     rt_count++;
                     runTask.compilation_state = compilationTask.state;
                     runTask.compilation_time = compilationTask.Time;
-                    if (compilationTask.state == TaskState.DoneWithErrors) {
+                    if (compilationTask.state != TaskState.Done) {
                         runTask.state = TaskState.Canceled;
                     } else {
                         File rt_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(runTask.id)).toFile();

src/_VisualDVM/Visual/Interface/TestingWindow.java

@@ -23,14 +23,13 @@ public interface TestingWindow extends VisualizerForm {
     void ShowCurrentCompiler();
     void ShowCurrentServerSapfor();
     void ShowNoServerSapfor();
-    void ShowCurrentDVMPackage();
-    void ShowNoCurrentDVMPackage();
     //--
     void ShowDVMRunTask(DVMRunTask master);
     void ShowSapforPackage(SapforPackage master);
     //-
-    void CompareDVMRunTasks(DVMRunTask master, DVMRunTask slave);
     void CompareSapforPackages(SapforPackage master, SapforPackage slave);
     //-
     void ShowDVMPackage(DVMPackage master);
+    void ShowCurrentDVMTask();
+    void ShowNoCurrentDVMTask();
 }

src/_VisualDVM/Visual/Windows/DVMRunTasksComparisonForm.java

@@ -1,29 +0,0 @@
-package _VisualDVM.Visual.Windows;
-import _VisualDVM.Global;
-import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
-public class DVMRunTasksComparisonForm extends TasksComparisonForm<DVMRunTask> {
-    public DVMRunTasksComparisonForm(ComparisonForm<DVMRunTask> slave_in) {
-        super(DVMRunTask.class, slave_in);
-    }
-    @Override
-    public Object getDefaultCurrentObject() {
-        return Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
-    }
-    @Override
-    protected String getTextByTab() {
-        switch (status) {
-            case CompilationOutput:
-                return object.getCompilationOutput();
-            case CompilationErrors:
-                return object.getCompilationErrors();
-            case RunOutput:
-                return object.getOutput();
-            case RunErrors:
-                return object.getErrors();
-            case Sts:
-                return object.getStatistic();
-            default:
-                return "";
-        }
-    }
-}

src/_VisualDVM/Visual/Windows/TestingForm.form

@@ -111,8 +111,8 @@
           </grid>
           <grid id="1f9bd" binding="dvmComparisonTab" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints>
-              <tabbedpane title="Сравнение задач DVM" icon="icons/Comparsion.png">
+              <tabbedpane title="Задачи DVM" icon="icons/Comparsion.png">
-                <tooltip value="Сравнение пакетов тестирования DVM"/>
+                <tooltip value="Просмотр текущего пакета DVM"/>
               </tabbedpane>
             </constraints>
             <properties/>
@@ -159,11 +159,94 @@
                           <splitpane id="ba9b7" binding="SC50">
                             <constraints border-constraint="Center"/>
                             <properties>
-                              <dividerLocation value="500"/>
+                              <dividerLocation value="300"/>
                               <dividerSize value="3"/>
                             </properties>
                             <border type="none"/>
-                            <children/>
+                            <children>
+                              <grid id="49659" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                <constraints>
+                                  <splitpane position="left"/>
+                                </constraints>
+                                <properties/>
+                                <border type="none"/>
+                                <children>
+                                  <tabbedpane id="665df" binding="compilationTabs">
+                                    <constraints border-constraint="Center"/>
+                                    <properties/>
+                                    <border type="none"/>
+                                    <children>
+                                      <grid id="97d0" binding="compilationOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints>
+                                          <tabbedpane title="" icon="icons/CompilationOutput.png">
+                                            <tooltip value="Поток вывода компиляции"/>
+                                          </tabbedpane>
+                                        </constraints>
+                                        <properties/>
+                                        <border type="none"/>
+                                        <children/>
+                                      </grid>
+                                      <grid id="953c0" binding="compilationErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints>
+                                          <tabbedpane title="" icon="icons/CompilationErrors.png">
+                                            <tooltip value="Поток ошибок компиляции"/>
+                                          </tabbedpane>
+                                        </constraints>
+                                        <properties/>
+                                        <border type="none"/>
+                                        <children/>
+                                      </grid>
+                                    </children>
+                                  </tabbedpane>
+                                </children>
+                              </grid>
+                              <grid id="d5bb4" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                <constraints>
+                                  <splitpane position="right"/>
+                                </constraints>
+                                <properties/>
+                                <border type="none"/>
+                                <children>
+                                  <tabbedpane id="e06c2" binding="runTabs">
+                                    <constraints border-constraint="Center"/>
+                                    <properties/>
+                                    <border type="none"/>
+                                    <children>
+                                      <grid id="5f83b" binding="runOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints>
+                                          <tabbedpane title="" icon="icons/RunOutput.png">
+                                            <tooltip value="Поток вывода запуска"/>
+                                          </tabbedpane>
+                                        </constraints>
+                                        <properties/>
+                                        <border type="none"/>
+                                        <children/>
+                                      </grid>
+                                      <grid id="b85ac" binding="runErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints>
+                                          <tabbedpane title="" icon="icons/RunErrors.png">
+                                            <tooltip value="Поток ошибок запуска"/>
+                                          </tabbedpane>
+                                        </constraints>
+                                        <properties/>
+                                        <border type="none"/>
+                                        <children/>
+                                      </grid>
+                                      <grid id="d35c7" binding="runStsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints>
+                                          <tabbedpane title="" icon="icons/Sts.png">
+                                            <tooltip value="DVM статистика запуска"/>
+                                          </tabbedpane>
+                                        </constraints>
+                                        <properties/>
+                                        <border type="none"/>
+                                        <children/>
+                                      </grid>
+                                    </children>
+                                  </tabbedpane>
+                                </children>
+                              </grid>
+                            </children>
                           </splitpane>
                         </children>
                       </grid>

src/_VisualDVM/Visual/Windows/TestingForm.java

@@ -10,6 +10,7 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+import _VisualDVM.Visual.Editor.BaseEditor;
 import _VisualDVM.Visual.Interface.TestingWindow;
 
 import javax.swing.*;
@@ -18,8 +19,13 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 public class TestingForm implements FormWithSplitters, TestingWindow {
     //-
-    private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
+    private final BaseEditor coText;
-    private final DVMRunTasksComparisonForm dvmTestingRunSlave;
+    private final BaseEditor ceText;
+    private final BaseEditor roText;
+    private final BaseEditor reText;
+    private final BaseEditor stsText;
+    //private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
+    //private final DVMRunTasksComparisonForm dvmTestingRunSlave;
     //-
     private final SapforPackagesComparisonForm sapforPackageTreeMaster; //сравнение деревьев пакетов SAPFOR.
     private final SapforPackagesComparisonForm sapforPackageTreeSlave;
@@ -37,7 +43,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public JSplitPane SC83;
     public JSplitPane SC72;
     public JSplitPane SC85;
-
     private JPanel content;
     //---
     private JTabbedPane testingTabs;
@@ -66,6 +71,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel sapforSettingsPanel;
     private JPanel sapforSettingsCommandsPanel;
     private JPanel dvmSettingsPanel;
+    private JTabbedPane compilationTabs;
+    private JTabbedPane runTabs;
+    private JPanel compilationOutPanel;
+    private JPanel compilationErrPanel;
+    private JPanel runOutPanel;
+    private JPanel runErrPanel;
+    private JPanel runStsPanel;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -96,7 +108,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         content.add(Global.mainModule.getUI().getTestingMenuBar(), BorderLayout.NORTH);
         LoadSplitters();
         //-
-        dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
+        // dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
         sapforPackageTreeMaster = new SapforPackagesComparisonForm(sapforPackageTreeSlave = new SapforPackagesComparisonForm(null));
         sapforVersionMaster = new SapforVersionsComparisonForm(
                 sapforVersionSlave = new SapforVersionsComparisonForm(null, Current.SapforVersion),
@@ -105,8 +117,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         //--->>>
         RefreshTabsNames();
         //-
-        SC50.setLeftComponent(dvmTestingRunMaster.getContent());
+        compilationOutPanel.add(new JScrollPane(coText = new BaseEditor()));
-        SC50.setRightComponent(dvmTestingRunSlave.getContent());
+        compilationErrPanel.add(new JScrollPane(ceText = new BaseEditor()));
+        runOutPanel.add(new JScrollPane(roText = new BaseEditor()));
+        runErrPanel.add(new JScrollPane(reText = new BaseEditor()));
+        runStsPanel.add(new JScrollPane(stsText = new BaseEditor()));
         //-
         SC65.setLeftComponent(sapforPackageTreeMaster.getContent());
         SC66.setLeftComponent(sapforPackageTreeSlave.getContent());
@@ -157,8 +172,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void DropTestRunTasksComparison() {
-        dvmTestingRunMaster.RemoveObject();
+        //   dvmTestingRunMaster.RemoveObject();
-        dvmTestingRunSlave.RemoveObject();
+        //  dvmTestingRunSlave.RemoveObject();
     }
     @Override
     public void DropSapforComparison() {
@@ -223,14 +238,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         testingTabs.setTitleAt(2, "SAPFOR: ?");
     }
     @Override
-    public void ShowCurrentDVMPackage() {
-    }
-    @Override
-    public void ShowNoCurrentDVMPackage() {
-    }
-    @Override
     public void ShowDVMRunTask(DVMRunTask master) {
-        dvmTestingRunMaster.ApplyObject(master);
+        //  dvmTestingRunMaster.ApplyObject(master);
         testingTabs.setSelectedIndex(1);
     }
     @Override
@@ -242,17 +251,48 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         testingTabs.setSelectedIndex(1);
     }
     @Override
-    public void CompareDVMRunTasks(DVMRunTask master, DVMRunTask slave) {
-        dvmTestingRunMaster.ApplyObject(master);
-        dvmTestingRunSlave.ApplyObject(slave);
-        dvmTestingRunMaster.DoComparePass(true);
-        // testingTabs.setSelectedIndex(1);
-    }
-    @Override
     public void CompareSapforPackages(SapforPackage master, SapforPackage slave) {
         sapforPackageTreeMaster.ApplyObject(master);
         sapforPackageTreeSlave.ApplyObject(slave);
         sapforPackageTreeMaster.DoComparePass();
         testingTabs.setSelectedIndex(3);
     }
+    @Override
+    public void ShowCurrentDVMTask() {
+        DVMRunTask object = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
+        coText.setText(object.getCompilationOutput());
+        ceText.setText(object.getCompilationErrors());
+        roText.setText(object.getOutput());
+        reText.setText(object.getErrors());
+        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
+    public void ShowNoCurrentDVMTask() {
+        coText.setText("");
+        ceText.setText("");
+        roText.setText("");
+        reText.setText("");
+        stsText.setText("");
+    }
 }