Repository: olingo-odata4-js Updated Branches: refs/heads/master f758de22f -> 5bff25daf
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/test/test-utils.js ---------------------------------------------------------------------- diff --git a/test/test-utils.js b/test/test-utils.js index de48b41..f377029 100644 --- a/test/test-utils.js +++ b/test/test-utils.js @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ +'use strict'; var odatajs = require('./../src/index-node.js'); var chai = require('chai'); var assert = chai.assert; -describe('TEST utils.js', function() { +describe('TEST utils.js', function () { it('utils.isArray', function () { assert.isTrue(odatajs.utils.isArray([])); assert.isTrue(odatajs.utils.isArray([1, 2])); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/test/test.js ---------------------------------------------------------------------- diff --git a/test/test.js b/test/test.js deleted file mode 100644 index a0b24b4..0000000 --- a/test/test.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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. - */ -var odatajs = require('./../src/index-node.js'); -//use node-jscs - -//var should = require('should'); -var user = { - name: 'tj', - pets: ['tobi', 'loki', 'jane', 'bandit'] -}; - - -describe('contact page1', function() { - it('Should be pass', function (done) { - //(4).should.equal(4); - done(); - }); -}); - - http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/cache-tests.js ---------------------------------------------------------------------- diff --git a/tests/cache-tests.js b/tests/cache-tests.js index 3ace53f..bc0b485 100644 --- a/tests/cache-tests.js +++ b/tests/cache-tests.js @@ -618,11 +618,12 @@ doneAfterAllTests(); }; + /** Removes Safari-specific properties from an exception object + * @param {Exception} err -The exception object to operate on + * @returns {Exception} The original exception object with the Safari-specific properties removed + */ var removeSafariExceptionProperties = function (err) { - /** Removes Safari-specific properties from an exception object - * @param {Exception} err -The exception object to operate on - * @returns {Exception} The original exception object with the Safari-specific properties removed - */ + var safariProperties = ["line", "expressionBeginOffset", "expressionEndOffset", "sourceId", "sourceURL"]; var result = {}; http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/CacheVerifier.js ---------------------------------------------------------------------- diff --git a/tests/common/CacheVerifier.js b/tests/common/CacheVerifier.js index 1e9f0d4..9d9309e 100644 --- a/tests/common/CacheVerifier.js +++ b/tests/common/CacheVerifier.js @@ -26,9 +26,9 @@ var CacheVerifier = function (baseUri, pageSize, total, cacheSize) { /** Creates a new CacheVerifier * @param {String} baseUri - The base URI of the collection - * @param {Integer} pageSize - The page size used in the cache - * @param {Integer} total - The total number of items in the collection - * @param {Integer} cacheSize - Cache size in bytes + * @param {Number} pageSize - The page size used in the cache + * @param {Number} total - The total number of items in the collection + * @param {Number} cacheSize - Cache size in bytes */ this.baseUri = baseUri; this.pageSize = pageSize; @@ -78,7 +78,7 @@ default: return false; } - } + }; CacheVerifier.prototype.clear = function () { /** Clears the cache in the verifier @@ -87,14 +87,14 @@ this.actualSize = 0; this.actualCount = 0; this.overflowed = this.cacheSize === 0; - } + }; CacheVerifier.prototype.verifyRequests = function (requests, responses, index, count, description, backwards, isPrefetch) { /** Verifies the HTTP requests for a single data request, and updates the verifier with cached pages * @param {Array} requests - The sequence of request objects (from OData.defaultHttpClient) * @param {Array} responses - The sequence of response objects (from OData.defaultHttpClient) - * @param {Integer} index - The starting index of the read - * @param {Integer} count - The count of items in the read + * @param {Number} index - The starting index of the read + * @param {Number} count - The count of items in the read * @param {String} description - The description of the requests being verified * @param {Boolean} backwards - Whether or not filterBack is being verified * @param {Boolean} isPrefetch - Whether the requests being verified come from the prefetcher @@ -102,11 +102,11 @@ var that = this; index = (index < 0 ? 0 : index); + /** Returns the page index that the given item index belongs to + * @param {Number} index - The item index + * @returns The page index + */ var pageIndex = function (index) { - /** Returns the page index that the given item index belongs to - * @param {Integer} index - The item index - * @returns The page index - */ return Math.floor(index / that.pageSize); }; http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/Instrument.js ---------------------------------------------------------------------- diff --git a/tests/common/Instrument.js b/tests/common/Instrument.js index fab583a..33c0f9c 100644 --- a/tests/common/Instrument.js +++ b/tests/common/Instrument.js @@ -46,7 +46,7 @@ } else { makeRequest(success); } - } + }; window.Instrument = { getBrowserMemorySize: getBrowserMemorySize http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/ObservableHttpClient.js ---------------------------------------------------------------------- diff --git a/tests/common/ObservableHttpClient.js b/tests/common/ObservableHttpClient.js index 9be75f8..ae00803 100644 --- a/tests/common/ObservableHttpClient.js +++ b/tests/common/ObservableHttpClient.js @@ -71,7 +71,7 @@ Session.prototype.clear = function () { this.requests = []; this.responses = []; - } + }; Session.prototype.end = function () { $(this.client).unbind("request", this.requestHandler); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/TestSynchronizerClient.js ---------------------------------------------------------------------- diff --git a/tests/common/TestSynchronizerClient.js b/tests/common/TestSynchronizerClient.js index 157654e..fc8383a 100644 --- a/tests/common/TestSynchronizerClient.js +++ b/tests/common/TestSynchronizerClient.js @@ -93,7 +93,7 @@ } return result; - } + }; var date = new Date(); var day = padToLength(date.getDate(), 2); @@ -132,7 +132,7 @@ } return xhr.responseText; - } + }; function LogAssert(result, message, name, expected, actual) { var parameterUrl = "pass=" + result + "&message=" + encodeURIComponent(message) + "&name=" + encodeURIComponent(name); @@ -177,8 +177,8 @@ var init = function (qunit) { /** Initializes the test logger synchronizer. - * @param qunit - Unit testing to hook into. - * If there is no testRunId present, the QUnit functions are left as they are.</remarks> + * @param context - Unit testing to hook into. + * If there is no testRunId present, the QUnit functions are left as they are. */ var logToConsole = function (context) { if (window.console && window.console.log) { @@ -208,7 +208,7 @@ qunit.testDone = function (context) { LogTestDone(context.name, context.failed, context.total); - } + }; qunit.done = function (context) { submitRecording(); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/djstest-browser-ext.js ---------------------------------------------------------------------- diff --git a/tests/common/djstest-browser-ext.js b/tests/common/djstest-browser-ext.js new file mode 100644 index 0000000..eb1e278 --- /dev/null +++ b/tests/common/djstest-browser-ext.js @@ -0,0 +1,150 @@ +/* + * 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. + */ + + +// Because this code contains a init function to be useable directly inside the browser as well as in nodejs +// we define the @namespace djstest here instead of the a @module name djstest + +/** Create namespace djstest in window.djstest when this file is loaded as JavaScript by the browser + * @namespace djstest + */ + + +var init = function init () { + + var localDjstest = {}; + + // Initialize indexedDB if the window object is available + localDjstest.indexedDB = window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.indexedDB; + + /** Cleans all the test data saved in the IndexedDb database. + * @param {Array} storeObjects - Array of store objects with a property that is the name of the store + * @param {Function} done - Callback function + */ + localDjstest.cleanStoreOnIndexedDb = function (storeObjects, done) { + var IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction || {}; + + function deleteObjectStores(db) { + for ( var i = 0 ; i < db.objectStoreNames.length ; i ++) { + db.deleteObjectStore(db.objectStoreNames[i]); + } + } + var job; + + if (localDjstest.indexedDB) { + job = new djstest.Job(); + for ( var i = 0 ; i < storeObjects.length ; i ++) { + var storeObject = storeObjects[i]; + job.queue((function (storeObject) { + return function (success, fail) { + var dbname = "_datajs_" + storeObject.name; + var request = localDjstest.indexedDB.open(dbname); + request.onsuccess = function (event) { + var db = request.result; + + if ("setVersion" in db) { + var versionRequest = db.setVersion("0.1"); + versionRequest.onsuccess = function (event) { + var transaction = versionRequest.transaction; + transaction.oncomplete = function () { + db.close(); + success(); + }; + deleteObjectStores(db); + }; + versionRequest.onerror = function (e) { + djstest.fail("Error on cleanup - code: " + e.code + " name: " + e.name + "message: " + message); + fail(); + }; + return; + } + + // new api cleanup + db.close(); + var deleteRequest = localDjstest.indexedDB.deleteDatabase(dbname); + deleteRequest.onsuccess = function (event) { + djstest.log("djstest indexeddb cleanup - deleted database " + dbname); + success(); + }; + deleteRequest.onerror = function (e) { + djstest.fail("djstest indexeddb cleanup - error deleting database " + dbname); + fail(); + }; + djstest.log("djstest indexeddb cleanup - requested deletion of database " + dbname); + }; + + request.onerror = function (e) { + djstest.fail(e.code + ": " + e.message); + }; + }; + })(storeObject)); + } + } + + if (job) { + job.run(function (succeeded) { + if (!succeeded) { + djstest.fail("cleanup job failed"); + } + done(); + }); + } + else { + done(); + } + }; + + + // Disable caching to ensure that every test-related AJAX request is actually being sent, + // and set up a default error handler + if (typeof window !== undefined) { + $.ajaxSetup({ + cache: false, + error: function (jqXHR, textStatus, errorThrown) { + // Work around bug in IE-Mobile on Windows Phone 7 + if (jqXHR.status !== 1223) { + var err = { + status: jqXHR.status, + statusText: jqXHR.statusText, + responseText: jqXHR.responseText + }; + djstest.fail("AJAX request failed with: " + djstest.toString(err)); + } + djstest.done(); + } + }); + } + return localDjstest; +}; + +//export djstest + +if (typeof window !== 'undefined') { + //expose to browsers window object + if ( window.djstest === undefined) { + window.djstest = init(); + } else { + var tmp = init(); + $.extend( window.djstest,tmp); + } +} else { + //expose in commonjs style + module.exports = init(); +} + http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/djstest-browser.js ---------------------------------------------------------------------- diff --git a/tests/common/djstest-browser.js b/tests/common/djstest-browser.js deleted file mode 100644 index c37f7e9..0000000 --- a/tests/common/djstest-browser.js +++ /dev/null @@ -1,150 +0,0 @@ -/* - * 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. - */ - - -// Because this code contains a init function to be useable directly inside the browser as well as in nodejs -// we define the @namespace djstest here instead of the a @module name djstest - -/** Create namespace djstest in window.djstest when this file is loaded as JavaScript by the browser - * @namespace djstest - */ - - -var init = function init () { - - var localDjstest = {}; - - // Initialize indexedDB if the window object is available - localDjstest.indexedDB = window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.indexedDB; - - /** Cleans all the test data saved in the IndexedDb database. - * @param {Array} storeNames - Array of store objects with a property that is the name of the store - * @param {Function} done - Callback function - */ - localDjstest.cleanStoreOnIndexedDb = function (storeObjects, done) { - var IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction || {}; - - function deleteObjectStores(db) { - for ( var i = 0 ; i < db.objectStoreNames.length ; i ++) { - db.deleteObjectStore(db.objectStoreNames[i]); - } - } - var job; - - if (localDjstest.indexedDB) { - job = new djstest.Job(); - for ( var i = 0 ; i < storeObjects.length ; i ++) { - storeObject = storeObjects[i]; - job.queue((function (storeObject) { - return function (success, fail) { - var dbname = "_datajs_" + storeObject.name; - var request = localDjstest.indexedDB.open(dbname); - request.onsuccess = function (event) { - var db = request.result; - - if ("setVersion" in db) { - var versionRequest = db.setVersion("0.1"); - versionRequest.onsuccess = function (event) { - var transaction = versionRequest.transaction; - transaction.oncomplete = function () { - db.close(); - success(); - }; - deleteObjectStores(db); - }; - versionRequest.onerror = function (e) { - djstest.fail("Error on cleanup - code: " + e.code + " name: " + e.name + "message: " + message); - fail(); - }; - return; - } - - // new api cleanup - db.close(); - var deleteRequest = localDjstest.indexedDB.deleteDatabase(dbname); - deleteRequest.onsuccess = function (event) { - djstest.log("djstest indexeddb cleanup - deleted database " + dbname); - success(); - }; - deleteRequest.onerror = function (e) { - djstest.fail("djstest indexeddb cleanup - error deleting database " + dbname); - fail(); - }; - djstest.log("djstest indexeddb cleanup - requested deletion of database " + dbname); - }; - - request.onerror = function (e) { - djstest.fail(e.code + ": " + e.message); - }; - }; - })(storeObject)); - } - } - - if (job) { - job.run(function (succeeded) { - if (!succeeded) { - djstest.fail("cleanup job failed"); - } - done(); - }); - } - else { - done(); - } - }; - - - // Disable caching to ensure that every test-related AJAX request is actually being sent, - // and set up a default error handler - if (typeof window !== undefined) { - $.ajaxSetup({ - cache: false, - error: function (jqXHR, textStatus, errorThrown) { - // Work around bug in IE-Mobile on Windows Phone 7 - if (jqXHR.status !== 1223) { - var err = { - status: jqXHR.status, - statusText: jqXHR.statusText, - responseText: jqXHR.responseText - }; - djstest.fail("AJAX request failed with: " + djstest.toString(err)); - } - djstest.done(); - } - }); - } - return localDjstest; -}; - -//export djstest - -if (typeof window !== 'undefined') { - //expose to browsers window object - if ( window.djstest === undefined) { - window.djstest = init(); - } else { - var tmp = init(); - $.extend( window.djstest,tmp); - } -} else { - //expose in commonjs style - module.exports = init(); -} - http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/djstest.js ---------------------------------------------------------------------- diff --git a/tests/common/djstest.js b/tests/common/djstest.js index 5268467..024c1e2 100644 --- a/tests/common/djstest.js +++ b/tests/common/djstest.js @@ -190,6 +190,14 @@ var init = function init () { /** Add the unit test cases * @param disable - Indicate whether this test case should be disabled */ + /** + * storeObjects + * @param disable - Indicate whether this test case should be disabled + * @param fn - Textfunction + * @param name - Name for logging + * @param arg - Agruments + * @param timeout - Timeout + */ djstest.addFullTest = function (disable, fn, name, arg, timeout) { if (disable !== true) { @@ -198,7 +206,10 @@ var init = function init () { }; /** Add the unit test cases - * @param disable - Indicate whether this test case should be disabled + * @param fn - Textfunction + * @param name - Name for logging + * @param arg - Agruments + * @param timeout - Timeout */ djstest.addTest = function (fn, name, arg, timeout) { if (!name) { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/common/odataVerifyReader.js ---------------------------------------------------------------------- diff --git a/tests/common/odataVerifyReader.js b/tests/common/odataVerifyReader.js index bad1e51..ee1f136 100644 --- a/tests/common/odataVerifyReader.js +++ b/tests/common/odataVerifyReader.js @@ -182,7 +182,7 @@ delete data[property]; } - for (prop in data) { + for (var prop in data) { removeProperty(data[prop], property); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/e2etest/Test.html ---------------------------------------------------------------------- diff --git a/tests/e2etest/Test.html b/tests/e2etest/Test.html index 56646c9..cafcaa5 100644 --- a/tests/e2etest/Test.html +++ b/tests/e2etest/Test.html @@ -24,7 +24,7 @@ <title>odatajs side-by-side test (V3 & V4)</title> <!--<script type="text/javascript" src="../../demo/scripts/datajs-1.1.2.js"></script>--> <script type="text/javascript" src="http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=datajs&DownloadId=784667&FileTime=130354527569270000&Build=20928";></script> - <script type="text/javascript" src="../../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../../_build/lib/odatajs-latest.js"></script> https://datajs.codeplex.com/downloads/get/784666 </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/info.txt ---------------------------------------------------------------------- diff --git a/tests/info.txt b/tests/info.txt new file mode 100644 index 0000000..094b3d0 --- /dev/null +++ b/tests/info.txt @@ -0,0 +1,23 @@ + Monday, February 23, 2015 10:44 AM 2,315 odata-batch-functional-tests.html +OK 904 / 904 Monday, February 23, 2015 10:44 AM 2,580 odata-cache-filter-functional-tests.html +OK 12 / 12 Monday, February 23, 2015 10:44 AM 2,406 odata-cache-fperf-tests.html +OK 1062 / 1062 Monday, February 23, 2015 10:44 AM 2,585 odata-cache-functional-tests.html +OK 42 / 42 Monday, February 23, 2015 10:44 AM 2,420 odata-cache-rx-functional-tests.html +?? Monday, February 23, 2015 10:44 AM 34,770 odata-fuzz.html +OK 1 / 1 Monday, February 23, 2015 10:44 AM 3,399 odata-json-parse-tests.html +OK 16 / 16 Monday, February 23, 2015 10:44 AM 2,372 odata-links-functional-tests.html +FAIL 23 / 52 Monday, February 23, 2015 10:44 AM 2,350 odata-metadata-awareness-functional-tests.html + Tests 1-6 OK; Tests 7-27 are using old __metadata +OK 36 / 36 Monday, February 23, 2015 10:44 AM 2,295 odata-perf-tests.html + ->calls to nexflix defect --> removed +FAIL 751 / 763 Monday, February 23, 2015 03:54 PM 3,744 odata-qunit-tests.htm + -> problems with observable and localstoreage +?? 0/ 31 Monday, February 23, 2015 10:44 AM 2,378 odata-read-crossdomain-functional-tests.html + -> calls to odatasampleservices.azurewebsites.net fail +OK 124/124 Monday, February 23, 2015 10:44 AM 2,375 odata-read-functional-tests.html +OK 52/ 52 Monday, February 23, 2015 10:44 AM 2,332 odata-request-functional-tests.html +OK 17/ 18 Monday, February 23, 2015 10:44 AM 2,554 odatajs-cache-large-collection-functional-tests.html + -> one timeout on server side +?? Monday, February 23, 2015 10:44 AM 8,264 odatajs-cache-long-haul-tests.html +OK 1/ 1 Monday, February 23, 2015 10:44 AM 5,359 odatajs-startup-perf-test.html +?? Monday, February 23, 2015 10:44 AM 4,577 test-manager.html http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-batch-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-batch-functional-tests.html b/tests/odata-batch-functional-tests.html index baf9b54..46ad5da 100644 --- a/tests/odata-batch-functional-tests.html +++ b/tests/odata-batch-functional-tests.html @@ -35,9 +35,10 @@ window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-batch-functional-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-batch-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-batch-functional-tests.js b/tests/odata-batch-functional-tests.js index 4ff56ce..bfe3274 100644 --- a/tests/odata-batch-functional-tests.js +++ b/tests/odata-batch-functional-tests.js @@ -18,7 +18,8 @@ */ (function (window, undefined) { - OData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; + + odatajs.oData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; var unexpectedErrorHandler = function (err) { djstest.assert(false, "Unexpected call to error handler with error: " + djstest.toString(err)); @@ -47,7 +48,7 @@ djstest.assertAreEqual(data.__batchResponses.length, batchRequests.length, "Verify batch response count"); verifyBatchResponses(batchRequests, elementTypes, serviceRoot, data.__batchResponses, done); }, - unexpectedErrorHandler, OData.batch.batchHandler); + unexpectedErrorHandler, odatajs.oData.batch.batchHandler); }; var verifyBatchResponses = function (batchRequests, elementTypes, serviceRoot, batchResponses, done) { @@ -64,7 +65,7 @@ verifyChangeResponses(batchRequest.__changeRequests, batchResponses[index].__changeResponses, function () { doneOne(); }); } }, done); - } + }; var verifyChangeResponses = function (changeRequests, changeResponses, done) { forEachAsync(changeRequests, function (index, changeRequest, doneOne) { @@ -89,7 +90,7 @@ doneOne(); } }, done); - } + }; var forEachAsync = function (array, callback, done) { var count = 0; @@ -98,7 +99,7 @@ if (count == array.length) { done(); } - } + }; $.each(array, function (index, element) { callback(index, element, doneOne); }); }; @@ -272,7 +273,7 @@ batchRequests.splice(3, 1); batchResponses.splice(3, 1); verifyBatchResponses(batchRequests, ["entry", null], service, batchResponses, function () { djstest.done(); }); - }, unexpectedErrorHandler, OData.batch.batchHandler); + }, unexpectedErrorHandler, odatajs.oData.batch.batchHandler); }, "Retrieve inside changesetï¼ mimeType = " + mimeType, {mimeHeaders: mimeHeaders }); }); @@ -285,7 +286,7 @@ function (data, response) { djstest.assert(response.body.indexOf("An error occurred while processing this request.") == -1, "Verify that there is no error occurred."); djstest.done(); - }, unexpectedErrorHandler, OData.batch.batchHandler + }, unexpectedErrorHandler, odatajs.oData.batch.batchHandler ); }, "Update outside changeset"); })(this); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-cache-filter-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-cache-filter-functional-tests.html b/tests/odata-cache-filter-functional-tests.html index 35fbd08..5f4766c 100644 --- a/tests/odata-cache-filter-functional-tests.html +++ b/tests/odata-cache-filter-functional-tests.html @@ -35,9 +35,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/CacheVerifier.js"></script> <script type="text/javascript" src="common/ObservableHttpClient.js"></script> <script type="text/javascript" src="common/odataVerifyReader.js"></script> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-cache-filter-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-cache-filter-functional-tests.js b/tests/odata-cache-filter-functional-tests.js index 5b344b8..bc00bcb 100644 --- a/tests/odata-cache-filter-functional-tests.js +++ b/tests/odata-cache-filter-functional-tests.js @@ -18,7 +18,7 @@ */ (function (window, undefined) { - OData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; + odatajs.oData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; var feeds = [ { feed: "./endpoints/FoodStoreDataServiceV4.svc/Foods" } ]; @@ -142,17 +142,18 @@ }; }; + /** Runs filter and validates the results and network requests + * @param {Object} feed - The feed being read from + * @param {Object} cache - The cache to perform the filter on + * @param {Integer} index - The index value + * @param {Integer} count - The count value + * @param {Object} predicate - Filter string to append to the feed to validate the predicate + * @param {Function} finished - Callback function called after data is verified + * @param {Boolean} backwards - Use filterBack + * @param {Object} session - Session object to validate the network requests + * @param {Object} cacheVerifier - CacheVerifier object to validate the network requests + */ var validateFilterResultsAndRequests = function (feed, cache, index, count, predicate, finished, backwards, session, cacheVerifier) { - /** Runs filter and validates the results and network requests - * @param {Object} feed - The feed being read from - * @param {Object} cache - The cache to perform the filter on - * @param {Integer} index - The index value - * @param {Integer} count - The count value - * @param {Object} predicate - Filter string to append to the feed to validate the predicate - * @param {Function} finished - Callback function called after data is verified - * @param {Object} session - Session object to validate the network requests - * @param {Object} cacheVerifier - CacheVerifier object to validate the network requests - */ if (count < 0) { count = itemsInCollection; @@ -184,7 +185,7 @@ } else { cache.filterForward(index, count, predicate).then(function (actualResults) { - var expectedResults = CacheVerifier.getExpectedFilterResults(expectData, index, count, predicate, backwards) + var expectedResults = CacheVerifier.getExpectedFilterResults(expectData, index, count, predicate, backwards); djstest.assertAreEqualDeep(actualResults, expectedResults, "results for " + "filterForward requests"); if (session && cacheVerifier) { @@ -277,7 +278,7 @@ else { return cache.filterForward(index, count, predicate) } - } + }; filterMethod(params.firstIndex, params.firstCount, params.predicate, params.backwards).then( function (results) { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-cache-fperf-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-cache-fperf-tests.html b/tests/odata-cache-fperf-tests.html index f0ecd21..4fb23df 100644 --- a/tests/odata-cache-fperf-tests.html +++ b/tests/odata-cache-fperf-tests.html @@ -35,10 +35,11 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/CacheVerifier.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-cache-fperf-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-cache-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-cache-functional-tests.html b/tests/odata-cache-functional-tests.html index ad328ab..1335a48 100644 --- a/tests/odata-cache-functional-tests.html +++ b/tests/odata-cache-functional-tests.html @@ -35,9 +35,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/CacheVerifier.js"></script> <script type="text/javascript" src="common/ObservableHttpClient.js"></script> <script type="text/javascript" src="common/odataVerifyReader.js"></script> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-cache-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-cache-functional-tests.js b/tests/odata-cache-functional-tests.js index c787bbf..fe56a33 100644 --- a/tests/odata-cache-functional-tests.js +++ b/tests/odata-cache-functional-tests.js @@ -18,7 +18,7 @@ */ (function (window, undefined) { - OData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; + odatajs.oData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; var CustomDataSource = function (baseUri) { this.baseUri = baseUri; }; @@ -45,7 +45,7 @@ success: success, error: error }); - }, + }; CustomDataSource.prototype.toString = function () { return this.baseUri; }; @@ -138,15 +138,16 @@ }; }; + /** Validates the data returned by readRange + * @param {Object} cache - The cache object + * @param {Object} data - The data returned by the cache + * @param {Object} source - The base URI of the feed, or the custom data source + * @param {Integer} skipValue - The skip value + * @param {Integer} takeValue - The take value + * @param {Function} finished - Callback function called after data is verified + */ var validateExpectedRange = function (cache, data, source, skipValue, takeValue, finished) { - /** Validates the data returned by readRange - * @param {Object} cache - The cache object - * @param {Object} data - The data returned by the cache - * @param {Object} source - The base URI of the feed, or the custom data source - * @param {Integer} skipValue - The skip value - * @param {Integer} takeValue - The take value - * @param {Function} finished - Callback function called after data is verified - */ + var assertData = function (expectedData) { djstest.assertAreEqualDeep(data, expectedData, "Verify response data"); finished(); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-cache-rx-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-cache-rx-functional-tests.html b/tests/odata-cache-rx-functional-tests.html index 728e833..48aadb7 100644 --- a/tests/odata-cache-rx-functional-tests.html +++ b/tests/odata-cache-rx-functional-tests.html @@ -34,9 +34,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/ODataVerifyReader.js"></script> <script type="text/javascript" src="common/rx.js"></script> <script type="text/javascript" src="odata-cache-rx-functional-tests.js"></script> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-cache-rx-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-cache-rx-functional-tests.js b/tests/odata-cache-rx-functional-tests.js index 714cccb..75dd09a 100644 --- a/tests/odata-cache-rx-functional-tests.js +++ b/tests/odata-cache-rx-functional-tests.js @@ -18,7 +18,7 @@ */ (function (window, undefined) { - OData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; + odatajs.oData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; var feeds = [ { uri: "./endpoints/FoodStoreDataServiceV4.svc/Foods" } ]; @@ -43,12 +43,13 @@ function (observable) { return observable.Where(function (item) { return item.FoodID % 2 === 1; }); } ]; + /** Asserts two finite observables generate the same sequence + * @param {Object} actual - The actual observable + * @param {Object} expected - The expected observable + * @param {Function} done - The callback function when asserts are done + */ var assertObservables = function (actual, expected, done) { - /** Asserts two finite observables generate the same sequence - * @param {IObservable} actual - The actual observable - * @param {IObservable} expected - The expected observable - * @param {Function} done - The callback function when asserts are done - */ + var toArray = function (observable, callback) { var arr = []; observable.Subscribe( http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-fuzz.html ---------------------------------------------------------------------- diff --git a/tests/odata-fuzz.html b/tests/odata-fuzz.html index 270e153..14199a2 100644 --- a/tests/odata-fuzz.html +++ b/tests/odata-fuzz.html @@ -27,7 +27,7 @@ <meta http-equiv="expires" content="-1" /> <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js";></script> <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.js";></script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript"> @@ -319,10 +319,11 @@ { w: 3, v: "insert" } ]; + /** Fuzzes the specified string. + * @param {String} text - Text to fuzz. + * @returns {String} The fuzzes text. + */ var fuzzText = function (text) { - /** Fuzzes the specified string. - * @param {String} text - Text to fuzz. - * @returns {String} The fuzzes text. var location = Math.round(Math.random() * text.length - 1); var content = randomFromWeighted(fuzzingTextTable); @@ -352,7 +353,7 @@ } return result; - } + }; var generateResponse = function (suggestedContentType, body) { var url = rarely(null, "http://foo/bar";); @@ -362,8 +363,8 @@ headers["Content-Length"] = rarely(Math.random() * 200, undefined); headers["Content-Type"] = rarely("foo bar baz", suggestedContentType); - var response = { requestUri: url, statusCode: statusCode, statusText: statusText, headers: headers, body: body }; - return response; + + return { requestUri: url, statusCode: statusCode, statusText: statusText, headers: headers, body: body }; }; var generateRandom = function () { @@ -476,12 +477,13 @@ ]; var fakeHttpClient = { + /** Performs a fake network request. + * @param {Function} request - Request + * @param {Function} success - Success callback with the response object. + * @param {Function} error - Error callback with an error object. + * @returns {Object} Object with an 'abort' method for the operation. + */ request: function (request, success, error) { - /** Performs a network request. - * @param {Function} success - Success callback with the response object. - * @param {Function} error - Error callback with an error object. - * @returns {Object} Object with an 'abort' method for the operation. - var shouldError = rarely(true, false); var format = randomFromWeighted(formatTable); var response = format(); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-handler-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-handler-tests.js b/tests/odata-handler-tests.js index aa824c7..3cf5d90 100644 --- a/tests/odata-handler-tests.js +++ b/tests/odata-handler-tests.js @@ -54,7 +54,7 @@ odatajs.oData.request({ method: "PUT", data: testItem, - requestUri: uri, + requestUri: uri }, itemUpdatedCallback); }; http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-json-light-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-json-light-tests.js b/tests/odata-json-light-tests.js index fd2c8d4..8bf7e54 100644 --- a/tests/odata-json-light-tests.js +++ b/tests/odata-json-light-tests.js @@ -387,7 +387,7 @@ } }; - for (name in tests) { + for (var name in tests) { var test = tests[name]; verifyReadJsonLightData(test.input, test.expected, name + " - Json light entry metadata uri was read properly."); } @@ -445,7 +445,7 @@ } }; - for (name in tests) { + for (var name in tests) { var test = tests[name]; verifyReadJsonLightData(test.input, test.expected, name + " - Json light entry metadata uri was read properly.", testModel); } @@ -1556,7 +1556,7 @@ } }; - input = { + var input = { "odata.metadata": "http://someUri/$metadata#EntitySet";, "#action1": { target: "action1/item(0)", @@ -1569,7 +1569,7 @@ value: [] }; - expected = { + var expected = { __metadata: { actions: [ { @@ -1618,7 +1618,7 @@ } }; - input = { + var input = { "odata.metadata": "http://someUri/$metadata#EntitySet/@Element";, "#function2": [ { @@ -1658,7 +1658,7 @@ ] }; - expected = { + var expected = { __metadata: { type: null, actions: [ @@ -2216,7 +2216,7 @@ }, "P1": { "type": "Edm.Decimal" - }, + } }, "id": "http:\/\/someUri\/EntityTypes('5')", "uri": "http:\/\/someUri\/EntityTypes('5')", @@ -2236,7 +2236,7 @@ var model = getSampleModelWithNavPropertiesAndInheritedTypes(); var input = { "odata.metadata": "http://someUri/$metadata#Products/@Element";, - ID: 5, + ID: 5 }; var expected = { @@ -2248,7 +2248,7 @@ }, "Category": { "type": "ODataDemo.Category", - "associationLinkUrl": "http:\/\/someUri\/Products(5)\/$links\/Category", + "associationLinkUrl": "http:\/\/someUri\/Products(5)\/$links\/Category" } }, "id": "http:\/\/someUri\/Products(5)", @@ -2368,7 +2368,7 @@ var input = { "odata.metadata": "http:\/myexample.com\/MyService.svc\/$metadata#Products\/@Element", "odata.type": "ODataDemo.FeaturedProduct", - "ID": 9, + "ID": 9 }; var expected = { @@ -2420,9 +2420,9 @@ { "odata.type": "ODataDemo.FeaturedProduct", "Category": { - "ID": 1, + "ID": 1 }, - "ID": 9, + "ID": 9 } ] }; http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-json-parse-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-json-parse-tests.html b/tests/odata-json-parse-tests.html index 57db067..0d7af61 100644 --- a/tests/odata-json-parse-tests.html +++ b/tests/odata-json-parse-tests.html @@ -51,10 +51,11 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-json-parse-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-json-parse-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-json-parse-tests.js b/tests/odata-json-parse-tests.js index 00f0ba2..ee9f7b4 100644 --- a/tests/odata-json-parse-tests.js +++ b/tests/odata-json-parse-tests.js @@ -35,9 +35,9 @@ headers: oHeaders, //requestUri: "http://services.odata.org/OData/OData.svc/$metadata";, requestUri: "http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/$metadata";, //"http://localhost:6630/PrimitiveKeys.svc/$metadata";, - data: null, + data: null }; - odatajs.oData.read(metadataRequest, metaDatasuccess, errorFunc,OData.metadataHandler); + odatajs.oData.read(metadataRequest, metaDatasuccess, errorFunc,odatajs.oData.metadataHandler); } djstest.addTest(function test1() { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-json-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-json-tests.js b/tests/odata-json-tests.js index a67fcf2..7a32976 100644 --- a/tests/odata-json-tests.js +++ b/tests/odata-json-tests.js @@ -864,7 +864,7 @@ djstest.assertAreEqualDeep(response.data, expected, message); }; - var getPointValue = { edmType : 'GeographyPoint', value : { + var getPointValue = { edmType : '#GeographyPoint', value : { type: "Point", coordinates: [1.0, 2.0], crs: { @@ -875,7 +875,7 @@ } }}; - var getLineStringValue = { edmType : 'GeographyLineString', value : { + var getLineStringValue = { edmType : '#GeographyLineString', value : { "type": "LineString", "coordinates": [ [100.0, 0.0], [101.0, 1.0] ], crs: { @@ -886,7 +886,7 @@ } }}; - var getPolygonValue = { edmType : 'GeographyPolygon', value : { + var getPolygonValue = { edmType : '#GeographyPolygon', value : { "type": "Polygon", "coordinates": [ [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ], @@ -900,7 +900,7 @@ } }}; - var getMultiPointValue = { edmType : 'GeographyMultiPoint', value : { + var getMultiPointValue = { edmType : '#GeographyMultiPoint', value : { "type": "MultiPoint", "coordinates": [ [100.0, 0.0], [101.0, 1.0] ], crs: { @@ -911,7 +911,7 @@ } }}; - var getMultiLineStringValue = { edmType : 'GeographyMultiLineString', value : { + var getMultiLineStringValue = { edmType : '#GeographyMultiLineString', value : { "type": "MultiLineString", "coordinates": [ [ [100.0, 0.0], [101.0, 1.0] ], @@ -924,7 +924,7 @@ } } }}; - var getMultiPolygonStringValue = { edmType : 'GeographyMultiPolygon', value : { + var getMultiPolygonStringValue = { edmType : '#GeographyMultiPolygon', value : { "type": "MultiPolygon", "coordinates": [ [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]], @@ -975,7 +975,7 @@ var expected = { "@odata.context": "http://someUri#Edm."+item.edmType, value: item.value, - "[email protected]" : item.edmType, + "[email protected]" : item.edmType }; verifyReadJsonLightDataMetadataMinimal(input, expected, "Json light top level primitive property was read properly.", {}); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-links-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-links-functional-tests.html b/tests/odata-links-functional-tests.html index 48eaac7..545e807 100644 --- a/tests/odata-links-functional-tests.html +++ b/tests/odata-links-functional-tests.html @@ -35,9 +35,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-links-functional-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-metadata-awareness-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-metadata-awareness-functional-tests.html b/tests/odata-metadata-awareness-functional-tests.html index 2b33dbc..ace753b 100644 --- a/tests/odata-metadata-awareness-functional-tests.html +++ b/tests/odata-metadata-awareness-functional-tests.html @@ -34,9 +34,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-metadata-awareness-functional-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-metadata-awareness-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-metadata-awareness-functional-tests.js b/tests/odata-metadata-awareness-functional-tests.js index cdd2e5e..a681bd3 100644 --- a/tests/odata-metadata-awareness-functional-tests.js +++ b/tests/odata-metadata-awareness-functional-tests.js @@ -109,20 +109,20 @@ odatajs.oData.read(metadataUri, function (metadata) { serviceMetadata = metadata; callback(metadata); - }, unexpectedErrorHandler, OData.metadataHandler); + }, unexpectedErrorHandler, odatajs.oData.metadataHandler); } else { callback(serviceMetadata); } - } + }; module("Functional", { setup: function () { djstest.wait(function (done) { $.post(service + "/ResetData", done); }); - OData.defaultMetadata = []; - OData.jsonHandler.recognizeDates = false; + odatajs.oData.defaultMetadata = []; + odatajs.oData.jsonHandler.recognizeDates = false; } }); @@ -131,7 +131,7 @@ var entryUri = feedUris["true"] + "(0)?$select=" + propertyToSelect; djstest.assertsExpected(2); getMetadata(function (metadata) { - OData.defaultMetadata.push(metadata); + odatajs.oData.defaultMetadata.push(metadata); odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) { djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code"); ODataVerifyReader.readJson(entryUri, function (expectedData) { @@ -139,7 +139,7 @@ djstest.done(); }) }, unexpectedErrorHandler); - }, unexpectedErrorHandler, OData.metadataHandler); + }, unexpectedErrorHandler, odatajs.oData.metadataHandler); }, "GET with mapped properties selecting " + selectProperty + " with keepInContent = true", selectProperty); }); @@ -147,7 +147,7 @@ var feedUri = feedUris[keepInContent]; $.each(testEntries, function (entryIndex, testEntry) { - params = { + var params = { feedUri: feedUri, testEntry: $.extend(true, {}, testEntry, { data: { @@ -160,7 +160,7 @@ var entryUri = params.feedUri + "(" + entryIndex + ")"; djstest.assertsExpected(2); getMetadata(function (metadata) { - OData.defaultMetadata.push(metadata); + odatajs.oData.defaultMetadata.push(metadata); odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) { djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code"); ODataVerifyReader.readJson(entryUri, function (expectedData) { @@ -168,7 +168,7 @@ djstest.done(); }) }, unexpectedErrorHandler); - }, unexpectedErrorHandler, OData.metadataHandler); + }, unexpectedErrorHandler, odatajs.oData.metadataHandler); }, "GET " + params.testEntry.description + " with mapped properties: keepInContent = " + keepInContent, params); djstest.addTest(function postMappedEntry(params) { @@ -182,14 +182,14 @@ djstest.done(); }) }, unexpectedErrorHandler, undefined, undefined, metadata); - }, unexpectedErrorHandler, OData.metadataHandler); + }, unexpectedErrorHandler, odatajs.oData.metadataHandler); }, "POST " + params.testEntry.description + " with mapped properties: keepInContent = " + keepInContent, params); djstest.addTest(function putMappedEntry(params) { var entryUri = params.feedUri + "(0)"; djstest.assertsExpected(2); getMetadata(function (metadata) { - OData.defaultMetadata.push(metadata); + odatajs.oData.defaultMetadata.push(metadata); odatajs.oData.request({ requestUri: entryUri, method: "PUT", headers: djstest.clone(mimeHeaders), data: params.testEntry.data }, function (data, response) { djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code"); ODataVerifyReader.readJson(entryUri, function (actualData) { @@ -197,7 +197,7 @@ djstest.done(); }) }, unexpectedErrorHandler); - }, unexpectedErrorHandler, OData.metadataHandler); + }, unexpectedErrorHandler, odatajs.oData.metadataHandler); }, "PUT " + params.testEntry.description + " with mapped properties: keepInContent = " + keepInContent, params); }); }); @@ -215,7 +215,7 @@ djstest.done(); }) }, unexpectedErrorHandler, undefined, undefined, metadata); - }, unexpectedErrorHandler, OData.metadataHandler); + }, unexpectedErrorHandler, odatajs.oData.metadataHandler); }, "GET " + descriptions[index] + " with mapped properties: keepInContent = false", index); }); @@ -225,7 +225,7 @@ var specialDaysEndpoint = foodStoreDataService + "/SpecialDays"; djstest.assertsExpected(1); - OData.jsonHandler.recognizeDates = params.recognizeDates; + odatajs.oData.jsonHandler.recognizeDates = params.recognizeDates; odatajs.oData.read(foodStoreDataService + "/$metadata", function (metadata) { odatajs.oData.read({ requestUri: specialDaysEndpoint, headers: { Accept: params.accept} }, function (data, response) { // Because our verifier isn't metadata aware, it is not 100% correct, so we will pass in recognizeDates = true @@ -237,7 +237,7 @@ djstest.done(); }, params.accept, true); }, unexpectedErrorHandler, undefined, undefined, metadata); - }, unexpectedErrorHandler, OData.metadataHandler); + }, unexpectedErrorHandler, odatajs.oData.metadataHandler); }, "GET metadata-aware JSON dates with recognizeDates=" + recognizeDates, { recognizeDates: recognizeDates, accept: "application/json;odata.metadata=minimal" }); }); })(this); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-net-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-net-tests.js b/tests/odata-net-tests.js index 351b197..65714d7 100644 --- a/tests/odata-net-tests.js +++ b/tests/odata-net-tests.js @@ -65,7 +65,7 @@ //Cleanup and finish the test after all requests have been sent and processed. Poll every 50 ms var timer = setInterval(function () { if (sentCount === tests.length) { - clearInterval(timer) + clearInterval(timer); window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback; window.XMLHttpRequest = oldXmlHttpRequest; MockXMLHttpRequest.reset(); @@ -160,7 +160,7 @@ testDone = true; }; - result = window.odatajs.oData.net.defaultHttpClient.request( + var result = window.odatajs.oData.net.defaultHttpClient.request( { requestUri: "http://test1";, headers: {} }, function (response) { djstest.pass("success method was hit"); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-perf-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-perf-tests.html b/tests/odata-perf-tests.html index 238246f..b06570d 100644 --- a/tests/odata-perf-tests.html +++ b/tests/odata-perf-tests.html @@ -34,9 +34,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/Instrument.js"></script> <script type="text/javascript" src="odata-perf-tests.js"></script> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-perf-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-perf-tests.js b/tests/odata-perf-tests.js index cd465fe..dd6f1d1 100644 --- a/tests/odata-perf-tests.js +++ b/tests/odata-perf-tests.js @@ -42,8 +42,9 @@ { service: largeCollectionService, uri: largeCollectionService + "Customers", mimeType: "application/json;odata.metadata=minimal" }, { service: largeCollectionService, uri: largeCollectionService + "Customers", mimeType: "application/json;odata.metadata=full" }, { service: largeCollectionService, uri: largeCollectionService + "Customers", mimeType: "application/json;odata.metadata=none" }, - { service: largeCollectionService, uri: largeCollectionService + "Suppliers", mimeType: "application/json" }, - { service: null, uri: "http://odata.netflix.com/Catalog/Titles";, mimeType: "application/json" } + { service: largeCollectionService, uri: largeCollectionService + "Suppliers", mimeType: "application/json" } + /*{ service: null, uri: "http://odata.netflix.com/Catalog/Titles";, mimeType: "application/json" }*/ + /* netflix service not available anymore */ ]; module("Performance", { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-qunit-tests.htm ---------------------------------------------------------------------- diff --git a/tests/odata-qunit-tests.htm b/tests/odata-qunit-tests.htm index 4c6a838..8afe0b7 100644 --- a/tests/odata-qunit-tests.htm +++ b/tests/odata-qunit-tests.htm @@ -42,14 +42,14 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/lib/odatajs-latest.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/mockHttpClient.js"></script> <script type="text/javascript" src="common/mockXMLHttpRequest.js"></script> <script type="text/javascript" src="common/djstest.js"></script> - <script type="text/javascript" src="common/djstest-browser.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/CacheVerifier.js"></script> <!--bingl: disable the failure test case. Will fix them in the next change set--> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-read-crossdomain-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-read-crossdomain-functional-tests.html b/tests/odata-read-crossdomain-functional-tests.html index 784aec6..a31db0c 100644 --- a/tests/odata-read-crossdomain-functional-tests.html +++ b/tests/odata-read-crossdomain-functional-tests.html @@ -35,9 +35,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-read-crossdomain-functional-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-read-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-read-functional-tests.html b/tests/odata-read-functional-tests.html index 7114113..6888a86 100644 --- a/tests/odata-read-functional-tests.html +++ b/tests/odata-read-functional-tests.html @@ -35,9 +35,10 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-read-functional-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-read-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-read-functional-tests.js b/tests/odata-read-functional-tests.js index 29f28e4..3b07692 100644 --- a/tests/odata-read-functional-tests.js +++ b/tests/odata-read-functional-tests.js @@ -18,7 +18,7 @@ */ (function (window, undefined) { - OData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; + odatajs.oData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; var unexpectedErrorHandler = function (err) { djstest.assert(false, "Unexpected call to error handler with error: " + djstest.toString(err)); djstest.done(); @@ -515,7 +515,7 @@ ); }, unexpectedErrorHandler, - OData.metadataHandler + odatajs.oData.metadataHandler ); }, "Testing valid read metadata " + parameters.handlerAccept + " on service " + parameters.serviceName, parameters); }); @@ -535,7 +535,7 @@ djstest.assertAreEqual(err.response.statusCode, httpStatusCode.unsupportedMediaType, "Response status code"); djstest.done(); }, - OData.metadataHandler + odatajs.oData.metadataHandler ); }, "Testing read metadata with invalid MIME type " + parameters.handlerAccept + " on service " + parameters.serviceName, parameters); }); @@ -554,7 +554,7 @@ response.headers["Content-Type"] = "application/xml"; success(response); }, error); - } + }; window.odatajs.oData.net.defaultHttpClient = modifyTypeHttpClient; http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-request-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odata-request-functional-tests.html b/tests/odata-request-functional-tests.html index 331cf8c..434df52 100644 --- a/tests/odata-request-functional-tests.html +++ b/tests/odata-request-functional-tests.html @@ -34,10 +34,11 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="odata-request-functional-tests.js"></script> </head> <body> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-request-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-request-functional-tests.js b/tests/odata-request-functional-tests.js index eadb6a6..0c04dac 100644 --- a/tests/odata-request-functional-tests.js +++ b/tests/odata-request-functional-tests.js @@ -18,7 +18,7 @@ */ (function (window, undefined) { - OData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; + odatajs.oData.defaultHandler.accept = "application/json;q=0.9, */*;q=0.1"; var unexpectedErrorHandler = function (err) { djstest.assert(false, "Unexpected call to error handler with error: " + djstest.toString(err)); djstest.done(); @@ -96,7 +96,7 @@ var subset = function (object, subsetObject) { if (typeof (object) == "object" && typeof (subsetObject) == "object") { var result = {}; - for (subsetProp in subsetObject) { + for (var subsetProp in subsetObject) { result[subsetProp] = subset(object[subsetProp], subsetObject[subsetProp]); } return result; http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-roundtrip-functional-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-roundtrip-functional-tests.js b/tests/odata-roundtrip-functional-tests.js index 597c273..af88e0f 100644 --- a/tests/odata-roundtrip-functional-tests.js +++ b/tests/odata-roundtrip-functional-tests.js @@ -57,7 +57,7 @@ done(); }, request.headers.Accept); }, unexpectedErrorHandler); - } + }; var verifyMerge = function (request, done) { var httpOperation = request.method + " " + request.requestUri; @@ -72,13 +72,13 @@ }, request.headers["Content-Type"]); }, unexpectedErrorHandler); }, request.headers["Content-Type"]); - } + }; // Returns a subset of object with the same set of properties (recursive) as the subsetObject var subset = function (object, subsetObject) { if (typeof (object) == "object" && typeof (subsetObject) == "object") { var result = {}; - for (subsetProp in subsetObject) { + for (var subsetProp in subsetObject) { result[subsetProp] = subset(object[subsetProp], subsetObject[subsetProp]); } return result; @@ -135,7 +135,7 @@ var newFoodLinks = { uri: foodsFeed + "(1)" - } + }; module("Functional", { setup: function () { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odata-tests.js ---------------------------------------------------------------------- diff --git a/tests/odata-tests.js b/tests/odata-tests.js index 0e6e951..119e230 100644 --- a/tests/odata-tests.js +++ b/tests/odata-tests.js @@ -23,20 +23,21 @@ var localFeed = "./endpoints/FoodStoreDataService.svc/Foods"; var northwindFeed = northwindService + "Suppliers"; + /** Count the number of IFRAMES in the page + * @returns {Number} The number of IFRAMES + */ var countIFrames = function () { - /** Count the number of IFRAMES in the page - * @returns {Integer} The number of IFRAMES - */ + return document.getElementsByTagName("IFRAME").length; - } + }; module("Unit"); var originalEnableJsonpCallback = OData.defaultHttpClient.enableJsonpCallback; + /** Restores OData.defaultHttpClient.enableJsonpCallback to the library default. + */ var restoreJsonpCallback = function () { - /** Restores OData.defaultHttpClient.enableJsonpCallback to the library default. - */ OData.defaultHttpClient.enableJsonpCallback = originalEnableJsonpCallback; }; http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odatajs-cache-large-collection-functional-tests.html ---------------------------------------------------------------------- diff --git a/tests/odatajs-cache-large-collection-functional-tests.html b/tests/odatajs-cache-large-collection-functional-tests.html index 9415305..49c687b 100644 --- a/tests/odatajs-cache-large-collection-functional-tests.html +++ b/tests/odatajs-cache-large-collection-functional-tests.html @@ -33,11 +33,11 @@ <script type="text/javascript"> window.TestSynchronizer.init(QUnit); </script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../_build/lib/odatajs-latest.js"></script> <!--<script type="text/javascript" src="common/common.js"></script>--> <script type="text/javascript" src="common/djstest.js"></script> - <script type="text/javascript" src="common/djstest-browser.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/CacheVerifier.js"></script> <script type="text/javascript" src="common/ObservableHttpClient.js"></script> <script type="text/javascript" src="common/odataVerifyReader.js"></script> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odatajs-cache-long-haul-tests.html ---------------------------------------------------------------------- diff --git a/tests/odatajs-cache-long-haul-tests.html b/tests/odatajs-cache-long-haul-tests.html index 3e02e32..5983a08 100644 --- a/tests/odatajs-cache-long-haul-tests.html +++ b/tests/odatajs-cache-long-haul-tests.html @@ -27,9 +27,10 @@ <meta http-equiv="expires" content="-1" /> <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js";></script> <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.js";></script> - <script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script> + <script type="text/javascript" src="../build/lib/odatajs-latest.js"></script> <script type="text/javascript" src="common/common.js"></script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/Instrument.js"></script> <script type="text/javascript"> var cache; @@ -88,11 +89,13 @@ }); }; + /** Calls readRange over the whole collection and done when all items have been read. + * @param {Number} index - Index to start the read. + * @param {String} count - The count of each readRange. + * @param {Function} done - Function to be called when all items in collection have been read. + */ var callReadRangeRepeatedly = function (index, count, done) { - /** Calls readRange over the whole collection and done when all items have been read. - * @param {Integer} index - Index to start the read. - * @param {String} count - The count of each readRange. - * @param {Function} done - Function to be called when all items in collection have been read. + var cacheRead = function () { cache.readRange(index, count).then(function () { if (index < itemsInCollection) { @@ -111,7 +114,7 @@ else { cacheRead(); } - } + }; function startTest() { var prefetchSize = http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/odatajs-startup-perf-test.html ---------------------------------------------------------------------- diff --git a/tests/odatajs-startup-perf-test.html b/tests/odatajs-startup-perf-test.html index f69684a..e157e65 100644 --- a/tests/odatajs-startup-perf-test.html +++ b/tests/odatajs-startup-perf-test.html @@ -50,6 +50,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL </script> <script type="text/javascript" src="common/djstest.js"></script> + <script type="text/javascript" src="common/djstest-browser-ext.js"></script> <script type="text/javascript" src="common/Instrument.js"></script> <script type="text/javascript"> @@ -58,7 +59,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL var durationLimit = 500; var memorySizeDeltaLimit = 5000000; - var filename = "../build/odatajs-4.0.0-beta-01.js"; + var filename = "../_build/lib/odatajs-latest.js"; var getBrowserMemorySize = Instrument.getBrowserMemorySize; $.ajax({ http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/store-indexeddb-tests.js ---------------------------------------------------------------------- diff --git a/tests/store-indexeddb-tests.js b/tests/store-indexeddb-tests.js index 47690a4..3ccc1bc 100644 --- a/tests/store-indexeddb-tests.js +++ b/tests/store-indexeddb-tests.js @@ -253,7 +253,7 @@ store.read("key", function (key, value) { djstest.assertAreEqual(value, "value", "value was not changed"); djstest.done(); - }), unexpectedError; + }, unexpectedError); }); }, unexpectedError); }); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/store-tests.js ---------------------------------------------------------------------- diff --git a/tests/store-tests.js b/tests/store-tests.js index 48169c3..45725d0 100644 --- a/tests/store-tests.js +++ b/tests/store-tests.js @@ -72,7 +72,7 @@ */ var implementation = mechanismImplementations[mechanism]; return implementation && implementation.canCreate(); - } + }; var makeUnexpectedErrorHandler = function (fail) { return function (err) { djstest.fail("error: " + err.name + " -- message: " + err.message); @@ -433,7 +433,7 @@ job.queue(function (success, fail) { store.remove("Key1", function () { - djstest.pass("Key1 was removed from the store") + djstest.pass("Key1 was removed from the store"); success(); }, makeUnexpectedErrorHandler(fail)); }); @@ -660,8 +660,9 @@ var i, len; for (i = 0, len = tests.length; i < len; i++) { + var test = tests[i]; try { - var test = tests[i]; + var store = odatajs.store.createStore("testStore" + i, tests[i].mechanism); if (!test.exception) { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/5bff25da/tests/test-manager.html ---------------------------------------------------------------------- diff --git a/tests/test-manager.html b/tests/test-manager.html index 290f161..d43e89b 100644 --- a/tests/test-manager.html +++ b/tests/test-manager.html @@ -76,7 +76,7 @@ $.each(data.d, function (_, id) { $("#activeRuns").append("<a href='" + serviceRoot + "GetTestRunResults?testRunId=" + id + "'>" + id + "</a><br />"); }) - }; + } }); }; </script>
