diff --git a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Publicfunction-n.js b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Publicfunction-n.js index 5bb19e78084652ffce6abc9c10efceec3d23629d..c6f558fc7507bfc20fcca286d8392a535f837c9a 100644 --- a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Publicfunction-n.js +++ b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Publicfunction-n.js @@ -31,11 +31,16 @@ function publicRegisterInputer(PinAuth,AuthSubType,Inputerdata){ try { console.info('testFace publicRegisterInputer in try'); console.info('testFace publicRegisterInputer PinAuth = ' + PinAuth); + let GetAuthSubType = 0; let registerresult = PinAuth.registerInputer({ - onGetData: (AuthSubType, IInputData) => { - console.info('testFace faceDemo registerInputer AuthSubType'); - console.info('testFace faceDemo registerInputer AuthSubType111'); - IInputData.onSetData(AuthSubType, Inputerdata) + onGetData: (GetAuthSubType, IInputData) => { + if (GetAuthSubType == 0) { + console.info('testFace faceDemo registerInputer AuthSubType'); + console.info('testFace faceDemo registerInputer AuthSubType111'); + IInputData.onSetData(AuthSubType, Inputerdata) + } else { + IInputData.onSetData(GetAuthSubType, Inputerdata) + } } }) console.log("testFace publicRegisterInputer result is: " + registerresult); diff --git a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Coauth_Func_CallbackJsunit.test.js b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Coauth_Func_CallbackJsunit.test.js index bbcfa687bbbfabeeea28c339748002da2db88a60..43d0a96a619e02b1484b158090cb9ab3567c2fa5 100644 --- a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Coauth_Func_CallbackJsunit.test.js +++ b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Coauth_Func_CallbackJsunit.test.js @@ -178,64 +178,6 @@ describe('userauthTest', function () { expect(null).assertFail(); } }) - - /* - * @tc.number : Security_IAM_Coauth_Func_0104 - * @tc.name : Inquire face credential information - * @tc.size : MediumTest - * @tc.type : Function - * @tc.level : Level 2 - */ - it('Security_IAM_Coauth_Func_0104', 3, async function (done) { - try { - publicFC.publicRegisterInputer(PinAuth,AuthSubType.PIN_SIX,Inputerdata) - publicFC.publicOpenSession(UserIDM,function(data){ - let challenge = data - publicFC.publicaddCredential(UserIDM,CredentialInfopinsix, - function(onresult) { - console.info('testFace Coauth_Func_0104 addCredresult = ' + onresult.addCredresult); - publicFC.publicauth(UserAuth,challenge,AuthType.PIN,AuthTurstLevel.ATL1, - function(onresult) { - console.info( - 'testFace Coauth_Func_0104 addCred onResult = ' + JSON.stringify(onresult)); - let token = onresult.authextr.token - CredentialInfoface2d.token = token - publicFC.publicaddCredential(UserIDM,CredentialInfoface2d,function(onresult) { - console.log("testFace Coauth_Func_0104 addface= " + onresult.addCredresult) - publicFC.publicgetAuthInfo(UserIDM,AuthType.FACE,function(AsyncCallback) { - console.log("testFace Coauth_Func_0104 getAuthInfo= " + - JSON.stringify(AsyncCallback)) - expect(AuthSubType.FACE_2D).assertEqual(AsyncCallback[0].authSubType); - publicFC.publicgetAuthInfo(UserIDM,AuthType.PIN,function(AsyncCallback) { - console.log("testFace Coauth_Func_0104 getAuthInfo = " + - JSON.stringify(AsyncCallback)) - expect(AuthSubType.PIN_SIX).assertEqual(AsyncCallback[0].authSubType); - publicFC.publicdelUser(UserIDM,token,function(onresult){ - let delresult = onresult.delUserresult; - console.log("testFace Coauth_Func_0104 delUser= " + delresult) - publicFC.publicCloseSession(UserIDM,function(data){ - console.log("testFaceCoauth_Func_0104 CloseSession= " + data) - publicFC.publicunRegisterInputer(PinAuth,function(data){ - done(); - }) - }) - },function(onacquireinfo){ - }) - }) - }) - }, function(onAcquireInfo) { - }) - }, function(onAcquireInfo) { - } - ); - }, function(onAcquireInfo) { - }); - }) - } catch (e) { - console.log("Security_IAM_Coauth_Func_0104 fail " + e); - expect(null).assertFail(); - } - }) /* * @tc.number : Security_IAM_Coauth_Func_0105 @@ -286,89 +228,35 @@ describe('userauthTest', function () { }) /* - * @tc.number : Security_IAM_Coauth_Func_0106 - * @tc.name : Inquire all credential information with two credential - * @tc.size : MediumTest - * @tc.type : Function - * @tc.level : Level 1 - */ - it('Security_IAM_Coauth_Func_0106', 3, async function (done) { - try { - publicFC.publicRegisterInputer(PinAuth,AuthSubType.PIN_SIX,Inputerdata) - publicFC.publicOpenSession(UserIDM,function(data){ - let challenge = data - publicFC.publicaddCredential(UserIDM,CredentialInfopinsix, - function(onresult) { - console.info('testFace Coauth_Func_0106 addCredresult = ' + onresult.addCredresult); - publicFC.publicauth(UserAuth,challenge,AuthType.PIN,AuthTurstLevel.ATL1, - function(onresult) { - console.info('testFace Coauth_Func_0106 addCred= ' + JSON.stringify(onresult)); - let token = onresult.authextr.token - CredentialInfoface2d.token = token - publicFC.publicaddCredential(UserIDM,CredentialInfoface2d,function(onresult) { - console.log("testFace Coauth_Func_0106 addCface = " + onresult.addCredresult) - publicFC.publicgetallAuthInfo(UserIDM,function(AsyncCallback) { - console.log("testFace Coauth_Func_0106 getAuthInfo = " + - JSON.stringify(AsyncCallback)) - expect(AuthSubType.PIN_SIX).assertEqual(AsyncCallback[1].authSubType); - expect(AuthType.PIN).assertEqual(AsyncCallback[1].authType); - expect(AuthSubType.FACE_2D).assertEqual(AsyncCallback[0].authSubType); - expect(AuthType.FACE).assertEqual(AsyncCallback[0].authType); - publicFC.publicdelUser(UserIDM,token,function(onresult){ - console.log("testFace Coauth_Func_0106delUser="+ onresult.delUserresult) - publicFC.publicCloseSession(UserIDM,function(data){ - console.log("testFace Coauth_Func_0106 CloseSession = " + data) - publicFC.publicunRegisterInputer(PinAuth,function(data){ - done(); - }) - }) - },function(onacquireinfo){ - }) - }) - }, function(onAcquireInfo) { - }) - }, function(onAcquireInfo) { - } - ); - }, function(onAcquireInfo) { - }); - }) - } catch (e) { - console.log("Security_IAM_Coauth_Func_0106 fail " + e); - expect(null).assertFail(); - } - }) - - /* - * @tc.number : Security_IAM_Coauth_Func_0108 + * @tc.number : Security_IAM_Coauth_Func_0109 * @tc.name : Get face availabe status * @tc.size : MediumTest * @tc.type : Function * @tc.level : Level 3 */ - it('Security_IAM_Coauth_Func_0108', 3, async function (done) { + it('Security_IAM_Coauth_Func_0109', 3, async function (done) { try { publicFC.publicRegisterInputer(PinAuth,AuthSubType.PIN_SIX,Inputerdata) publicFC.publicOpenSession(UserIDM,function(data){ let challenge = data publicFC.publicaddCredential(UserIDM,CredentialInfopinsix, function(onresult) { - console.info('testFace Coauth_Func_0108 addCredresult = ' + onresult.addCredresult); - console.log("testFace faceDemo Coauth_Func_0108 authUser = " + onresult.addCredresult); + console.info('testFace Coauth_Func_0109 addCredresult = ' + onresult.addCredresult); + console.log("testFace faceDemo Coauth_Func_0109 authUser = " + onresult.addCredresult); publicFC.publicauth(UserAuth,challenge,AuthType.PIN,AuthTurstLevel.ATL1, function(onresult) { - console.info('testFace Coauth_Func_0108 addCred = ' + JSON.stringify(onresult)); + console.info('testFace Coauth_Func_0109 addCred = ' + JSON.stringify(onresult)); let token = onresult.authextr.token CredentialInfoface2d.token = token publicFC.publicaddCredential(UserIDM,CredentialInfoface2d,function(onresult) { - console.info('testFace Coauth_Func_0108 ddCredentialface=' + onresult.authresult); - console.log("testFace Coauth_Func_0108 addface result =" + onresult.addCredresult) + console.info('testFace Coauth_Func_0109 ddCredentialface=' + onresult.authresult); + console.log("testFace Coauth_Func_0109 addface result =" + onresult.addCredresult) let AvailabeStatus = publicFC.publicgetAvailabeStatus( UserAuth,AuthType.FACE,AuthTurstLevel.ATL1) - expect(ResultCode.SUCCESS).assertEqual(AvailabeStatus); + expect(ResultCode.TRUST_LEVEL_NOT_SUPPORT).assertEqual(AvailabeStatus); AvailabeStatus = publicFC.publicgetAvailabeStatus( UserAuth,AuthType.FACE,AuthTurstLevel.ATL2) - expect(ResultCode.SUCCESS).assertEqual(AvailabeStatus); + expect(ResultCode.TRUST_LEVEL_NOT_SUPPORT).assertEqual(AvailabeStatus); AvailabeStatus = publicFC.publicgetAvailabeStatus( UserAuth,AuthType.FACE,AuthTurstLevel.ATL3) expect(ResultCode.TRUST_LEVEL_NOT_SUPPORT).assertEqual(AvailabeStatus); @@ -376,9 +264,9 @@ describe('userauthTest', function () { UserAuth,AuthType.FACE,AuthTurstLevel.ATL4) expect(ResultCode.TRUST_LEVEL_NOT_SUPPORT).assertEqual(AvailabeStatus); publicFC.publicdelUser(UserIDM,token,function(onresult){ - console.log("testFace Coauth_Func_0108 delUser = " + onresult.delUserresult) + console.log("testFace Coauth_Func_0109 delUser = " + onresult.delUserresult) publicFC.publicCloseSession(UserIDM,function(data){ - console.log("testFace Coauth_Func_0108 CloseSession callback = " + data) + console.log("testFace Coauth_Func_0109 CloseSession callback = " + data) publicFC.publicunRegisterInputer(PinAuth, function(data){ done(); }) @@ -400,13 +288,13 @@ describe('userauthTest', function () { }) /* - * @tc.number : Security_IAM_Coauth_Func_0109 + * @tc.number : Security_IAM_Coauth_Func_0108 * @tc.name : Get pin availabe status * @tc.size : MediumTest * @tc.type : Function * @tc.level : Level 3 */ - it('Security_IAM_Coauth_Func_0109', 2, async function (done) { + it('Security_IAM_Coauth_Func_0108', 2, async function (done) { try { publicFC.publicRegisterInputer(PinAuth,AuthSubType.PIN_SIX,Inputerdata) publicFC.publicOpenSession(UserIDM,function(data){ @@ -414,28 +302,28 @@ describe('userauthTest', function () { publicFC.publicaddCredential(UserIDM,CredentialInfopinsix, function(onresult) { console.info('testFace Coauth_Func_0108 addCredresult = ' + onresult.addCredresult); - console.log("testFace Coauth_Func_0109 authUser result = " + onresult.addCredresult); + console.log("testFace Coauth_Func_0108 authUser result = " + onresult.addCredresult); let AvailabeStatus AvailabeStatus = publicFC.publicgetAvailabeStatus(UserAuth,AuthType.PIN,AuthTurstLevel.ATL1) - console.info('testFace Security_IAM_Coauth_Func_0109 AvailabeStatus1 = ' + AvailabeStatus); + console.info('testFace Security_IAM_Coauth_Func_0108 AvailabeStatus1 = ' + AvailabeStatus); expect(ResultCode.SUCCESS).assertEqual(AvailabeStatus); AvailabeStatus = publicFC.publicgetAvailabeStatus(UserAuth,AuthType.PIN,AuthTurstLevel.ATL2) - console.info('testFace Security_IAM_Coauth_Func_0109 AvailabeStatus2 = ' + AvailabeStatus); + console.info('testFace Security_IAM_Coauth_Func_0108 AvailabeStatus2 = ' + AvailabeStatus); expect(ResultCode.SUCCESS).assertEqual(AvailabeStatus); AvailabeStatus = publicFC.publicgetAvailabeStatus(UserAuth,AuthType.PIN,AuthTurstLevel.ATL3) - console.info('testFace Security_IAM_Coauth_Func_0109 AvailabeStatus3 = ' + AvailabeStatus); + console.info('testFace Security_IAM_Coauth_Func_0108 AvailabeStatus3 = ' + AvailabeStatus); expect(ResultCode.SUCCESS).assertEqual(AvailabeStatus); AvailabeStatus = publicFC.publicgetAvailabeStatus(UserAuth,AuthType.PIN,AuthTurstLevel.ATL4) - console.info('testFace Security_IAM_Coauth_Func_0109 AvailabeStatus4 = ' + AvailabeStatus); + console.info('testFace Security_IAM_Coauth_Func_0108 AvailabeStatus4 = ' + AvailabeStatus); expect(ResultCode.SUCCESS).assertEqual(AvailabeStatus); publicFC.publicauth(UserAuth,challenge,AuthType.PIN,AuthTurstLevel.ATL1, function(onresult) { - console.info('testFace Coauth_Func_0109 addCred onResult = ' + onresult.authresult); + console.info('testFace Coauth_Func_0108 addCred onResult = ' + onresult.authresult); let token = onresult.authextr.token publicFC.publicdelUser(UserIDM,token,function(onresult){ - console.log("testFace Coauth_Func_0109 delUser result= " + onresult.delUserresult) + console.log("testFace Coauth_Func_0108 delUser result= " + onresult.delUserresult) publicFC.publicCloseSession(UserIDM,function(data){ - console.log("testFace Coauth_Func_0109 CloseSession callback = " + data) + console.log("testFace Coauth_Func_0108 CloseSession callback = " + data) publicFC.publicunRegisterInputer(PinAuth,function(data){ done(); }) @@ -453,58 +341,6 @@ describe('userauthTest', function () { expect(null).assertFail(); } }) - - /* - * @tc.number : Security_IAM_Coauth_Func_0110 - * @tc.name : Get pin and face property - * @tc.size : MediumTest - * @tc.type : Function - * @tc.level : Level 3 - */ - it('Security_IAM_Coauth_Func_0110', 3, async function (done) { - try { - publicFC.publicRegisterInputer(PinAuth,AuthSubType.PIN_SIX,Inputerdata) - publicFC.publicOpenSession(UserIDM,function(data){ - let challenge = data - publicFC.publicaddCredential(UserIDM,CredentialInfopinsix, function(onresult) { - console.info('testFace Coauth_Func_0110 addCredresult = ' + onresult.addCredresult); - publicFC.publicauth(UserAuth,challenge,AuthType.PIN,AuthTurstLevel.ATL1, function(onresult) { - console.info('testFace Coauth_Func_0110 addCred onResult = ' + JSON.stringify(onresult)); - let token = onresult.authextr.token - CredentialInfoface2d.token = token - publicFC.publicaddCredential(UserIDM,CredentialInfoface2d,function(onresult) { - console.log("testFace Coauth_Func_0110 ddCredentialface = " + onresult.addCredresult) - publicFC.publicgetProperty(UserAuth,GetPropertyRequestface,function(onresult) { - console.log("testFace Coauth_Func_0110 GetPropertyface = " + JSON.stringify(onresult)) - expect(ResultCode.SUCCESS).assertEqual(onresult.result); - expect(AuthSubType.FACE_2D).assertEqual(onresult.authSubType); - publicFC.publicgetProperty(UserAuth,GetPropertyRequestpin,function(onresult) { - expect(ResultCode.SUCCESS).assertEqual(onresult.result); - expect(AuthSubType.PIN_SIX).assertEqual(onresult.authSubType); - publicFC.publicdelUser(UserIDM,token,function(onresult){ - console.log("testFace Coauth_Func_0110 delUser= " + onresult.delUserresult) - publicFC.publicCloseSession(UserIDM,function(data){ - console.log("testFace Coauth_Func_0110 CloseSession callback = " + data) - publicFC.publicunRegisterInputer(PinAuth, function(data){ - done(); - }) - }) - },function(onacquireinfo){ - }) - }) - }) - }, function(onAcquireInfo) { - }) - }, function(onAcquireInfo) { - } - )}, function(onAcquireInfo) { - }) - }) - } catch (e) { - console.log("Security_IAM_Coauth_Func_0110 fail " + e); - expect(null).assertFail(); - } - }) /* * @tc.number : Security_IAM_Coauth_Func_0112 @@ -601,82 +437,6 @@ describe('userauthTest', function () { } }) - /* - * @tc.number : Security_IAM_Coauth_Func_0122 - * @tc.name : Cancel auth face. - * @tc.size : MediumTest - * @tc.type : Function - * @tc.level : Level 0 - */ - it('Security_IAM_Coauth_Func_0122', 0, async function (done) { - try { - publicFC.publicRegisterInputer(PinAuth,AuthSubType.PIN_SIX,Inputerdata) - let challenge ; - publicFC.publicOpenSession(UserIDM, function (data) { - console.info('Security_IAM_Coauth_Func_0122 openSession challenge = ' + data); - challenge = data; - publicFC.publicaddCredential(UserIDM,CredentialInfopinsix, function (onresult) { - console.info('Security_IAM_Coauth_Func_0122 addCredential Result1 = ' + JSON.stringify(onresult)); - let info101; - publicFC.publicauth(UserAuth,challenge,AuthType.PIN,AuthTurstLevel.ATL1, function (data) { - console.info('Coauth_Func_0122 auth onResult = ' + JSON.stringify(data)); - info101 = data; - let token = info101.authextr.token; - CredentialInfoface2d.token = token; - let addfaceresult; - publicFC.publicaddCredential(UserIDM,CredentialInfoface2d, function (onresult) { - console.info('Coauth_Func_0122 addCredential Result2=' + JSON.stringify(onresult)); - addfaceresult = onresult; - console.info('Coauth_Func_0122 publicaddCredential = ' + addfaceresult.addCredresult); - expect(ResultCode.SUCCESS).assertEqual(addfaceresult.addCredresult); - publicFC.publicauth(UserAuth,challenge,AuthType.FACE,10000, async function (data) { - let faceauth101 = data; - console.info('Coauth_Func_0122 publicauth = ' + faceauth101.authresult); - expect(ResultCode.SUCCESS).assertEqual(faceauth101.authresult); - let authresult; - let contextID = await publicFC.publicauth(UserAuth,challenge,AuthType.FACE,10000, - function (data) { - console.info('Coauth_Func_0122 addCred='+ JSON.stringify(data.authresult)); - authresult = data.authresult; - }, function (onacquireinfo) { - }) - let cancelresult = publicFC.publicgecancelAuth(UserAuth,contextID); - await sleep(2500); - if(cancelresult == 1){ - console.info('AuthTest_0101 cancel = 1 authresult = ' + authresult); - expect(ResultCode.SUCCESS).assertEqual(authresult); - }else if(cancelresult == 0){ - console.info('AuthTest_0101 cancel = 0 authresult = ' + authresult); - console.info('AuthTest_0101 cancel = 0 ResultCode.FAIL = ' + ResultCode.FAIL); - expect(ResultCode.CANCELED).assertEqual(authresult); - } - console.info('testFace AuthTest_0101 onResult = ' + JSON.stringify(data)); - await publicFC.publicdelUser(UserIDM,token, function (data) { - console.info('AuthTest_0101 delUser = ' + JSON.stringify(data)); - publicFC.publicCloseSession(UserIDM, function (data) { - console.info('AuthTest_0101 closeSession'); - publicFC.publicunRegisterInputer(PinAuth, function (data) { - console.info('AuthTest_0101 unRegister'); - done(); - }) - }) - }, function (onacquireinfo) { - }) - }, function (onacquireinfo) { - }) - }, function (onacquireinfo) { - }) - }, function (data) { - }) - }, function (onacquireinfo) { - }) - }) - } catch (e) { - console.log("AuthTest_0101 fail " + e); - expect(null).assertFail(); - } - }) - /* * @tc.number : Security_IAM_Coauth_Func_0113 * @tc.name : Anti violence cracking with five times diff --git a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_DFX_CallbackJsunit.test.js b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_DFX_CallbackJsunit.test.js index 24b336ba8f4d681734bb1f4e0513a000172ddb9f..4553842ef3ff4adc7027582e2d34e2a9412e9424 100644 --- a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_DFX_CallbackJsunit.test.js +++ b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_DFX_CallbackJsunit.test.js @@ -175,59 +175,6 @@ describe('userauthTest', function () { } }) - /* - * @tc.number : Security_IAM_Face_AddCred_DFX_0104 - * @tc.name : Can't add face with no pin - * @tc.size : MediumTest - * @tc.type : Function - * @tc.level : Level 2 - */ - it('Security_IAM_Face_AddCred_DFX_0104', 2, async function (done) { - try { - publicFC.publicRegisterInputer(PinAuth, AuthSubType.PIN_SIX, Inputerdata) - publicFC.publicOpenSession(UserIDM, function (data) { - let challenge = data; - console.info("Security_IAM_Face_AddCred_DFX_0104 challenge = " + challenge) - publicFC.publicaddCredential(UserIDM, CredentialInfopinsix, function (data) { - publicFC.publicauth(UserAuth, challenge, AuthType.PIN, AuthTurstLevel.ATL1, function (data) { - console.info("Security_IAM_Face_AddCred_DFX_0104 info101 = " + JSON.stringify(data)) - let token = data.authextr.token - CredentialInfoface2d.token = token - console.info("Security_IAM_Face_AddCred_DFX_0104 token = " + token) - publicFC.publicaddCredential(UserIDM, CredentialInfoface2d, function (data) { - console.info("Face_AddCred_DFX_0104 addfaceresult1 = " + JSON.stringify(data)) - expect(ResultCode.SUCCESS).assertEqual(data.addCredresult); - publicFC.publicaddCredential(UserIDM, CredentialInfoface2d, function (data) { - console.info("Face_AddCred_DFX_0104 addfaceresult2 = " + JSON.stringify(data)) - expect(ResultCode.FAIL).assertEqual(data.addCredresult); - publicFC.publicdelUser(UserIDM, token, function (data) { - let deluserresult = data.delUserresult - console.info("Security_IAM_Face_AddCred_DFX_0104 deluserresult =" + deluserresult) - publicFC.publicCloseSession(UserIDM, function (data) { - console.info("Security_IAM_Face_AddCred_DFX_0104 closesession = " + data) - publicFC.publicunRegisterInputer(PinAuth, function (data) { - console.info("Security_IAM_Face_AddCred_DFX_0104 unRegist = " + data) - done(); - }) - }) - }, function (data) { - }) - }, function (data) { - }) - }, function (data) { - }) - }, function (data) { - }) - }, function (data) { - }) - }) - - } catch (e) { - console.log("Security_IAM_Face_AddCred_DFX_0104 fail " + e); - expect(null).assertFail(); - } - }) - /* * @tc.number : Security_IAM_Face_Delet_DFX_0104 * @tc.name : Delete face with no pin @@ -245,8 +192,8 @@ describe('userauthTest', function () { publicFC.publicdelCred(UserIDM, "credentialId", "token", function (data) { console.info("Security_IAM_Face_Delet_DFX_0104 info101 = " + JSON.stringify(data)) console.info("Security_IAM_Face_Delet_DFX_0104 delCredresult = " + data.delCredresult) - console.info("Security_IAM_Face_Delet_DFX_0104 ResultCode.FAIL = " + ResultCode.FAIL) - expect(ResultCode.Authfail).assertEqual(data.delCredresult); + console.info("Security_IAM_Face_Delet_DFX_0104 ResultCode.FAIL = " + ResultCode.GENERAL_ERROR) + expect(ResultCode.GENERAL_ERROR).assertEqual(data.delCredresult); publicFC.publicCloseSession(UserIDM, function (data) { console.info("Security_IAM_Face_Delet_DFX_0104 closesession = " + data) publicFC.publicunRegisterInputer(PinAuth, function (data) { @@ -283,8 +230,8 @@ describe('userauthTest', function () { let info102 = data console.info("testFace Security_IAM_Face_Delet_DFX_0105 info102 = " + JSON.stringify(data)) console.info("testFace Security_IAM_Face_Delet_DFX_0105 delCredresult ="+ data.delCredresult); - console.info("testFace Face_Delet_DFX_0105 ResultCode.FAIL = " + ResultCode.Authfail); - expect(ResultCode.Authfail).assertEqual(info102.delCredresult); + console.info("testFace Face_Delet_DFX_0105 ResultCode.FAIL = " + ResultCode.GENERAL_ERROR); + expect(ResultCode.GENERAL_ERROR).assertEqual(info102.delCredresult); publicFC.publicauth(UserAuth, challenge, AuthType.FACE, AuthTurstLevel.ATL1, function (data){ let info101 = data console.info("testFace Security_IAM_Face_Delet_DFX_0105 info101 = " + JSON.stringify(data)) @@ -406,62 +353,6 @@ describe('userauthTest', function () { } }) - /* - * @tc.number : Security_IAM_Face_Auth_DFX_0104 - * @tc.name : Auth face after delete pin - * @tc.size : MediumTest - * @tc.type : Function - * @tc.level : Level 4 - */ - it('Security_IAM_Face_Auth_DFX_0104', 4, async function (done) { - try { - publicFC.publicRegisterInputer(PinAuth, AuthSubType.PIN_SIX, Inputerdata) - publicFC.publicOpenSession(UserIDM, function (data) { - let challenge = data - console.info("Security_IAM_Face_Auth_DFX_0104 challenge = " + challenge) - publicFC.publicaddCredential(UserIDM, CredentialInfopinsix, function (data) { - publicFC.publicauth(UserAuth, challenge, AuthType.PIN, AuthTurstLevel.ATL1, function (data) { - let info101 = data - console.info("Security_IAM_Face_Auth_DFX_0104 info101 = " + JSON.stringify(data)) - let token = info101.authextr.token - CredentialInfoface2d.token = token - console.info("Security_IAM_Face_Auth_DFX_0104 token = " + token) - publicFC.publicaddCredential(UserIDM, CredentialInfoface2d, function (data) { - let addfaceresult = data - console.info("Security_IAM_Face_Auth_DFX_0104 addfaceresult = " + JSON.stringify(data)) - expect(ResultCode.SUCCESS).assertEqual(addfaceresult.addCredresult); - publicFC.publicdelUser(UserIDM, token, function (data) { - let deluserresult = data.delUserresult - console.info("Security_IAM_Face_Auth_DFX_0104 deluserresult = " + deluserresult) - publicFC.publicauth(UserAuth, challenge, AuthType.FACE, AuthTurstLevel.ATL1, - function (data) { - let info102 = data; - console.info("Security_IAM_Face_Auth_DFX_0104 info102 = " + JSON.stringify(data)) - expect(ResultCode.FAIL).assertEqual(info102.authresult); - publicFC.publicCloseSession(UserIDM, function (data) { - console.info("Security_IAM_Face_Auth_DFX_0104 closesession = " + data) - publicFC.publicunRegisterInputer(PinAuth, function (data) { - console.info("Security_IAM_Face_Auth_DFX_0104 unRegist = " + data) - done(); - }) - }) - }, function (data) { - }) - }, function (data) { - }) - }, function (data) { - }) - }, function (data) { - }) - }, function (data) { - }) - }) - } catch (e) { - console.log("Security_IAM_Face_Auth_DFX_0104 fail " + e); - expect(null).assertFail(); - } - }) - /* * @tc.number : Security_IAM_Face_AddCred_DFX_0101 * @tc.name : Can't add face by old token @@ -558,9 +449,9 @@ describe('userauthTest', function () { let wrongtoken = token + 'wrong'; publicFC.publicdelCred(UserIDM,credentialId,wrongtoken, function (data) { console.info('testFace Face_Delet_DFX_0101 del=' + JSON.stringify(data)); - console.info('testFace Face_Delet_DFX_0101 ResultCode.FAIL=' + ResultCode.FAIL); + console.info('testFace Face_Delet_DFX_0101 ResultCode.FAIL=' + ResultCode.GENERAL_ERROR); delcredresult = data; - expect(ResultCode.Authfail).assertEqual(delcredresult.delCredresult); + expect(ResultCode.GENERAL_ERROR).assertEqual(delcredresult.delCredresult); publicFC.publicdelUser(UserIDM,token, function (data) { console.info('Face_Delet_DFX_0101 delUser= ' + JSON.stringify(data)); publicFC.publicCloseSession(UserIDM, function (data) { diff --git a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_Func_CallbackJsunit.test.js b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_Func_CallbackJsunit.test.js index bdb5f4d3330957066dc4f4e1493eb113ae70cbb5..85045569195db0d5980b3f27a7beed5202613ce3 100644 --- a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_Func_CallbackJsunit.test.js +++ b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Face_Func_CallbackJsunit.test.js @@ -147,22 +147,16 @@ describe('userauthTest', function () { publicFC.publicaddCredential(UserIDM,CredentialInfoface2d, function (onresult) { console.info('Face_AddCred_Func_0101 addCredential Result2=' + JSON.stringify(onresult)); addfaceresult = onresult; - expect(ResultCode.SUCCESS).assertEqual(addfaceresult.addCredresult); + expect(ResultCode.FAIL).assertEqual(addfaceresult.addCredresult); publicFC.publicauth(UserAuth,challenge,AuthType.FACE,AuthTurstLevel.ATL1, function (data) { console.info('testFace Face_AddCred_Func_0101 onResult = ' + JSON.stringify(data)); let faceauth101 = data; - expect(ResultCode.SUCCESS).assertEqual(faceauth101.authresult); + expect(ResultCode.FAIL).assertEqual(faceauth101.authresult); publicFC.publicauthUser( UserAuth,userID.User1,challenge,AuthType.FACE,AuthTurstLevel.ATL1,function (data) { console.info('testFace Face_AddCred_Func_0101 onResult= ' + JSON.stringify(data)); faceauth101 = data; - expect(ResultCode.SUCCESS).assertEqual(faceauth101.authresult); - let credentialId = addfaceresult.credentialId; - let delcredresult ; - publicFC.publicdelCred(UserIDM,credentialId,token, function (data) { - console.info('testFace Face_AddCred_Func_0101 del=' + JSON.stringify(data)); - delcredresult = data; - expect(ResultCode.SUCCESS).assertEqual(delcredresult.delCredresult); + expect(ResultCode.FAIL).assertEqual(faceauth101.authresult); publicFC.publicdelUser(UserIDM,token, function (data) { console.info('Face_AddCred_Func_0101 delUser= ' + JSON.stringify(data)); publicFC.publicCloseSession(UserIDM, function (data) { @@ -174,8 +168,6 @@ describe('userauthTest', function () { }) }, function (data) { }) - }, function (onacquireinfo) { - }) }, function (onacquireinfo) { }) }, function (onacquireinfo) { @@ -225,7 +217,7 @@ describe('userauthTest', function () { await sleep(2500); if(cancelresult == 1){ console.info('Face_AddCred_Func_0103 cancel1 authresult = ' + addfaceresult.addCredresult); - expect(ResultCode.SUCCESS).assertEqual(addfaceresult.addCredresult); + expect(ResultCode.FAIL).assertEqual(addfaceresult.addCredresult); }else if(cancelresult == 0){ console.info('Face_AddCred_Func_0103 cancel0 authresult = ' + addfaceresult.addCredresult); expect(ResultCode.CANCELED).assertEqual(addfaceresult.addCredresult); @@ -284,7 +276,7 @@ describe('userauthTest', function () { publicFC.publicdelCred(UserIDM,credentialId,token1, function (data) { console.info('testFace Face_AddCred_Func_0102 publicdelCred=' + JSON.stringify(data)); delcredresult = data; - expect(ResultCode.Authfail).assertEqual(delcredresult.delCredresult); + expect(ResultCode.GENERAL_ERROR).assertEqual(delcredresult.delCredresult); publicFC.publicdelUser(UserIDM,token, function (data) { console.info('testFace Face_AddCred_Func_0102 delUser= ' + JSON.stringify(data)); publicFC.publicCloseSession(UserIDM, function (data) { diff --git a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Interface_DFX_CallbackJsunit.test.js b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Interface_DFX_CallbackJsunit.test.js index 8b4c141da9212e3370582c95b6a86ad75d993731..fc6c5fc895dccef305f66143792ca113f1ae8f53 100644 --- a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Interface_DFX_CallbackJsunit.test.js +++ b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_Interface_DFX_CallbackJsunit.test.js @@ -390,7 +390,7 @@ function delcrederror(inputer,done){ publicFC.publicdelCred(UserIDM, inputer, inputer, function (data) { console.info('testFace delcrederror del=' + JSON.stringify(data)); delcredresult = data; - expect(ResultCode.Authfail).assertEqual(delcredresult.delCredresult); + expect(ResultCode.GENERAL_ERROR).assertEqual(delcredresult.delCredresult); publicFC.publicdelUser(UserIDM,token, function (data) { console.info('delcrederror delUser= ' + JSON.stringify(data)); publicFC.publicCloseSession(UserIDM, function (data) { diff --git a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_PIN_Kit_CallbackJsunit.test.js b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_PIN_Kit_CallbackJsunit.test.js index 18dc90f2c837b6d65aae0c0d9f9fbab576bcd3d6..f9d3cfa782a6cef62f9f5c3c054f601ae9e51487 100644 --- a/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_PIN_Kit_CallbackJsunit.test.js +++ b/useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_PIN_Kit_CallbackJsunit.test.js @@ -210,82 +210,6 @@ describe('userauthTest', function () { } }) - /* - * @tc.number : Security_IAM_PIN_Kit_Func_0103 - * @tc.name : Kit interface auth and cancel auth - * @tc.size : MediumTest - * @tc.type : Function - * @tc.level : Level 0 - */ -it('Security_IAM_PIN_Kit_Func_0103', 0, async function (done) { - try { - publicFC.publicRegisterInputer(PinAuth,AuthSubType.PIN_SIX,Inputerdata) - let challenge ; - publicFC.publicOpenSession(UserIDM, function (data) { - console.info('AuthTest_0101 openSession challenge = ' + data); - challenge = data; - publicFC.publicaddCredential(UserIDM,CredentialInfopinsix, function (onresult) { - console.info('AuthTest_0101 addCredential Result1 = ' + JSON.stringify(onresult)); - let info101; - publicFC.publicauth(UserAuth,challenge,AuthType.PIN,AuthTurstLevel.ATL1, function (data) { - console.info('AuthTest_0101 auth onResult = ' + JSON.stringify(data)); - info101 = data; - let token = info101.authextr.token; - CredentialInfoface2d.token = token; - let addfaceresult; - publicFC.publicaddCredential(UserIDM,CredentialInfoface2d, function (onresult) { - console.info('AuthTest_0101 addCredential Result2=' + JSON.stringify(onresult)); - addfaceresult = onresult; - console.info('AuthTest_0101 publicaddCredential = ' + addfaceresult.addCredresult); - expect(ResultCode.SUCCESS).assertEqual(addfaceresult.addCredresult); - publicFC.publicauth(UserAuthKit,challenge,AuthType.FACE,10000, async function (data) { - let faceauth101 = data; - console.info('AuthTest_0101 publicauth = ' + faceauth101.authresult); - expect(ResultCode.SUCCESS).assertEqual(faceauth101.authresult); - let authresult; - let contextID = await publicFC.publicauth(UserAuthKit,challenge,AuthType.FACE,10000, - function (data) { - console.info('AuthTest_0101 addCredential Result2=' + JSON.stringify(data.authresult)); - authresult = data.authresult; - }, function (onacquireinfo) { - }) - let cancelresult = publicFC.publicgecancelAuth(UserAuthKit,contextID); - await sleep(2000); - if(cancelresult == 1){ - console.info('AuthTest_0101 cancel = 1 authresult = ' + authresult); - expect(ResultCode.SUCCESS).assertEqual(authresult); - }else if(cancelresult == 0){ - console.info('AuthTest_0101 cancel = 0 authresult = ' + authresult); - console.info('AuthTest_0101 cancel = 0 ResultCode.FAIL = ' + ResultCode.FAIL); - expect(ResultCode.CANCELED).assertEqual(authresult); - } - console.info('testFace AuthTest_0101 onResult = ' + JSON.stringify(data)); - await publicFC.publicdelUser(UserIDM,token, function (data) { - console.info('AuthTest_0101 delUser = ' + JSON.stringify(data)); - publicFC.publicCloseSession(UserIDM, function (data) { - console.info('AuthTest_0101 closeSession'); - publicFC.publicunRegisterInputer(PinAuth, function (data) { - console.info('AuthTest_0101 unRegister'); - done(); - }) - }) - }, function (onacquireinfo) { - }) - }, function (onacquireinfo) { - }) - }, function (onacquireinfo) { - }) - }, function (data) { - }) - }, function (onacquireinfo) { - }) - }) - } catch (e) { - console.log("AuthTest_0101 fail " + e); - expect(null).assertFail(); - } - }) - /* * @tc.number : Security_IAM_PIN_Kit_Func_0104 * @tc.name : Kit interface enum AuthTrustLevel