diff --git a/telephony/telephonyjstest/netmanager_base/network_nowifi/src/main/js/test/Http.nowifi.test.js b/telephony/telephonyjstest/netmanager_base/network_nowifi/src/main/js/test/Http.nowifi.test.js index eae6428fa5ba1169e89043b38fb4b07ce4693680..1ccf814f4663b7891a0d8d8a21af5aaa6276429f 100644 --- a/telephony/telephonyjstest/netmanager_base/network_nowifi/src/main/js/test/Http.nowifi.test.js +++ b/telephony/telephonyjstest/netmanager_base/network_nowifi/src/main/js/test/Http.nowifi.test.js @@ -14,7 +14,7 @@ */ import network from '@system.network'; -import { describe, it, expect } from '@ohos/hypium' +import { describe, it, expect } from '@ohos/hypium'; import connection from '@ohos.net.connection'; export default function Telephony_NetManager_NetWorkTest() { @@ -24,10 +24,10 @@ export default function Telephony_NetManager_NetWorkTest() { let networkAvailable = () => { connection.getDefaultNet(function (error, netHandle) { if (error || netHandle.netId >= 100) { - console.info("Network available or Network error:" + error) - return true + console.info("Network available or Network error:" + error); + return true; } - return false + return false; }) } @@ -38,25 +38,25 @@ export default function Telephony_NetManager_NetWorkTest() { */ it("Telephony_NetManager_NetWorkTest_GetType_None_0100", 0, function (done) { if (networkAvailable) { - console.warn("No network environment required") - done() - return + console.warn("No network environment required"); + done(); + return; } network.getType({ success: function (data) { - console.info("NetManager getType " + JSON.stringify(data)) - expect(data.type === "none").assertTrue() - expect(data.metered === false).assertTrue() - network.unsubscribe() + console.info("NetManager getType " + JSON.stringify(data)); + expect(data.type === "none").assertTrue(); + expect(data.metered === false).assertTrue(); + network.unsubscribe(); done(); }, fail: function (data, code) { - console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)) + console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)); expect().assertFail(); done(); }, complete: function () { - expect().assertTrue() + expect().assertTrue(); done(); } }) @@ -70,26 +70,26 @@ export default function Telephony_NetManager_NetWorkTest() { */ it("Telephony_NetManager_NetWorkTest_GetType_None_0200", 0, function (done) { if (networkAvailable) { - console.warn("No network environment required") - done() - return + console.warn("No network environment required"); + done(); + return; } network.getType({ success: function (data) { - console.info("NetManager getType 1 " + JSON.stringify(data)) - expect(data.type === "none").assertTrue() - expect(data.metered === false).assertTrue() - network.unsubscribe() + console.info("NetManager getType 1 " + JSON.stringify(data)); + expect(data.type === "none").assertTrue(); + expect(data.metered === false).assertTrue(); + network.unsubscribe(); done(); - console.info("NetManager Telephony_NetManager_NetWorkTest_GetType_none_1 end") + console.info("NetManager Telephony_NetManager_NetWorkTest_GetType_none_1 end"); }, fail: function (data, code) { - console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)) + console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)); expect().assertFail(); done(); }, complete: function () { - expect().assertTrue() + expect().assertTrue(); done(); } }) @@ -103,21 +103,21 @@ export default function Telephony_NetManager_NetWorkTest() { */ it("Telephony_NetManager_NetWorkTest_Subscribe_None_0100", 0, function (done) { if (networkAvailable) { - console.warn("No network environment required") - done() - return + console.warn("No network environment required"); + done(); + return; } network.subscribe({ success: function (data) { - console.info("NetManager subscribe " + JSON.stringify(data)) - expect(data.type === "none").assertTrue() - expect(data.metered === false).assertTrue() - network.unsubscribe() + console.info("NetManager subscribe " + JSON.stringify(data)); + expect(data.type === "none").assertTrue(); + expect(data.metered === false).assertTrue(); + network.unsubscribe(); done(); }, fail: function (data, code) { - console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)) - expect().assertFail() + console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)); + expect().assertFail(); done(); } }) @@ -131,21 +131,21 @@ export default function Telephony_NetManager_NetWorkTest() { */ it("Telephony_NetManager_NetWorkTest_Subscribe_None_0200", 0, function (done) { if (networkAvailable) { - console.warn("No network environment required") - done() - return + console.warn("No network environment required"); + done(); + return; } network.subscribe({ success: function (data) { - console.info("NetManager subscribe " + JSON.stringify(data)) - expect(data.type === "none").assertTrue() - expect(data.metered === false).assertTrue() - network.unsubscribe() + console.info("NetManager subscribe " + JSON.stringify(data)); + expect(data.type === "none").assertTrue(); + expect(data.metered === false).assertTrue(); + network.unsubscribe(); done(); }, fail: function (data, code) { - console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)) - expect().assertFail() + console.log("data:" + JSON.stringify(data) + " code:" + JSON.stringify(code)); + expect().assertFail(); done(); } }) diff --git a/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js b/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js index 7e056b53ac9834dc274e7578aa57572d0bf57387..163d503a8dcb58d82b6679bcf758036f0b067ccf 100644 --- a/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js +++ b/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js @@ -15,7 +15,7 @@ import radio from '@ohos.telephony.radio'; import observer from '@ohos.telephony.observer'; -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; export default function ActsNetworkSearchTest() { describe('ActsNetworkSearchTest', function () { @@ -456,12 +456,12 @@ describe('ActsNetworkSearchTest', function () { slotId: 0 }, NetworkState => { console.log("on networkStateChange, NetworkState:" + JSON.stringify(NetworkState)); - expect(typeof NetworkState === undefined).assertFalse() + expect(typeof NetworkState === undefined).assertFalse(); }); - done() + done(); } catch (error) { - expect(false).assertTrue() - done() + expect(false).assertTrue(); + done(); } }); @@ -474,16 +474,16 @@ describe('ActsNetworkSearchTest', function () { try { let callback = NetworkState => { console.log("on networkStateChange, NetworkState:" + JSON.stringify(NetworkState)); - expect(typeof NetworkState === undefined).assertFalse() + expect(typeof NetworkState === undefined).assertFalse(); } observer.on('networkStateChange', callback); // 可以指定传入on中的callback取消一个订阅,也可以不指定callback清空所有订阅。 observer.off('networkStateChange', callback); observer.off('networkStateChange'); - done() + done(); } catch (error) { - expect(false).assertTrue() - done() + expect(false).assertTrue(); + done(); } }); @@ -498,12 +498,12 @@ describe('ActsNetworkSearchTest', function () { slotId: 0 }, SignalInformation => { console.log("on signalInfoChange, SignalInformation:" + JSON.stringify(SignalInformation)); - expect(typeof SignalInformation === undefined).assertFalse() + expect(typeof SignalInformation === undefined).assertFalse(); }); - done() + done(); } catch (error) { - expect(false).assertTrue() - done() + expect(false).assertTrue(); + done(); } }); @@ -516,16 +516,16 @@ describe('ActsNetworkSearchTest', function () { try { let callback = SignalInformation => { console.log("on signalInfoChange, SignalInformation:" + JSON.stringify(SignalInformation)); - expect(typeof SignalInformation === undefined).assertFalse() + expect(typeof SignalInformation === undefined).assertFalse(); } observer.on('signalInfoChange', callback); // 可以指定传入on中的callback取消一个订阅,也可以不指定callback清空所有订阅。 observer.off('signalInfoChange', callback); observer.off('signalInfoChange'); - done() + done(); } catch (error) { - expect(false).assertTrue() - done() + expect(false).assertTrue(); + done(); } });