add new testcase about new interface

Signed-off-by: Nfangyun <fangyun2@huawei.com>

customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets

@@ -28,7 +28,7 @@ export default function edmCallbackTest() {
     * @tc.name test enableAdmin method in callback mode without user id
     * @tc.desc enable admin in callback mode
     */
-     it('enableAdmin_test_002', 0, async function (done) {
+    it('enableAdmin_test_002', 0, async function (done) {
         await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent);
         async function OnReceiveEvent(err) {
@@ -76,7 +76,6 @@ export default function edmCallbackTest() {
     })
 
     /**
-<<<<<<< HEAD
      * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0006
      * @tc.name test enableAdmin method in callback mode without user id
      * @tc.desc enable admin in callback mode
@@ -104,8 +103,6 @@ export default function edmCallbackTest() {
     })
 
     /**
-=======
->>>>>>> 9a8445303aa68dd521e7c822b4b6c47c1cbc6cbc
      * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0008
      * @tc.name test enableAdmin method with user id in callback mode with default user id
      * @tc.desc enable admin in multi-user
@@ -282,7 +279,6 @@ export default function edmCallbackTest() {
             await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME);
             done();
         }
-<<<<<<< HEAD
     })
 
     /**
@@ -474,8 +470,6 @@ export default function edmCallbackTest() {
         await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME);
         console.log('enterpriseDeviceManager.disableSuperAdmin ADMIN_TYPE_SUPER.');
         done();
-=======
->>>>>>> 9a8445303aa68dd521e7c822b4b6c47c1cbc6cbc
     })
   })
 }

customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets

@@ -26,7 +26,7 @@ export default function edmPromiseTest() {
      * @tc.name test enableAdmin method in promise mode without user id
      * @tc.desc enable admin in promise mode
      */
-     it('enableAdmin_test_001', 0, async function (done) {
+    it('enableAdmin_test_001', 0, async function (done) {
         await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL);
         console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL.');
@@ -69,7 +69,6 @@ export default function edmPromiseTest() {
     })
 
     /**
-<<<<<<< HEAD
      * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0005
      * @tc.name test enableAdmin method in promise mode without user id
      * @tc.desc enable admin in promise mode
@@ -94,8 +93,6 @@ export default function edmPromiseTest() {
     })
 
     /**
-=======
->>>>>>> 9a8445303aa68dd521e7c822b4b6c47c1cbc6cbc
      * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0007
      * @tc.name test enableAdmin method in promise mode with default user id
      * @tc.desc enable admin in multi-user