Merge pull request #164 from ecubus/test_log_opt

frankie-zeng · web-flow · commit 8cf39d8027c4 · 2025-06-26T10:45:31.000+08:00
Test log opt
diff --git a/resources/lib/js/sa.node b/resources/lib/js/sa.node
diff --git a/resources/lib/js/uds.js b/resources/lib/js/uds.js
diff --git a/resources/lib/js/uds.js.map b/resources/lib/js/uds.js.map
diff --git a/src/main/ipc/uds.ts b/src/main/ipc/uds.ts
@@ -153,14 +153,9 @@ ipcMain.handle('ipc-run-test', async (event, ...arg) => {
     last.close()
     testMap.delete(test.id)
   }
-  const nodeItem: NodeItem = {
-    id: test.id,
-    name: test.name,
-    channel: test.channel,
-    script: test.script
-  }
+
   const node = new NodeClass(
-    nodeItem,
+    test,
     canBaseMap,
     linBaseMap,
     doips,
diff --git a/src/main/nodeItem.ts b/src/main/nodeItem.ts
@@ -182,7 +182,10 @@ export class NodeClass {
                 const tp = new CAN_TP(canBaseItem)
                 for (const [index, addr] of tester.address.entries()) {
                   if (addr.type == 'can' && addr.canAddr) {
-                    const idT = tp.getReadId(addr.canAddr, tester.simulateBy != nodeItem.id)
+                    const idT = tp.getReadId(
+                      addr.canAddr,
+                      nodeItem.isTest ? true : tester.simulateBy != nodeItem.id
+                    )
                     tp.event.on(idT, (data) => {
                       if (data instanceof CanTpError) {
                         //TODO:
@@ -205,7 +208,10 @@ export class NodeClass {
                       }
                     })
                     if (index == 0) {
-                      const idR = tp.getReadId(swapAddr(addr.canAddr), true)
+                      const idR = tp.getReadId(
+                        swapAddr(addr.canAddr),
+                        nodeItem.isTest ? tester.simulateBy != nodeItem.id : true
+                      )
                       tp.event.on(idR, (data) => {
                         if (data instanceof CanTpError) {
                           //TODO:
@@ -287,7 +293,7 @@ export class NodeClass {
               if (ethBaseItem && tester.type == 'eth') {
                 const baseItem = this.doips.find((d) => d.base.id == ethBaseItem.id)
                 if (baseItem) {
-                  if (tester.simulateBy == nodeItem.id) {
+                  if (tester.simulateBy == nodeItem.id && !nodeItem.isTest) {
                     baseItem.registerEntity(true, this.log)
                   }
                   for (const addr of tester.address) {
diff --git a/src/main/share/uds.d.ts.html b/src/main/share/uds.d.ts.html
@@ -1,7 +1,7 @@
 import { dot } from 'node:test/reporters';
 export { default as assert } from 'node:assert';
-import { describe } from 'node:test';
-export { after, afterEach, before, beforeEach, test } from 'node:test';
+import { test as test$1 } from 'node:test';
+export { after, afterEach, before, beforeEach } from 'node:test';
 
 /**
  * Represents a CAN (Controller Area Network) message.
@@ -402,7 +402,30 @@
     private loadDll;
 }
 
-declare const selfDescribe: typeof describe;
+/**
+ * Test function for writing test cases. Provides test context and logging.
+ *
+ * @category TEST
+ * @param {string} name - The name of the test case
+ * @param {Function} fn - The test function to execute
+ *
+ * @example
+ * ```ts
+ * // Basic test case
+ * test('should add numbers correctly', () => {
+ *   assert.equal(1 + 1, 2);
+ * });
+ *
+ * // Async test case
+ * test('should handle async operations', async () => {
+ *   const result = await someAsyncFunction();
+ *   assert.equal(result, expectedValue);
+ * });
+ * ```
+ */
+declare function test(name: string, fn: () => void | Promise<void>): void;
+
+declare const selfDescribe: typeof test$1.describe.only;
 
 declare const testerList: readonly [
                 {{#each this.testers}}
@@ -1529,4 +1552,4 @@
  */
 declare function linStopScheduler(device?: string): Promise<void>;
 
-export { CAN_ADDR_FORMAT, CAN_ADDR_TYPE, CAN_ID_TYPE, type CanAddr, type CanMessage, type CanMsgType, DiagJob, DiagRequest, DiagResponse, type EntityAddr, type EthAddr, type JobName, type LinAddr, LinChecksumType, LinDirection, LinMode, type LinMsg, RegisterEthVirtualEntity, SecureAccessDll, type ServiceEvent, type ServiceId, type ServiceItem, type ServiceName, type ServiceNameRecv, type ServiceNameSend, type SignalName, type TesterInfo, type TesterName, type UdsAddress, type UdsSeqName, Util, UtilClass, type VariableMap, selfDescribe as describe, linStartScheduler, linStopScheduler, output, reporter, runUdsSeq, setSignal, setVar, stopUdsSeq };
+export { CAN_ADDR_FORMAT, CAN_ADDR_TYPE, CAN_ID_TYPE, type CanAddr, type CanMessage, type CanMsgType, DiagJob, DiagRequest, DiagResponse, type EntityAddr, type EthAddr, type JobName, type LinAddr, LinChecksumType, LinDirection, LinMode, type LinMsg, RegisterEthVirtualEntity, SecureAccessDll, type ServiceEvent, type ServiceId, type ServiceItem, type ServiceName, type ServiceNameRecv, type ServiceNameSend, type SignalName, type TesterInfo, type TesterName, type UdsAddress, type UdsSeqName, Util, UtilClass, type VariableMap, selfDescribe as describe, linStartScheduler, linStopScheduler, output, reporter, runUdsSeq, setSignal, setVar, stopUdsSeq, test };
diff --git a/src/main/worker/uds.ts b/src/main/worker/uds.ts
@@ -40,35 +40,50 @@ export type { CanMsgType } from '../share/can'
 export type { UdsAddress }
 import { dot } from 'node:test/reporters'
 import assert from 'node:assert'
-/**
- * @category TEST
- */
-export { assert }
-
-/**
- * @category TEST
- */
-export { test } from 'node:test'
-
-/**
- * @category TEST
- */
-export { beforeEach } from 'node:test'
 
 /**
  * @category TEST
  */
-export { afterEach } from 'node:test'
+export { assert }
 
+import { test as nodeTest } from 'node:test'
 /**
+ * Test function for writing test cases. Provides test context and logging.
+ *
  * @category TEST
+ * @param {string} name - The name of the test case
+ * @param {Function} fn - The test function to execute
+ *
+ * @example
+ * ```ts
+ * // Basic test case
+ * test('should add numbers correctly', () => {
+ *   assert.equal(1 + 1, 2);
+ * });
+ *
+ * // Async test case
+ * test('should handle async operations', async () => {
+ *   const result = await someAsyncFunction();
+ *   assert.equal(result, expectedValue);
+ * });
+ * ```
  */
-export { before } from 'node:test'
+export function test(name: string, fn: () => void | Promise<void>) {
+  nodeTest(name, (t) => {
+    t.before(() => {
+      console.log(`<<< TEST START ${name}>>>`)
+    })
+    t.after(() => {
+      console.log(`<<< TEST END ${name}>>>`)
+    })
+    return fn()
+  })
+}
 
 /**
  * @category TEST
  */
-export { after } from 'node:test'
+export { beforeEach, afterEach, before, after } from 'node:test'
 
 /**
  * @category TEST
diff --git a/src/main/workerClient.ts b/src/main/workerClient.ts
@@ -164,19 +164,29 @@ export default class UdsTester {
 
     d.worker.stdout.on('data', (data: any) => {
       if (!this.selfStop) {
-        const str = data.toString().trim()
-        if (str) {
-          this.log.scriptMsg(str, this.ts)
+        if (this.env.MODE == 'test') {
+          const testStartRegex = /^<<< TEST START .+>>>$/
+          const testEndRegex = /^<<< TEST END .+>>>$/
+          const str = data.toString().trim()
+          if (testStartRegex.test(str) || testEndRegex.test(str)) {
+            return
+          }
         }
+        this.log.scriptMsg(data.toString(), this.ts)
       }
     })
 
     d.worker.stderr.on('data', (data: any) => {
       if (!this.selfStop) {
-        const str = data.toString().trim()
-        if (str) {
-          this.log.systemMsg(str, this.ts, 'error')
+        if (this.env.MODE == 'test') {
+          const testStartRegex = /^<<< TEST START .+>>>$/
+          const testEndRegex = /^<<< TEST END .+>>>$/
+          const str = data.toString().trim()
+          if (testStartRegex.test(str) || testEndRegex.test(str)) {
+            return
+          }
         }
+        this.log.systemMsg(data.toString(), this.ts, 'error')
       }
     })
 
diff --git a/src/renderer/src/views/uds/log.vue b/src/renderer/src/views/uds/log.vue
@@ -28,6 +28,11 @@
           :icon="successIcon"
           style="font-size: 14px; margin-top: 8px"
         />
+        <Icon
+          v-else-if="row.level == 'primary'"
+          :icon="primaryIcon"
+          style="font-size: 14px; margin-top: 8px"
+        />
       </template>
       <template #toolbar>
         <div
@@ -79,6 +84,7 @@ import errorIcon from '@iconify/icons-material-symbols/chat-error-outline-sharp'
 import warnIcon from '@iconify/icons-material-symbols/warning-outline-rounded'
 import saveIcon from '@iconify/icons-material-symbols/save'
 import successIcon from '@iconify/icons-material-symbols/check-circle-outline'
+import primaryIcon from '@iconify/icons-material-symbols/line-start-square-outline-rounded'
 import { useProjectStore } from '@r/stores/project'
 import type { TestEvent } from 'node:test/reporters'
 import { useGlobalStart } from '@r/stores/runtime'
@@ -283,8 +289,9 @@ function testLog(
       logData.push({
         time: new Date().toLocaleTimeString(),
         label: item.message.data.data.name,
-        level: 'info',
+        level: 'primary',
         message: `Test ${item.message.data.data.name} starting...`,
+
         id: cnt++
       })
     } else if (item.message.data.type == 'test:pass') {
@@ -360,7 +367,9 @@ onUnmounted(() => {
 .info {
   color: var(--el-color-info-dark-5);
 }
-
+.primary {
+  color: var(--el-color-primary);
+}
 .debug {
   color: var(--el-color-info);
 }
diff --git a/src/renderer/src/views/uds/test.vue b/src/renderer/src/views/uds/test.vue
@@ -191,7 +191,7 @@
           </el-tree>
         </el-scrollbar>
       </div>
-      <div id="testerServiceShift" class="shift" />
+      <div id="tttShift" class="shift" />
       <div class="right" :style="{ left: leftWidth + 5 + 'px' }">
         <trace-component
           ref="traceRef"
@@ -755,7 +755,7 @@ function testLog(
   }
 }
 onMounted(() => {
-  window.jQuery('#testerServiceShift').resizable({
+  window.jQuery('#tttShift').resizable({
     handles: 'e',
     resize: (e, ui) => {
       leftWidth.value = ui.size.width
