Merge pull request #75 from bia-technologies/feature/74

fix: добавлена обработка ситуации с пустым отчетом

Author: alkoleft

viewer/src/main/java/ru/biatech/edt/junit/BasicElementLabels.java

@@ -18,7 +18,7 @@
 
 import org.eclipse.osgi.util.TextProcessor;
 
-import java.io.File;
+import java.nio.file.Path;
 
 
 /**
@@ -49,8 +49,8 @@ private static String markLTR(String string, String delimiters) {
    * @param file the file
    * @return the label of the file path to be used in the UI.
    */
-  public static String getPathLabel(File file) {
-    return markLTR(file.getAbsolutePath(), "/\\:.");  //$NON-NLS-1$
+  public static String getPathLabel(Path file) {
+    return markLTR(file.toAbsolutePath().toString(), "/\\:.");  //$NON-NLS-1$
   }
 
   /**

viewer/src/main/java/ru/biatech/edt/junit/model/Session.java

@@ -132,6 +132,7 @@ public class Session extends Report<TestSuiteElement> implements ITestRunSession
   public Session() {
     testRunnerKind = ITestKind.NULL; //TODO
     startTime = System.currentTimeMillis();
+    testsuite = new TestSuiteElement[0];
     reset();
   }
 
@@ -153,6 +154,10 @@ public ITestSuiteElement getParent() {
 
   @Override
   public TestStatus getStatus() {
+    if (getTestsuite().length == 0) {
+      return TestStatus.NOT_RUN;
+    }
+
     var status = TestStatus.OK;
     for (var item : getTestsuite()) {
       status = TestStatus.combineStatus(status, item.getStatus());
@@ -322,6 +327,8 @@ public String toString() {
    * Заполняет необходимые поля. Вызывается после полного заполнения.
    */
   void init() {
+    reset();
+
     for (var suite : getTestsuite()) {
       suite.init();
       errorCount += suite.getErrors();

viewer/src/main/java/ru/biatech/edt/junit/model/SessionsManager.java

@@ -37,9 +37,9 @@
 import ru.biatech.edt.junit.model.report.ReportLoader;
 import ru.biatech.edt.junit.ui.UIMessages;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -66,10 +66,17 @@ public SessionsManager() {
   private LifecycleListener lifecycleListener;
   private Session activeSession;
 
+  private static void dropFile(Path path) {
+    try {
+      Files.deleteIfExists(path);
+    } catch (IOException e) {
+      TestViewerPlugin.log().logError("Не удалось удалить файл: " + path, e);
+    }
+  }
+
   public void importSession(LifecycleItem item) {
     log().debug(UIMessages.JUnitModel_LoadReport);
 
-    try {
       var launch = item.getMainLaunch();
 
       var configuration = launch.getLaunchConfiguration();
@@ -83,20 +90,22 @@ public void importSession(LifecycleItem item) {
       }
 
       log().debug("Импорт отчета о тестировании: " + reportPath.toAbsolutePath());
+    try {
       Session session;
       if (activeSession != null && activeSession.isRunning()) {
-        importActiveSession(reportPath.toFile());
+        importActiveSession(reportPath);
       } else {
-        session = importSession(reportPath.toFile());
+        session = importSession(reportPath);
         if (session == null) {
           log().logError("Session is null after import.");
           return;
         }
         session.setLaunch(item.getTestLaunch());
       }
-      Files.deleteIfExists(reportPath);
-    } catch (CoreException | IOException e) {
+    } catch (CoreException e) {
       log().logError(UIMessages.JUnitModel_UnknownErrorOnReportLoad, e);
+    } finally {
+      dropFile(reportPath);
     }
   }
 
@@ -107,7 +116,7 @@ public void importSession(LifecycleItem item) {
    * @return the imported test run session
    * @throws CoreException if the import failed
    */
-  public Session importSession(File file) throws CoreException {
+  public Session importSession(Path file) throws CoreException {
     Session session;
     try {
       log().debug("Загрузку отчета в новую сессию");
@@ -124,7 +133,7 @@ public Session importSession(File file) throws CoreException {
     return session;
   }
 
-  public void importActiveSession(File file) {
+  public void importActiveSession(Path file) {
     log().debug("Загрузку отчета в активную сессию");
     ReportLoader.loadInto(file, activeSession);
     appendSession(activeSession);
@@ -140,6 +149,9 @@ public void importSession(TestSuiteElement[] data, ILaunch launch) {
 
   private void appendSession(Session session) {
     session.init();
+    if (session.getTestsuite().length == 0) {
+      log().logError("Отчет пуст");
+    }
     instance.addSession(session);
 
     // TODO: Генерировать событие и отображать панель оттуда
@@ -172,7 +184,7 @@ public void stop() {
     var swapFiles = historyDirectory.listFiles();
     if (swapFiles != null) {
       for (var swapFile : swapFiles) {
-        swapFile.delete();
+        dropFile(swapFile.toPath());
       }
     }
   }

viewer/src/main/java/ru/biatech/edt/junit/model/TestSuiteElement.java

@@ -17,19 +17,21 @@
 package ru.biatech.edt.junit.model;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import ru.biatech.edt.junit.model.report.ErrorInfo;
 import ru.biatech.edt.junit.model.report.TestSuite;
 
 import java.util.Arrays;
 import java.util.stream.Stream;
 
-@NoArgsConstructor
 public class TestSuiteElement extends TestSuite<TestCaseElement> implements ITestSuiteElement {
   @Getter
   private TestStatus status;
   private TestStatus childrenStatus;
 
+  public TestSuiteElement() {
+    testcase = new TestCaseElement[0];
+  }
+
   @Override
   public ITestSuiteElement getParent() {
     return null;
@@ -93,7 +95,10 @@ void init() {
     failures = 0;
     errors = 0;
     skipped = 0;
-    tests = testcase.length;
+    tests = getTestcase().length;
+    status = TestStatus.NOT_RUN;
+    childrenStatus = TestStatus.OK;
+
     for (var test : getTestcase()) {
       test.init(this);
       switch (test.getStatus()) {

viewer/src/main/java/ru/biatech/edt/junit/model/report/Report.java

@@ -11,6 +11,6 @@ public class Report<T extends TestSuite<?>> {
    * Properties (e.g., environment settings) set during test execution
    */
   @JacksonXmlElementWrapper(useWrapping = true, localName = "properties")
-  Property[] property;
-  T[] testsuite;
+  protected Property[] property;
+  protected T[] testsuite;
 }

viewer/src/main/java/ru/biatech/edt/junit/model/report/ReportLoader.java

@@ -4,19 +4,24 @@
 import lombok.experimental.UtilityClass;
 import ru.biatech.edt.junit.Serializer;
 
-import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 @UtilityClass
 public class ReportLoader {
 
   @SneakyThrows
-  public <T> T load(File path, Class<T> reportClass) {
-    return Serializer.getXmlMapper().readValue(path, reportClass);
+  public <T> T load(Path path, Class<T> reportClass) {
+    try (var stream = Files.newInputStream(path)) {
+      return Serializer.getXmlMapper().readValue(stream, reportClass);
+    }
   }
 
   @SneakyThrows
-  public <T> void loadInto(File path, T object) {
-    Serializer.getXmlMapper().readerForUpdating(object).readValue(path);
+  public <T> void loadInto(Path path, T object) {
+    try (var stream = Files.newInputStream(path)) {
+      Serializer.getXmlMapper().readerForUpdating(object).readValue(stream);
+    }
   }
 
 }

viewer/src/main/java/ru/biatech/edt/junit/ui/report/TestRunnerViewPart.java

@@ -340,9 +340,13 @@ private void resetViewIcon() {
   }
 
   private void updateViewIcon() {
-    if (session == null || session.getStartedCount() == 0) {
+    if (session == null) {
       fViewImage = fOriginalViewImage;
-    } else if (hasErrorsOrFailures()) {
+    } else if (session.getTestsuite().length == 0) {
+      fViewImage = imageProvider.getInactiveLogo();
+    } else if (session.getErrorCount() != 0) {
+      fViewImage = imageProvider.getTestRunErrorIcon();
+    } else if (session.getFailureCount() != 0) {
       fViewImage = imageProvider.getTestRunFailIcon();
     } else {
       fViewImage = imageProvider.getTestRunOKIcon();

viewer/src/main/java/ru/biatech/edt/junit/ui/report/actions/ImportTestRunSessionAction.java

@@ -26,7 +26,7 @@
 import ru.biatech.edt.junit.ui.UIMessages;
 import ru.biatech.edt.junit.ui.report.TestRunnerViewPart;
 
-import java.io.File;
+import java.nio.file.Path;
 
 /**
  * Команда загрузки отчета о тестировании из файла
@@ -54,7 +54,7 @@ public void run() {
     }
 
     //TODO: MULTI: getFileNames()
-    File file = new File(path);
+    var file = Path.of(path);
 
     try {
       SessionsManager.getInstance().importSession(file);

viewer/src/main/java/ru/biatech/edt/junit/ui/viewsupport/ImageProvider.java

@@ -20,7 +20,9 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.DecorationOverlayIcon;
 import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
@@ -91,10 +93,14 @@ public class ImageProvider {
   @Getter(lazy = true)
   private final Image logo = createManagedImage(LOGO);
   @Getter(lazy = true)
+  private final Image inactiveLogo = createGrayManagedImage(getLogo());
+  @Getter(lazy = true)
   private final Image testRunOKIcon = createOverlayIcon(getLogo(), OVERLAY_SUCCESS);
   @Getter(lazy = true)
   private final Image testRunFailIcon = createOverlayIcon(getLogo(), OVERLAY_FAILED);
   @Getter(lazy = true)
+  private final Image testRunErrorIcon = createOverlayIcon(getLogo(), OVERLAY_ERROR);
+  @Getter(lazy = true)
   private final Image testIcon = createManagedImage(TEST_ICON);
   @Getter(lazy = true)
   private final Image testOkIcon = createManagedImage(TEST_OK_ICON);
@@ -176,6 +182,12 @@ private Image createManagedImage(String path) {
     return createManagedImage(getImageDescriptor(path));
   }
 
+  private Image createGrayManagedImage(Image base) {
+    var image = new Image(Display.getDefault(), base, SWT.IMAGE_GRAY);
+    imagesToDispose.add(image);
+    return image;
+  }
+
   private Image createOverlayIcon(Image base, String second) {
     return createOverlayIcon(base, getImageDescriptor(second));
   }

viewer/src/main/java/ru/biatech/edt/junit/yaxunit/remote/RemoteLauncherImpl.java

@@ -92,7 +92,7 @@ public void onMessageReceive(WebSocket socket, Message<?> message) {
   }
 
   private void handleReportFile(ReportFileMessage message) {
-    SessionsManager.getInstance().importActiveSession(message.getData().getReportFile().toFile());
+    SessionsManager.getInstance().importActiveSession(message.getData().getReportFile());
   }
 
   private void handleReport(ReportMessage message) {