From 263e3bf21e2f39baa1675e5d1f110de3384db197 Mon Sep 17 00:00:00 2001 From: javierbb31 Date: Fri, 20 Jun 2014 16:59:32 -0500 Subject: [PATCH 1/3] Port network tests to plugin-test-framework Ported test from mobile-spec (which are written in jasmine 1.3) in jasmine 2.0. Added: New js-module named tests to plugin.xml Folder with tests working on jasmine 2.0 --- plugin.xml | 3 +++ test/tests.js | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 test/tests.js diff --git a/plugin.xml b/plugin.xml index c6ae743..3343ad3 100644 --- a/plugin.xml +++ b/plugin.xml @@ -38,6 +38,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" + + + diff --git a/test/tests.js b/test/tests.js new file mode 100644 index 0000000..83f28d3 --- /dev/null +++ b/test/tests.js @@ -0,0 +1,58 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +exports.defineAutoTests = function() { + describe('Network (navigator.connection)', function () { + it("network.spec.1 should exist", function() { + expect(navigator.network && navigator.network.connection).toBeDefined(); + expect(navigator.connection).toBeDefined(); + }); + + it("network.spec.2 should be set to a valid value", function() { + var validValues = { + 'unknown': 1, + 'ethernet': 1, + 'wifi': 1, + '2g': 1, + 'cellular': 1, + '3g': 1, + '4g': 1, + 'none': 1 + }; + expect(validValues[navigator.connection.type]).toBe(1); + }); + + it("network.spec.3 should have the same value in deprecated and non-deprecated apis", function() { + expect(navigator.network.connection.type).toBe(navigator.connection.type); + }); + + it("network.spec.4 should define constants for connection status", function() { + expect(Connection.UNKNOWN).toBe("unknown"); + expect(Connection.ETHERNET).toBe("ethernet"); + expect(Connection.WIFI).toBe("wifi"); + expect(Connection.CELL_2G).toBe("2g"); + expect(Connection.CELL_3G).toBe("3g"); + expect(Connection.CELL_4G).toBe("4g"); + expect(Connection.NONE).toBe("none"); + expect(Connection.CELL).toBe("cellular"); + }); + }); +}; From fa1bcac78a4e22f0c01b78dcf87a5b64c2959938 Mon Sep 17 00:00:00 2001 From: Staci Cooper Date: Wed, 16 Jul 2014 13:51:46 -0400 Subject: [PATCH 2/3] CB-6964 ported manual tests Fixed up style Fixed typo in addEventListener --- test/tests.js | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/test/tests.js b/test/tests.js index 83f28d3..26163b6 100644 --- a/test/tests.js +++ b/test/tests.js @@ -19,14 +19,14 @@ * */ -exports.defineAutoTests = function() { +exports.defineAutoTests = function () { describe('Network (navigator.connection)', function () { - it("network.spec.1 should exist", function() { + it("network.spec.1 should exist", function () { expect(navigator.network && navigator.network.connection).toBeDefined(); expect(navigator.connection).toBeDefined(); }); - it("network.spec.2 should be set to a valid value", function() { + it("network.spec.2 should be set to a valid value", function () { var validValues = { 'unknown': 1, 'ethernet': 1, @@ -40,11 +40,11 @@ exports.defineAutoTests = function() { expect(validValues[navigator.connection.type]).toBe(1); }); - it("network.spec.3 should have the same value in deprecated and non-deprecated apis", function() { + it("network.spec.3 should have the same value in deprecated and non-deprecated apis", function () { expect(navigator.network.connection.type).toBe(navigator.connection.type); }); - it("network.spec.4 should define constants for connection status", function() { + it("network.spec.4 should define constants for connection status", function () { expect(Connection.UNKNOWN).toBe("unknown"); expect(Connection.ETHERNET).toBe("ethernet"); expect(Connection.WIFI).toBe("wifi"); @@ -56,3 +56,43 @@ exports.defineAutoTests = function() { }); }); }; + +/******************************************************************************/ +/******************************************************************************/ +/******************************************************************************/ + +exports.defineManualTests = function (contentEl, createActionButton) { + function eventOutput(s) { + var el = document.getElementById("results"); + el.innerHTML = el.innerHTML + s + "
"; + } + + function printNetwork() { + eventOutput("navigator.connection.type=" + navigator.connection.type); + eventOutput("navigator.network.connection.type=" + navigator.network.connection.type); + } + + function onEvent(e) { + eventOutput('Event of type: ' + e.type); + printNetwork(); + } + + /******************************************************************************/ + + var html = '
' + + 'Results:
' + + '' + + '
'; + + document.addEventListener("online", onEvent, false); + document.addEventListener("offline", onEvent, false); + contentEl.innerHTML = html; + + createActionButton('Show Network Connection', function () { + printNetwork(); + }, 'actions'); + + createActionButton('Clear Log', function () { + document.getElementById('results').innerHTML = ''; + }, 'actions'); +}; From aaa86d1555d0593659e25118888a2db1f88594c7 Mon Sep 17 00:00:00 2001 From: Staci Cooper Date: Fri, 1 Aug 2014 13:42:27 -0400 Subject: [PATCH 3/3] Renamed test dir and added nested plugin.xml --- tests/plugin.xml | 30 ++++++++++++++++++++++++++++++ {test => tests}/tests.js | 0 2 files changed, 30 insertions(+) create mode 100644 tests/plugin.xml rename {test => tests}/tests.js (100%) diff --git a/tests/plugin.xml b/tests/plugin.xml new file mode 100644 index 0000000..8e162e1 --- /dev/null +++ b/tests/plugin.xml @@ -0,0 +1,30 @@ + + + + + Cordova Network Information Plugin Tests + Apache 2.0 + + + + diff --git a/test/tests.js b/tests/tests.js similarity index 100% rename from test/tests.js rename to tests/tests.js