[fix] fix show command handler

liubingmx · Mar 29, 2024 · 38e701d · 38e701d
1 parent 5a5b2cd
commit 38e701d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/src/main/java/cn/net/fasttest/command/handler/ShowCommandHandler.java b/src/main/java/cn/net/fasttest/command/handler/ShowCommandHandler.java
@@ -52,8 +52,11 @@ private void showResult() {
             }
         }
         System.out.println();
+        if (lastRunResult.getTotalTestCount() != lastRunResult.getStarted()) {
+            return;
+        }
         log("--------------------------------- Summary ---------------------------------");
-        log("RUN %s",lastRunResult.getUniqueId());
+        log("RUN %s", lastRunResult.getUniqueId());
         log("Result -- started:%d -- succeeded: %d -- failed: %d -- skipped: %d -- cost: %d ms",
                 lastRunResult.getStarted(), lastRunResult.getSucceeded(), lastRunResult.getFailed(),
                 lastRunResult.getSkipped(), lastRunResult.getCost());

diff --git a/src/main/java/cn/net/fasttest/runner/RunnerFactory.java b/src/main/java/cn/net/fasttest/runner/RunnerFactory.java
@@ -56,6 +56,13 @@ public static TestRunner getRunner(String methodName, Class<?> clazz) {
                         return runnerMap.get(runnerName);
                     }
                 }
+                Method[] methods = clazz.getMethods();
+                for (Method method : methods) {
+                    testAnnotation = method.getAnnotation(testAnnotationClazz);
+                    if (Objects.nonNull(testAnnotation)) {
+                        return runnerMap.get(runnerName);
+                    }
+                }
             } catch (ClassNotFoundException e) {
                 continue;
             }catch (NoSuchMethodException | ClassCastException e){

diff --git a/src/main/java/cn/net/fasttest/runner/TestRunResult.java b/src/main/java/cn/net/fasttest/runner/TestRunResult.java
@@ -16,11 +16,21 @@ public class TestRunResult {
     private String state;
     private String displayName;
     private long cost;
+
+    private long totalTestCount;
     private long started;
     private long succeeded;
     private long failed;
     private long skipped;
 
+    public long getTotalTestCount() {
+        return totalTestCount;
+    }
+
+    public void setTotalTestCount(long totalTestCount) {
+        this.totalTestCount = totalTestCount;
+    }
+
     public void setCost(long cost) {
         this.cost = cost;
     }

diff --git a/src/main/java/cn/net/fasttest/runner/junit/JunitTestExecutionListener.java b/src/main/java/cn/net/fasttest/runner/junit/JunitTestExecutionListener.java
@@ -39,13 +39,14 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
         TestRunResult testRunResult = new TestRunResult();
         testRunResult.setState(testExecutionResult.getStatus().name());
         testRunResult.setDisplayName(testIdentifier.getDisplayName());
-        testRunResult.setUniqueId(clazz.getName() + "#" + method);
+        testRunResult.setUniqueId(method != null ? clazz.getName() + "#" + method : clazz.getName());
         testRunResult.setThrowable(throwable.orElse(null));
         testRunResult.setCost(System.currentTimeMillis() - summary.getTimeStarted());
         testRunResult.setFailed(summary.getTestsFailedCount());
         testRunResult.setSucceeded(summary.getTestsSucceededCount());
         testRunResult.setSkipped(summary.getTestsSkippedCount());
         testRunResult.setStarted(summary.getTestsStartedCount());
+        testRunResult.setTotalTestCount(summary.getTestsFoundCount());
         EventBus.publishEvent(new FastSpringTestEvent(EventEnum.RUN_TESTCASE, testRunResult));
     }
 }