fix fe checkstyle and backend ut

apache · Aug 7, 2024 · 4a91e5b · 4a91e5b
1 parent 0acab45
commit 4a91e5b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/...park/src/test/java/org/apache/dolphinscheduler/plugin/task/adbspark/AdbSparkTaskTest.java b/...park/src/test/java/org/apache/dolphinscheduler/plugin/task/adbspark/AdbSparkTaskTest.java
@@ -158,13 +158,19 @@ public void testTraceApplication() throws Exception {
         adbSparkTask.setAppIds(mockAppId);
 
         // mock
+        when(mockAdbSparkClient.submitSparkApp(any())).thenReturn(mockSubmitSparkAppResponse);
+        when(mockSubmitSparkAppResponse.getBody()).thenReturn(mockSubmitSparkAppResponseBody);
+        when(mockSubmitSparkAppResponseBody.getData()).thenReturn(mockSubmitSparkAppResponseBodyData);
+        when(mockSubmitSparkAppResponseBodyData.getAppId()).thenReturn(mockAppId);
+
         when(mockAdbSparkClient.getSparkAppState(any(GetSparkAppStateRequest.class)))
                 .thenReturn(mockGetSparkAppStateResponse);
         when(mockGetSparkAppStateResponse.getBody()).thenReturn(mockGetSparkAppStateResponseBody);
         when(mockGetSparkAppStateResponseBody.getData()).thenReturn(mockGetSparkAppStateResponseBodyData);
         when(mockGetSparkAppStateResponseBodyData.getState()).thenReturn("COMPLETED");
 
         // action
+        adbSparkTask.submitApplication();
         adbSparkTask.trackApplicationStatus();
 
         // verify
@@ -177,7 +183,20 @@ public void testCancelApplication() throws Exception {
         adbSparkTask.init();
         adbSparkTask.setAppIds(mockAppId);
 
+        // mock
+        when(mockAdbSparkClient.submitSparkApp(any())).thenReturn(mockSubmitSparkAppResponse);
+        when(mockSubmitSparkAppResponse.getBody()).thenReturn(mockSubmitSparkAppResponseBody);
+        when(mockSubmitSparkAppResponseBody.getData()).thenReturn(mockSubmitSparkAppResponseBodyData);
+        when(mockSubmitSparkAppResponseBodyData.getAppId()).thenReturn(mockAppId);
+
+        when(mockAdbSparkClient.getSparkAppState(any(GetSparkAppStateRequest.class)))
+                .thenReturn(mockGetSparkAppStateResponse);
+        when(mockGetSparkAppStateResponse.getBody()).thenReturn(mockGetSparkAppStateResponseBody);
+        when(mockGetSparkAppStateResponseBody.getData()).thenReturn(mockGetSparkAppStateResponseBodyData);
+        when(mockGetSparkAppStateResponseBodyData.getState()).thenReturn("SUBMITTED");
+
         // action
+        adbSparkTask.submitApplication();
         adbSparkTask.cancelApplication();
 
         // verify

diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-aliyun-adb-spark.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-aliyun-adb-spark.ts
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 import { useI18n } from 'vue-i18n'
-import {useCustomParams, useResources} from '.'
+import { useCustomParams } from '.'
 import type { IJsonItem } from '../types'
-import {ref} from "vue";
 
 export function useADBSPARK(model: { [field: string]: any}): IJsonItem[] {