You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/08/21 10:56:56 UTC
[1/2] [OLINGO-407] JS- V4's window.OData is not defined yet: part 3 -
remove window.odatajs.read() & .request(),
just use window.odatajs.oData.read() & .request()
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master 689c94cba -> 06770e2b1
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-metadata-awareness-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-metadata-awareness-functional-tests.js b/datajs/tests/odata-metadata-awareness-functional-tests.js
index 9e8ed01..a5d2887 100644
--- a/datajs/tests/odata-metadata-awareness-functional-tests.js
+++ b/datajs/tests/odata-metadata-awareness-functional-tests.js
@@ -106,7 +106,7 @@
/** Common function for tests to get and cache metadata, to reduce network calls made by tests
*/
if (!serviceMetadata) {
- odatajs.read(metadataUri, function (metadata) {
+ odatajs.oData.read(metadataUri, function (metadata) {
serviceMetadata = metadata;
callback(metadata);
}, unexpectedErrorHandler, OData.metadataHandler);
@@ -132,7 +132,7 @@
djstest.assertsExpected(2);
getMetadata(function (metadata) {
OData.defaultMetadata.push(metadata);
- odatajs.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
ODataReadOracle.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
@@ -161,7 +161,7 @@
djstest.assertsExpected(2);
getMetadata(function (metadata) {
OData.defaultMetadata.push(metadata);
- odatajs.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
ODataReadOracle.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
@@ -175,7 +175,7 @@
var postEntry = $.extend(true, {}, params.testEntry.data, { ID: 100 });
djstest.assertsExpected(2);
getMetadata(function (metadata) {
- odatajs.request({ requestUri: params.feedUri, method: "POST", headers: djstest.clone(mimeHeaders), data: postEntry }, function (data, response) {
+ odatajs.oData.request({ requestUri: params.feedUri, method: "POST", headers: djstest.clone(mimeHeaders), data: postEntry }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code");
ODataReadOracle.readJson(feedUri + "(" + postEntry.ID + ")", function (actualData) {
djstest.assertWithoutMetadata(actualData, postEntry, "Verify new entry data against server");
@@ -190,7 +190,7 @@
djstest.assertsExpected(2);
getMetadata(function (metadata) {
OData.defaultMetadata.push(metadata);
- odatajs.request({ requestUri: entryUri, method: "PUT", headers: djstest.clone(mimeHeaders), data: params.testEntry.data }, function (data, response) {
+ 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");
ODataReadOracle.readJson(entryUri, function (actualData) {
djstest.assertWithoutMetadata(actualData, $.extend({ ID: 0 }, params.testEntry.data), "Verify updated entry data against server");
@@ -208,7 +208,7 @@
var entryUri = service + "/HierarchicalEntries(" + index + ")";
djstest.assertsExpected(2);
getMetadata(function (metadata) {
- odatajs.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
ODataReadOracle.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
@@ -226,8 +226,8 @@
djstest.assertsExpected(1);
OData.jsonHandler.recognizeDates = params.recognizeDates;
- odatajs.read(foodStoreDataService + "/$metadata", function (metadata) {
- odatajs.read({ requestUri: specialDaysEndpoint, headers: { Accept: params.accept} }, function (data, response) {
+ odatajs.oData.read(foodStoreDataService + "/$metadata", function (metadata) {
+ odatajs.oData.read({ requestUri: specialDaysEndpoint, headers: { Accept: params.accept} }, function (data, response) {
// Because our oracle isn't metadata aware, it is not 100% correct, so we will pass in recognizeDates = true
// in all cases and manually fix up the property that was incorrectly converted
window.ODataReadOracle.readFeed(specialDaysEndpoint, function (expectedData) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-metadata-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-metadata-tests.js b/datajs/tests/odata-metadata-tests.js
index 9d22e20..525dd62 100644
--- a/datajs/tests/odata-metadata-tests.js
+++ b/datajs/tests/odata-metadata-tests.js
@@ -33,7 +33,7 @@
for (i = 0, len = cases.length; i < len; i++) {
var response = cases[i].i;
var testClient = { request: function (r, success, error) { success(response); } };
- window.odatajs.read("foo", function (data) {
+ window.odatajs.oData.read("foo", function (data) {
djstest.assertAreEqualDeep(data, cases[i].e, "handler result matches target");
}, function (err) {
djstest.fail(err.message);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-net-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-net-tests.js b/datajs/tests/odata-net-tests.js
index 7164ff1..351b197 100644
--- a/datajs/tests/odata-net-tests.js
+++ b/datajs/tests/odata-net-tests.js
@@ -285,7 +285,7 @@
// DATAJS INTERNAL END
djstest.addTest(function userPasswordTest() {
- odatajs.request({
+ odatajs.oData.request({
requestUri: "./endpoints/FoodStoreDataServiceV4.svc/UserNameAndPassword",
user: "the-user",
password: "the-password"
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-perf-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-perf-tests.js b/datajs/tests/odata-perf-tests.js
index e04ce99..cd465fe 100644
--- a/datajs/tests/odata-perf-tests.js
+++ b/datajs/tests/odata-perf-tests.js
@@ -64,7 +64,7 @@
djstest.addTest(function readPerfTest(params) {
var measureRead = function (metadata) {
var startTime = new Date();
- odatajs.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function () {
+ odatajs.oData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function () {
var duration = new Date() - startTime - timedHttpClient.duration;
djstest.pass("Duration: " + duration + " ms (Network: " + timedHttpClient.duration + " ms)");
djstest.done();
@@ -74,7 +74,7 @@
window.odatajs.oData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
} else {
measureRead();
}
@@ -86,7 +86,7 @@
var measureRead = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
for (var i = 0; i < total; i++) {
- odatajs.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
+ odatajs.oData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
count++;
if (count >= total) {
Instrument.getBrowserMemorySize(function (memoryAfter) {
@@ -102,7 +102,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
} else {
measureRead();
}
@@ -114,7 +114,7 @@
var measureRead = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
var makeRequest = function () {
- odatajs.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
+ odatajs.oData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
count++;
if (count < total) {
setTimeout(makeRequest, 0);
@@ -134,7 +134,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
} else {
measureRead();
}
@@ -157,7 +157,7 @@
djstest.addTest(function postPerfTest(params) {
var measurePost = function (metadata) {
var startTime = new Date();
- odatajs.request(params.request, function () {
+ odatajs.oData.request(params.request, function () {
var duration = new Date() - startTime - timedHttpClient.duration;
djstest.pass("Duration: " + duration + " ms (Network: " + timedHttpClient.duration + " ms)");
djstest.done();
@@ -168,7 +168,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
} else {
measurePost();
}
@@ -180,7 +180,7 @@
var measurePost = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
for (var i = 0; i < total; i++) {
- odatajs.request(params.request, function (_, response) {
+ odatajs.oData.request(params.request, function (_, response) {
count++;
if (count >= total) {
Instrument.getBrowserMemorySize(function (memoryAfter) {
@@ -198,7 +198,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
} else {
measurePost();
}
@@ -210,7 +210,7 @@
var measurePost = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
var makeRequest = function () {
- odatajs.request(params.request, function (_, response) {
+ odatajs.oData.request(params.request, function (_, response) {
count++;
if (count < total) {
setTimeout(makeRequest, 0);
@@ -232,7 +232,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
} else {
measurePost();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-read-crossdomain-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-read-crossdomain-functional-tests.js b/datajs/tests/odata-read-crossdomain-functional-tests.js
index 1c552e4..9e8aca9 100644
--- a/datajs/tests/odata-read-crossdomain-functional-tests.js
+++ b/datajs/tests/odata-read-crossdomain-functional-tests.js
@@ -76,7 +76,7 @@
}
djstest.log("Reading data over the wire.");
- odatajs.read(request, function (data, response) {
+ odatajs.oData.read(request, function (data, response) {
djstest.log("Verifying data over the wire from Oracle.");
window.ODataReadOracle.readFeed(azureOdataFeed, function (expectedData) {
data = fixConstructors(data);
@@ -91,7 +91,7 @@
var endPoint = azureOdataFeed + "(1)";
djstest.assertsExpected(1);
djstest.log("Reading data over the wire.");
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
djstest.log("Verifying data over the wire from Oracle.");
window.ODataReadOracle.readEntry(endPoint, function (expectedData) {
data = fixConstructors(data);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-read-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-read-functional-tests.js b/datajs/tests/odata-read-functional-tests.js
index 9bd24e0..6253856 100644
--- a/datajs/tests/odata-read-functional-tests.js
+++ b/datajs/tests/odata-read-functional-tests.js
@@ -76,7 +76,7 @@
djstest.addTest(function readFullFeedTest(handlerAccept) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: feed, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: feed, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(feed,
function (expectedData) {
@@ -92,7 +92,7 @@
djstest.addTest(function readMaxAndNullValueEntryTest(handlerAccept) {
var endPoint = feed + "(0)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -108,7 +108,7 @@
djstest.addTest(function readMinAndZeroValueEntryTest(handlerAccept) {
var endPoint = feed + "(1)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: "./endpoints/FoodStoreDataServiceV4.svc/Foods(1)", headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: "./endpoints/FoodStoreDataServiceV4.svc/Foods(1)", headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -123,7 +123,7 @@
djstest.addTest(function readNullNestedComplexTypeEntryTest(handlerAccept) {
var endPoint = feed + "(2)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -139,7 +139,7 @@
djstest.addTest(function readNullComplexTypeEntryTest(handlerAccept) {
var endPoint = feed + "(3)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -155,7 +155,7 @@
djstest.addTest(function readNullPropertiesDerivedEntryTest(handlerAccept) {
djstest.assertsExpected(1);
var endPoint = feed + "(4)";
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -172,7 +172,7 @@
djstest.assertsExpected(1);
var endPoint = feed + "(5)";
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -188,7 +188,7 @@
djstest.addTest(function readEntryWithInlineFeedTest(handlerAccept) {
var endpoint = categoriesFeed + "(0)?$expand=Foods";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -205,7 +205,7 @@
djstest.addTest(function readFeedWithEmptyInlineFeedTest(handlerAccept) {
var endpoint = categoriesFeed + "?$filter=Name eq 'Empty Category'&$expand=Foods";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -222,7 +222,7 @@
djstest.addTest(function readEntryWithInlineEntryTest(handlerAccept) {
var endpoint = feed + "(0)?$expand=Category";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -239,7 +239,7 @@
djstest.addTest(function readFeedWithNullInlineEntryTest(handlerAccept) {
var endpoint = feed + "?$expand=Category&$filter=Category eq null";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -255,7 +255,7 @@
djstest.addTest(function readFeedWithInlineCountTest(handlerAccept) {
var endpoint = feed + "?$count=true";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -272,7 +272,7 @@
djstest.addTest(function selectSinglePropertyOnEntryTest(handlerAccept) {
var endpoint = feed + "(0)?$select=Name";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -287,7 +287,7 @@
djstest.addTest(function selectComplexTypeOnFeedTest(handlerAccept) {
var endpoint = feed + "?$select=Packaging";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -302,7 +302,7 @@
djstest.addTest(function selectMultiplePropertiesOnEntryTest(handlerAccept) {
var endpoint = feed + "(3)?$select=Packaging,ExpirationDate,IsAvailable";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -317,7 +317,7 @@
djstest.addTest(function readPagedCategoriesCollectionTest(handlerAccept) {
var endpoint = categoriesFeed;
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -331,7 +331,7 @@
djstest.addTest(function readPagedCollectionWithInlineCountTest(handlerAccept) {
var endpoint = categoriesFeed + "?$count=true";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -346,7 +346,7 @@
djstest.addTest(function readEntryWithNamedStreams(handlerAccept) {
var endpoint = feed + "(1)?$expand=Category";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -360,7 +360,7 @@
djstest.addTest(function readEntryWithCollectionProperties(handlerAccept) {
var endpoint = feed + "(0)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -374,7 +374,7 @@
djstest.addTest(function invalidEntryReadTest(handlerAccept) {
var endPoint = feed + "(16)";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
djstest.assert(false, "We should not get here because data is not valid.");
djstest.done()
@@ -389,7 +389,7 @@
djstest.addTest(function invalidFeedReadTest(handlerAccept) {
var endPoint = feed + "Invalid";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
djstest.assert(false, "We should not get here because data is not valid.");
djstest.done();
@@ -404,7 +404,7 @@
djstest.addTest(function standardErrorReadTest(handlerAccept) {
var endPoint = feed + "?$foo=bar";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
djstest.assert(false, "We should not get here because data is not valid.");
djstest.done()
@@ -419,7 +419,7 @@
djstest.addTest(function inStreamErrorReadTest(handlerAccept) {
var endPoint = "./endpoints/ErrorDataService.svc/Entities";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
djstest.assert(false, "Unexpected call to success handler with response: " + djstest.toString(response));
djstest.done()
}, function (err) {
@@ -434,7 +434,7 @@
djstest.addTest(function readFullFeedBasicAuthTest(handlerAccept) {
var endpoint = "./endpoints/BasicAuthDataService.svc/Customers";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
window.ODataReadOracle.readFeed({ url: endpoint, user: user, password: password }, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -445,7 +445,7 @@
djstest.addTest(function readEntryBasicAuthTest(handlerAccept) {
var endpoint = "./endpoints/BasicAuthDataService.svc/Customers(1)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
window.ODataReadOracle.readEntry({ url: endpoint, user: user, password: password }, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -465,7 +465,7 @@
djstest.addTest(function validReadServiceDocumentTest(params) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
function (data, response) {
window.ODataReadOracle.readServiceDocument(serviceName,
function (expectedData) {
@@ -484,7 +484,7 @@
djstest.addTest(function invalidReadServiceDocumentTest(params) {
djstest.assertsExpected(2);
- odatajs.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
function success(data, response) {
djstest.fail("Reading service document should produce error with " + params.handlerAccept);
djstest.done();
@@ -505,7 +505,7 @@
djstest.addTest(function validReadMetadataTest(params) {
djstest.assertsExpected(1);
var endPoint = params.serviceName + "$metadata";
- odatajs.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
function (data, response) {
window.ODataReadOracle.readMetadata(endPoint,
function (expectedData) {
@@ -525,7 +525,7 @@
djstest.addTest(function invlaidReadMetadataTest(params) {
djstest.assertsExpected(2);
var endPoint = params.serviceName + "$metadata";
- odatajs.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
function success(data, response) {
djstest.fail("Reading metadata should produce error with " + params.handlerAccept);
djstest.done();
@@ -558,7 +558,7 @@
window.odatajs.oData.net.defaultHttpClient = modifyTypeHttpClient;
- odatajs.read({ requestUri: csdlFile, headers: { Accept: "text/xml"} },
+ odatajs.oData.read({ requestUri: csdlFile, headers: { Accept: "text/xml"} },
function (data) {
window.ODataReadOracle.readMetadata(csdlFile,
function (expectedData) {
@@ -574,7 +574,7 @@
djstest.addTest(function verifyNonDefaultReadMethodCalled() {
var endPoint = feed + "(0)";
djstest.assertsExpected(2);
- odatajs.read(
+ odatajs.oData.read(
{ requestUri: endPoint },
function success(data, response) {
djstest.assert(true, "Test executed");
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-request-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-request-functional-tests.js b/datajs/tests/odata-request-functional-tests.js
index d7ea160..82e4258 100644
--- a/datajs/tests/odata-request-functional-tests.js
+++ b/datajs/tests/odata-request-functional-tests.js
@@ -47,7 +47,7 @@
var verifyPost = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
djstest.log(httpOperation);
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code: " + httpOperation);
djstest.log("Uri:" + request.requestUri);
@@ -61,7 +61,7 @@
var verifyPut = function(request, done) {
var httpOperation = request.method + " " + request.requestUri;
djstest.log(httpOperation);
- odatajs.request(request, function(data, response) {
+ odatajs.oData.request(request, function(data, response) {
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
djstest.log("Uri:" + request.requestUri);
@@ -77,7 +77,7 @@
var httpOperation = request.method + " " + request.requestUri;
djstest.log(httpOperation);
ODataReadOracle.readEntry(request.requestUri, function (originalData) {
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code");
djstest.log("Uri:" + request.requestUri);
@@ -374,7 +374,7 @@
djstest.addTest(function deleteEntityTest(headers) {
var endpoint = categoriesFeed + "(0)";
djstest.assertsExpected(2);
- odatajs.request({
+ odatajs.oData.request({
requestUri: endpoint,
method: "DELETE",
headers: headers
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-roundtrip-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-roundtrip-functional-tests.js b/datajs/tests/odata-roundtrip-functional-tests.js
index 4c56a61..6e3c356 100644
--- a/datajs/tests/odata-roundtrip-functional-tests.js
+++ b/datajs/tests/odata-roundtrip-functional-tests.js
@@ -39,7 +39,7 @@
var verifyPost = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code: " + httpOperation);
ODataReadOracle.readJson(data.__metadata.uri, function (expectedData) {
djstest.assertAreEqualDeep(response.data, expectedData, "Verify new entry against response: " + httpOperation);
@@ -50,7 +50,7 @@
var verifyPut = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
ODataReadOracle.readJson(request.requestUri, function (actualData) {
djstest.assertAreEqualDeep(actualData, request.data, "Verify updated entry: " + httpOperation);
@@ -62,7 +62,7 @@
var verifyMerge = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
ODataReadOracle.readJson(request.requestUri, function (originalData) {
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code");
ODataReadOracle.readJson(request.requestUri, function (actualData) {
// Merge the original data with the updated data to get the expected data
@@ -158,7 +158,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(42)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(42)", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.CategoryID = 27;
var newRequest = {
requestUri: categoriesFeed,
@@ -181,7 +181,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(0)/Foods(42)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)/Foods(42)", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.FoodID = 94;
var newRequest = {
requestUri: categoriesFeed + "(0)/Foods",
@@ -204,7 +204,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(0)/Foods(0)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)/Foods(0)", headers: { Accept: mimeType} }, function (actualData, response) {
var newRequest = {
requestUri: categoriesFeed + "(0)/Foods(0)",
method: "PUT",
@@ -232,7 +232,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
var newRequest = {
requestUri: categoriesFeed,
method: "POST",
@@ -264,7 +264,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.FoodID = 76;
var newRequest = {
requestUri: foodsFeed,
@@ -295,7 +295,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(1)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(1)", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.CategoryID = 2;
var newRequest = {
requestUri: categoriesFeed + "(2)",
@@ -310,7 +310,7 @@
}, "Put, read put data, put read data (mimeType = " + mimeType + ")", headers);
djstest.addTest(function addEntityTest(headers) {
- odatajs.read({ requestUri: foodsFeed + "(0)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: foodsFeed + "(0)", headers: { Accept: mimeType} },
function (actualData, response) {
actualData.CategoryID = 216;
var request = {
@@ -321,7 +321,7 @@
};
verifyRequest(request,
function () {
- odatajs.read({ requestUri: foodsFeed + "(216)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: foodsFeed + "(216)", headers: { Accept: mimeType} },
function (data, response) {
ODataReadOracle.readJson(foodsFeed + "(216)",
function (expectedData) {
@@ -334,7 +334,7 @@
}, "Read data with dates, post read data with dates to new ID, read new ID data with dates" + mimeType + ")", headers);
djstest.addTest(function addEntityTest(headers) {
- odatajs.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
function (actualData, response) {
actualData.CategoryID = 81;
var request = {
@@ -345,7 +345,7 @@
};
verifyRequest(request,
function () {
- odatajs.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
function (data, response) {
ODataReadOracle.readJson(categoriesFeed + "(81)",
function (expectedData) {
@@ -363,7 +363,7 @@
djstest.addTest(function addEntityTest(headers) {
- odatajs.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
function (actualData, response) {
actualData.CategoryID = 81;
var request = {
@@ -374,7 +374,7 @@
};
verifyRequest(request,
function () {
- odatajs.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
function (data, response) {
ODataReadOracle.readJson(categoriesFeed + "(81)",
function (expectedData) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-tests.js b/datajs/tests/odata-tests.js
index 77b0ed5..0e6e951 100644
--- a/datajs/tests/odata-tests.js
+++ b/datajs/tests/odata-tests.js
@@ -73,7 +73,7 @@
});
djstest.addTest(function simpleLocalReadTest() {
- odatajs.read(localFeed, function (data, request) {
+ odatajs.oData.read(localFeed, function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
djstest.done();
@@ -81,7 +81,7 @@
});
djstest.addTest(function simpleLocalReadWithRequestTest() {
- odatajs.read({ requestUri: localFeed, headers: { Accept: "application/json"} }, function (data, response) {
+ odatajs.oData.read({ requestUri: localFeed, headers: { Accept: "application/json"} }, function (data, response) {
djstest.assert(data !== null, "data !== null");
djstest.assert(response !== null, "response !== null");
djstest.assertAreEqual(data, response.data, "data === response.data");
@@ -99,7 +99,7 @@
OData.defaultHttpClient.enableJsonpCallback = true;
var iframesBefore = countIFrames();
- odatajs.read(northwindService + "Regions", function (data, request) {
+ odatajs.oData.read(northwindService + "Regions", function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
@@ -116,7 +116,7 @@
djstest.addTest(function simpleReadWithParamsTest() {
OData.defaultHttpClient.enableJsonpCallback = true;
- odatajs.read(northwindFeed + "?$top=3", function (data, request) {
+ odatajs.oData.read(northwindFeed + "?$top=3", function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
restoreJsonpCallback();
@@ -126,7 +126,7 @@
djstest.addTest(function simpleReadWithNoParamsTest() {
OData.defaultHttpClient.enableJsonpCallback = true;
- odatajs.read(northwindFeed + "?", function (data, request) {
+ odatajs.oData.read(northwindFeed + "?", function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
restoreJsonpCallback();
@@ -138,7 +138,7 @@
// Verifies that JSONP will timeout, and that the
// enableJsonpCallback flag can be set on the request itself.
var iframesBefore = countIFrames();
- odatajs.request({
+ odatajs.oData.request({
requestUri: northwindFeed + "?$fail=true",
timeoutMS: 100,
enableJsonpCallback: true
@@ -195,7 +195,7 @@
try {
var i, len;
for (i = 0, len = testUris.length; i < len; i++) {
- odatajs.request({ requestUri: testUris[i] });
+ odatajs.oData.request({ requestUri: testUris[i] });
}
}
finally {
@@ -234,7 +234,7 @@
MockHttpClient.addResponse("requestUpdateTest", { status: 200, body: "test response" });
MockHttpClient.addResponse("requestUpdateTest", { status: 500, body: "error response" });
- odatajs.request({ requestUri: "requestUpdateTest", method: "POST" }, testSuccess, testError, testHandler, MockHttpClient);
+ odatajs.oData.request({ requestUri: "requestUpdateTest", method: "POST" }, testSuccess, testError, testHandler, MockHttpClient);
djstest.done();
});
[2/2] git commit: [OLINGO-407] JS- V4's window.OData is not defined
yet: part 3 - remove window.odatajs.read() & .request(),
just use window.odatajs.oData.read() & .request()
Posted by ch...@apache.org.
[OLINGO-407] JS- V4's window.OData is not defined yet: part 3 - remove window.odatajs.read() & .request(), just use window.odatajs.oData.read() & .request()
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/commit/06770e2b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/06770e2b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/06770e2b
Branch: refs/heads/master
Commit: 06770e2b179c74c163b1c14e8d08922f9b5db80c
Parents: 689c94c
Author: challenh <ch...@microsoft.com>
Authored: Thu Aug 21 16:55:25 2014 +0800
Committer: challenh <ch...@microsoft.com>
Committed: Thu Aug 21 16:55:25 2014 +0800
----------------------------------------------------------------------
JSLib/tests/odata-atom-tests.js | 20 +++----
JSLib/tests/odata-batch-functional-tests.js | 6 +-
JSLib/tests/odata-batch-tests.js | 18 +++---
JSLib/tests/odata-handler-tests.js | 16 ++---
JSLib/tests/odata-json-light-tests.js | 2 +-
JSLib/tests/odata-json-tests.js | 4 +-
JSLib/tests/odata-links-functional-tests.js | 10 ++--
...odata-metadata-awareness-functional-tests.js | 16 ++---
JSLib/tests/odata-metadata-tests.js | 2 +-
JSLib/tests/odata-net-tests.js | 2 +-
JSLib/tests/odata-perf-tests.js | 24 ++++----
.../odata-read-crossdomain-functional-tests.js | 4 +-
JSLib/tests/odata-read-functional-tests.js | 62 ++++++++++----------
JSLib/tests/odata-request-functional-tests.js | 8 +--
JSLib/tests/odata-roundtrip-functional-tests.js | 30 +++++-----
JSLib/tests/odata-tests.js | 16 ++---
datajs/demo/scripts/datajs_demo.js | 2 +-
datajs/src/index.js | 5 +-
datajs/tests/odata-batch-functional-tests.js | 6 +-
datajs/tests/odata-batch-tests.js | 18 +++---
datajs/tests/odata-handler-tests.js | 18 +++---
datajs/tests/odata-json-light-tests.js | 2 +-
datajs/tests/odata-json-parse-tests.js | 2 +-
datajs/tests/odata-json-tests.js | 4 +-
datajs/tests/odata-links-functional-tests.js | 14 ++---
...odata-metadata-awareness-functional-tests.js | 16 ++---
datajs/tests/odata-metadata-tests.js | 2 +-
datajs/tests/odata-net-tests.js | 2 +-
datajs/tests/odata-perf-tests.js | 24 ++++----
.../odata-read-crossdomain-functional-tests.js | 4 +-
datajs/tests/odata-read-functional-tests.js | 62 ++++++++++----------
datajs/tests/odata-request-functional-tests.js | 8 +--
.../tests/odata-roundtrip-functional-tests.js | 30 +++++-----
datajs/tests/odata-tests.js | 16 ++---
34 files changed, 236 insertions(+), 239 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-atom-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-atom-tests.js b/JSLib/tests/odata-atom-tests.js
index 12abc51..da3f38e 100644
--- a/JSLib/tests/odata-atom-tests.js
+++ b/JSLib/tests/odata-atom-tests.js
@@ -523,7 +523,7 @@
djstest.addFullTest(true, function parseNullInlineTest() {
// Shorter version of:
- // odatajs.read("/tests/endpoints/FoodStoreDataService.svc/Foods?$expand=Category&$filter=Category eq null", function(data, response) {
+ // odatajs.oData.read("/tests/endpoints/FoodStoreDataService.svc/Foods?$expand=Category&$filter=Category eq null", function(data, response) {
var body = '' +
'<feed xml:base="http://localhost:46541/tests/endpoints/FoodStoreDataServiceV4.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://docs.oasis-open.org/odata/ns/data" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:context="http://localhost:46541/tests/endpoints/FoodStoreDataServiceV4.svc/$metadata#Foods">' +
@@ -589,7 +589,7 @@
// Without metadata, this will fail because the server version won't be set to 2.0.
var metadata = parseMetadataHelper(foodServiceV4MetadataText);
- odatajs.read(foodSetUrl + "?$top=1", function (data) {
+ odatajs.oData.read(foodSetUrl + "?$top=1", function (data) {
var item = data.results[0];
djstest.assert(item.Packaging, "item.Packaging is not null");
item.Packaging = null;
@@ -597,9 +597,9 @@
// The server will reject links for PUT operations.
delete item.Category;
- odatajs.request({ method: "PUT", requestUri: item.__metadata.uri, data: item, headers: { "Content-Type": "application/atom+xml"} }, function (data) {
+ odatajs.oData.request({ method: "PUT", requestUri: item.__metadata.uri, data: item, headers: { "Content-Type": "application/atom+xml"} }, function (data) {
// Re-read the item.
- odatajs.read(item.__metadata.uri, function (data) {
+ odatajs.oData.read(item.__metadata.uri, function (data) {
djstest.assert(data, "data was read successfully again");
djstest.assert(!data.Packaging, "!data.Packaging");
resetFoodData();
@@ -614,16 +614,16 @@
resetFoodData();
var foodSetUrl = "./endpoints/FoodStoreDataServiceV4.svc/Foods";
var metadata = parseMetadataHelper(foodServiceV4MetadataText);
- odatajs.read(foodSetUrl + "?$top=1", function (data) {
+ odatajs.oData.read(foodSetUrl + "?$top=1", function (data) {
var item = data.results[0];
// Turn this into something different.
delete item.__metadata.uri;
item.FoodID = 1001;
- odatajs.request({ method: "POST", requestUri: foodSetUrl, data: item, headers: { "Content-Type": "application/atom+xml"} }, function (data) {
+ odatajs.oData.request({ method: "POST", requestUri: foodSetUrl, data: item, headers: { "Content-Type": "application/atom+xml"} }, function (data) {
// Re-read the item.
- odatajs.read(data.__metadata.uri + "?$expand=Category", function (data) {
+ odatajs.oData.read(data.__metadata.uri + "?$expand=Category", function (data) {
djstest.assert(data, "data was read successfully again");
djstest.assert(data.Category, "data.Category");
djstest.assert(data.Category.Name, "data.Category.Name");
@@ -639,7 +639,7 @@
resetFoodData();
var foodSetUrl = "./endpoints/FoodStoreDataServiceV4.svc/Foods";
var metadata = parseMetadataHelper(foodServiceV4MetadataText);
- odatajs.read(foodSetUrl + "?$top=1", function (data) {
+ odatajs.oData.read(foodSetUrl + "?$top=1", function (data) {
var item = data.results[0];
// Turn this into something different.
@@ -647,9 +647,9 @@
item.FoodID = 1001;
item.Category = null;
- odatajs.request({ method: "POST", requestUri: foodSetUrl, data: item, headers: { "Content-Type": "application/atom+xml"} }, function (data) {
+ odatajs.oData.request({ method: "POST", requestUri: foodSetUrl, data: item, headers: { "Content-Type": "application/atom+xml"} }, function (data) {
// Re-read the item.
- odatajs.read(data.__metadata.uri + "?$expand=Category", function (data) {
+ odatajs.oData.read(data.__metadata.uri + "?$expand=Category", function (data) {
djstest.assert(data, "data was read successfully again");
djstest.assert(!data.Category, "data.Category");
resetFoodData();
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-batch-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-batch-functional-tests.js b/JSLib/tests/odata-batch-functional-tests.js
index 3449ccd..8fa648e 100644
--- a/JSLib/tests/odata-batch-functional-tests.js
+++ b/JSLib/tests/odata-batch-functional-tests.js
@@ -27,7 +27,7 @@
};
var verifyBatchRequest = function(serviceRoot, batchRequests, elementTypes, done) {
- odatajs.request({ requestUri: serviceRoot + "/$batch", method: "POST", data: { __batchRequests: batchRequests } },
+ odatajs.oData.request({ requestUri: serviceRoot + "/$batch", method: "POST", data: { __batchRequests: batchRequests } },
function(data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.accepted, "Verify response code");
djstest.assertAreEqual(data.__batchResponses.length, batchRequests.length, "Verify batch response count");
@@ -230,7 +230,7 @@
var batchRequests = [{ requestUri: "Categories", method: "POST", data: { CategoryID: 42, Name: "New Category"}}];
djstest.assertsExpected(1);
- odatajs.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.oData.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
function (data, response) {
djstest.assert(response.body.indexOf("An error occurred while processing this request.") > -1, "Verify response error message");
djstest.done();
@@ -256,7 +256,7 @@
}
];
- odatajs.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.oData.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
function (data, response) {
var batchResponses = data.__batchResponses;
var error = batchResponses[3].__changeResponses[0];
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-batch-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-batch-tests.js b/JSLib/tests/odata-batch-tests.js
index c829f9a..4cb274d 100644
--- a/JSLib/tests/odata-batch-tests.js
+++ b/JSLib/tests/odata-batch-tests.js
@@ -79,7 +79,7 @@
djstest.done();
});
- odatajs.request(request, null, null, OData.batchHandler, MockHttpClient);
+ odatajs.oData.request(request, null, null, OData.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeComplexBatchTest() {
@@ -159,7 +159,7 @@
djstest.done();
});
- odatajs.request(request, null, null, OData.batchHandler, MockHttpClient);
+ odatajs.oData.request(request, null, null, OData.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeChangeSetTest() {
@@ -211,7 +211,7 @@
djstest.done();
});
- odatajs.request(request, null, null, OData.batchHandler, MockHttpClient);
+ odatajs.oData.request(request, null, null, OData.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeNestedChangeSetsTest() {
@@ -222,7 +222,7 @@
};
djstest.expectException(function () {
- odatajs.request(request, null, null, OData.batchHandler);
+ odatajs.oData.request(request, null, null, OData.batchHandler);
});
djstest.done();
@@ -246,7 +246,7 @@
};
djstest.expectException(function () {
- odatajs.request(request, null, null, OData.batchHandler);
+ odatajs.oData.request(request, null, null, OData.batchHandler);
});
djstest.done();
@@ -288,7 +288,7 @@ Location: http://localhost:46541/tests/endpoints/FoodStoreDataServiceV4.svc/Cate
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
djstest.assert(data.__batchResponses, "data.__batchResponses is defined");
djstest.assertAreEqual(data.__batchResponses[0].headers["Location"], "http://localhost:46541/tests/endpoints/FoodStoreDataServiceV4.svc/Categories(42)", "part 1 of the response was read");
djstest.assertAreEqual(data.__batchResponses[1].headers["Location"], "http://localhost:46541/tests/endpoints/FoodStoreDataServiceV4.svc/Categories(43)", "part 2 of the response was read");
@@ -374,7 +374,7 @@ OData-Version: 4.0;\r\n\
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
var batchResponses = data.__batchResponses;
djstest.assert(batchResponses, "data contains the batch responses");
@@ -431,7 +431,7 @@ Content-Type: application/json\r\n\
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
var batchResponses = data.__batchResponses;
djstest.assert(batchResponses, "data.__batchResponses is defined");
djstest.assertAreEqual(batchResponses.length, 2, "batch contains two responses");
@@ -479,7 +479,7 @@ Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE7
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
var batchResponses = data.__batchResponses;
djstest.assert(batchResponses, "data.__batchResponses is defined");
djstest.assertAreEqual(batchResponses.length, 2, "batch contains two responses");
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-handler-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-handler-tests.js b/JSLib/tests/odata-handler-tests.js
index 7facbdc..8e763fa 100644
--- a/JSLib/tests/odata-handler-tests.js
+++ b/JSLib/tests/odata-handler-tests.js
@@ -24,7 +24,7 @@
testItem = handledData;
testItem.Name = "Updated name";
- odatajs.request({
+ odatajs.oData.request({
method: "PUT",
data: testItem,
requestUri: uri,
@@ -33,7 +33,7 @@
var itemUpdatedCallback = function (data, response) {
djstest.assertAreEqual(response.statusCode, 204, "Expecting no content on update");
- odatajs.request({
+ odatajs.oData.request({
method: "DELETE",
requestUri: uri
}, itemDeletedCallback);
@@ -44,7 +44,7 @@
};
$.post(serviceUri + "ResetData", function () {
- odatajs.request({
+ odatajs.oData.request({
requestUri: baseUri,
method: "POST",
data: { CategoryID: 1001, Name: "Name #1001" }
@@ -54,7 +54,7 @@
djstest.addTest(function errorHandlerTest() {
djstest.assertsExpected(1);
- odatajs.read("./endpoints/FoodStoreDataServiceV4.svc/Categories?$reserved-misused=true",
+ odatajs.oData.read("./endpoints/FoodStoreDataServiceV4.svc/Categories?$reserved-misused=true",
function (data) {
djstest.fail("expected an error callback");
djstest.done();
@@ -72,7 +72,7 @@
body: " text ",
headers: { "Content-Type": "text/plain" }
});
- odatajs.read("textHandlerParseTest", function (data) {
+ odatajs.oData.read("textHandlerParseTest", function (data) {
djstest.assertAreEqual(data, " text ", "data matches");
djstest.done();
}, function (err) {
@@ -88,7 +88,7 @@
body: "",
headers: { "Content-Type": "text/plain" }
});
- odatajs.read("textHandlerParseTest", function (data) {
+ odatajs.oData.read("textHandlerParseTest", function (data) {
djstest.assertAreEqual(data, "", "data matches");
djstest.done();
}, function (err) {
@@ -102,7 +102,7 @@
MockHttpClient.clear().addRequestVerifier("uri", function (request) {
djstest.assertAreEqual(request.body, "text", "text in request");
}).addResponse("uri", { statusCode: 200, body: "", headers: { "Content-Type": "text/plain"} });
- odatajs.request({ requestUri: "uri", method: "POST", data: "text", headers: { "Content-Type": "text/plain"} }, function (data) {
+ odatajs.oData.request({ requestUri: "uri", method: "POST", data: "text", headers: { "Content-Type": "text/plain"} }, function (data) {
djstest.done();
}, function (err) {
djstest.fail("expected success");
@@ -115,7 +115,7 @@
MockHttpClient.clear().addRequestVerifier("uri", function (request) {
djstest.assertAreEqual(request.body, "", "text in request");
}).addResponse("uri", { statusCode: 200, body: "", headers: { "Content-Type": "text/plain"} });
- odatajs.request({ requestUri: "uri", method: "POST", data: "", headers: { "Content-Type": "text/plain"} }, function (data) {
+ odatajs.oData.request({ requestUri: "uri", method: "POST", data: "", headers: { "Content-Type": "text/plain"} }, function (data) {
djstest.done();
}, function (err) {
djstest.fail("expected success");
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-json-light-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-json-light-tests.js b/JSLib/tests/odata-json-light-tests.js
index e3c351b..5e55d93 100644
--- a/JSLib/tests/odata-json-light-tests.js
+++ b/JSLib/tests/odata-json-light-tests.js
@@ -282,7 +282,7 @@
djstest.done();
});
- odatajs.request({
+ odatajs.oData.request({
requestUri: requestUri || "http://someUri",
headers: { "Content-Type": "application/json" },
method: "PUT",
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-json-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-json-tests.js b/JSLib/tests/odata-json-tests.js
index aa5b3db..f86e86f 100644
--- a/JSLib/tests/odata-json-tests.js
+++ b/JSLib/tests/odata-json-tests.js
@@ -837,7 +837,7 @@
}
});
- odatajs.read("/foo", function (data, response) {
+ odatajs.oData.read("/foo", function (data, response) {
// djstest.assertAreEqual(data.results.length, 2, "data.results.length has two entries");
djstest.assertAreEqual(response.headers.unknown, "u", "u unmodified");
djstest.assertAreEqual(response.headers["Content-Encoding"], "compress, gzip", "Content-Encoding available");
@@ -880,7 +880,7 @@
"odata-maxversion": "4.0", "prefer": "prefer"
}
};
- odatajs.request(request, function (data) {
+ odatajs.oData.request(request, function (data) {
}, undefined, undefined, MockHttpClient);
});
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-links-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-links-functional-tests.js b/JSLib/tests/odata-links-functional-tests.js
index 5e8c0bb..00ce591 100644
--- a/JSLib/tests/odata-links-functional-tests.js
+++ b/JSLib/tests/odata-links-functional-tests.js
@@ -152,7 +152,7 @@
djstest.addTest(function readValidLinksFeedTests(params) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: params.linksFeed, headers: headers },
+ odatajs.oData.read({ requestUri: params.linksFeed, headers: headers },
function (data, response) {
window.ODataReadOracle.readLinksFeed(params.linksFeed,
function (expectedData) {
@@ -167,7 +167,7 @@
djstest.addTest(function readValidLinksEntryTest(params) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: params.linksEntry, headers: headers },
+ odatajs.oData.read({ requestUri: params.linksEntry, headers: headers },
function (data, response) {
window.ODataReadOracle.readLinksEntry(params.linksEntry,
function (expectedData) {
@@ -190,7 +190,7 @@
};
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
var httpOperation = request.method + " " + request.requestUri;
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
ODataReadOracle.readLinksEntry(request.requestUri, function (actualData) {
@@ -214,12 +214,12 @@
data: newFoodLinks
};
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
var httpOperation = request.method + " " + request.requestUri;
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
- odatajs.read(request.requestUri, function (data, response) {
+ odatajs.oData.read(request.requestUri, function (data, response) {
ODataReadOracle.readLinksFeed(request.requestUri, function (actualData) {
djstest.assertAreEqualDeep(actualData, response.data, "Verify updated links entry against the request: " + httpOperation);
djstest.done();
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-metadata-awareness-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-metadata-awareness-functional-tests.js b/JSLib/tests/odata-metadata-awareness-functional-tests.js
index b5fc8bc..b40e703 100644
--- a/JSLib/tests/odata-metadata-awareness-functional-tests.js
+++ b/JSLib/tests/odata-metadata-awareness-functional-tests.js
@@ -90,7 +90,7 @@
var getMetadata = function (callback) {
/// <summary>Common function for tests to get and cache metadata, to reduce network calls made by tests</summary>
if (!serviceMetadata) {
- odatajs.read(metadataUri, function (metadata) {
+ odatajs.oData.read(metadataUri, function (metadata) {
serviceMetadata = metadata;
callback(metadata);
}, unexpectedErrorHandler, OData.metadataHandler);
@@ -116,7 +116,7 @@
djstest.assertsExpected(2);
getMetadata(function (metadata) {
OData.defaultMetadata.push(metadata);
- odatajs.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
ODataReadOracle.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
@@ -145,7 +145,7 @@
djstest.assertsExpected(2);
getMetadata(function (metadata) {
OData.defaultMetadata.push(metadata);
- odatajs.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
ODataReadOracle.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
@@ -159,7 +159,7 @@
var postEntry = $.extend(true, {}, params.testEntry.data, { ID: 100 });
djstest.assertsExpected(2);
getMetadata(function (metadata) {
- odatajs.request({ requestUri: params.feedUri, method: "POST", headers: djstest.clone(mimeHeaders), data: postEntry }, function (data, response) {
+ odatajs.oData.request({ requestUri: params.feedUri, method: "POST", headers: djstest.clone(mimeHeaders), data: postEntry }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code");
ODataReadOracle.readJson(feedUri + "(" + postEntry.ID + ")", function (actualData) {
djstest.assertWithoutMetadata(actualData, postEntry, "Verify new entry data against server");
@@ -174,7 +174,7 @@
djstest.assertsExpected(2);
getMetadata(function (metadata) {
OData.defaultMetadata.push(metadata);
- odatajs.request({ requestUri: entryUri, method: "PUT", headers: djstest.clone(mimeHeaders), data: params.testEntry.data }, function (data, response) {
+ 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");
ODataReadOracle.readJson(entryUri, function (actualData) {
djstest.assertWithoutMetadata(actualData, $.extend({ ID: 0 }, params.testEntry.data), "Verify updated entry data against server");
@@ -192,7 +192,7 @@
var entryUri = service + "/HierarchicalEntries(" + index + ")";
djstest.assertsExpected(2);
getMetadata(function (metadata) {
- odatajs.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
ODataReadOracle.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
@@ -210,8 +210,8 @@
djstest.assertsExpected(1);
OData.jsonHandler.recognizeDates = params.recognizeDates;
- odatajs.read(foodStoreDataService + "/$metadata", function (metadata) {
- odatajs.read({ requestUri: specialDaysEndpoint, headers: { Accept: params.accept} }, function (data, response) {
+ odatajs.oData.read(foodStoreDataService + "/$metadata", function (metadata) {
+ odatajs.oData.read({ requestUri: specialDaysEndpoint, headers: { Accept: params.accept} }, function (data, response) {
// Because our oracle isn't metadata aware, it is not 100% correct, so we will pass in recognizeDates = true
// in all cases and manually fix up the property that was incorrectly converted
window.ODataReadOracle.readFeed(specialDaysEndpoint, function (expectedData) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-metadata-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-metadata-tests.js b/JSLib/tests/odata-metadata-tests.js
index 8fcde4d..2af066f 100644
--- a/JSLib/tests/odata-metadata-tests.js
+++ b/JSLib/tests/odata-metadata-tests.js
@@ -20,7 +20,7 @@
for (i = 0, len = cases.length; i < len; i++) {
var response = cases[i].i;
var testClient = { request: function (r, success, error) { success(response); } };
- window.odatajs.read("foo", function (data) {
+ window.odatajs.oData.read("foo", function (data) {
djstest.assertAreEqualDeep(data, cases[i].e, "handler result matches target");
}, function (err) {
djstest.fail(err.message);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-net-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-net-tests.js b/JSLib/tests/odata-net-tests.js
index b950ba0..3e48934 100644
--- a/JSLib/tests/odata-net-tests.js
+++ b/JSLib/tests/odata-net-tests.js
@@ -270,7 +270,7 @@
// DATAJS INTERNAL END
djstest.addTest(function userPasswordTest() {
- odatajs.request({
+ odatajs.oData.request({
requestUri: "./endpoints/FoodStoreDataServiceV4.svc/UserNameAndPassword",
user: "the-user",
password: "the-password"
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-perf-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-perf-tests.js b/JSLib/tests/odata-perf-tests.js
index 1fc2208..9c484e7 100644
--- a/JSLib/tests/odata-perf-tests.js
+++ b/JSLib/tests/odata-perf-tests.js
@@ -51,7 +51,7 @@
djstest.addTest(function readPerfTest(params) {
var measureRead = function (metadata) {
var startTime = new Date();
- odatajs.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function () {
+ odatajs.oData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function () {
var duration = new Date() - startTime - timedHttpClient.duration;
djstest.pass("Duration: " + duration + " ms (Network: " + timedHttpClient.duration + " ms)");
djstest.done();
@@ -61,7 +61,7 @@
OData.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
} else {
measureRead();
}
@@ -73,7 +73,7 @@
var measureRead = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
for (var i = 0; i < total; i++) {
- odatajs.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
+ odatajs.oData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
count++;
if (count >= total) {
Instrument.getBrowserMemorySize(function (memoryAfter) {
@@ -89,7 +89,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
} else {
measureRead();
}
@@ -101,7 +101,7 @@
var measureRead = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
var makeRequest = function () {
- odatajs.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
+ odatajs.oData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
count++;
if (count < total) {
setTimeout(makeRequest, 0);
@@ -121,7 +121,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
} else {
measureRead();
}
@@ -144,7 +144,7 @@
djstest.addTest(function postPerfTest(params) {
var measurePost = function (metadata) {
var startTime = new Date();
- odatajs.request(params.request, function () {
+ odatajs.oData.request(params.request, function () {
var duration = new Date() - startTime - timedHttpClient.duration;
djstest.pass("Duration: " + duration + " ms (Network: " + timedHttpClient.duration + " ms)");
djstest.done();
@@ -155,7 +155,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
} else {
measurePost();
}
@@ -167,7 +167,7 @@
var measurePost = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
for (var i = 0; i < total; i++) {
- odatajs.request(params.request, function (_, response) {
+ odatajs.oData.request(params.request, function (_, response) {
count++;
if (count >= total) {
Instrument.getBrowserMemorySize(function (memoryAfter) {
@@ -185,7 +185,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
} else {
measurePost();
}
@@ -197,7 +197,7 @@
var measurePost = function (metadata) {
Instrument.getBrowserMemorySize(function (memoryBefore) {
var makeRequest = function () {
- odatajs.request(params.request, function (_, response) {
+ odatajs.oData.request(params.request, function (_, response) {
count++;
if (count < total) {
setTimeout(makeRequest, 0);
@@ -219,7 +219,7 @@
djstest.assertsExpected(1);
if (params.metadata) {
- odatajs.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.oData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
} else {
measurePost();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-read-crossdomain-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-read-crossdomain-functional-tests.js b/JSLib/tests/odata-read-crossdomain-functional-tests.js
index e475fd1..cb3eddd 100644
--- a/JSLib/tests/odata-read-crossdomain-functional-tests.js
+++ b/JSLib/tests/odata-read-crossdomain-functional-tests.js
@@ -62,7 +62,7 @@
}
djstest.log("Reading data over the wire.");
- odatajs.read(request, function (data, response) {
+ odatajs.oData.read(request, function (data, response) {
djstest.log("Verifying data over the wire from Oracle.");
window.ODataReadOracle.readFeed(azureOdataFeed, function (expectedData) {
data = fixConstructors(data);
@@ -77,7 +77,7 @@
var endPoint = azureOdataFeed + "(1)";
djstest.assertsExpected(1);
djstest.log("Reading data over the wire.");
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
djstest.log("Verifying data over the wire from Oracle.");
window.ODataReadOracle.readEntry(endPoint, function (expectedData) {
data = fixConstructors(data);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-read-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-read-functional-tests.js b/JSLib/tests/odata-read-functional-tests.js
index 4c8825f..8a58b15 100644
--- a/JSLib/tests/odata-read-functional-tests.js
+++ b/JSLib/tests/odata-read-functional-tests.js
@@ -65,7 +65,7 @@
djstest.addTest(function readFullFeedTest(handlerAccept) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: feed, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: feed, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(feed,
function (expectedData) {
@@ -81,7 +81,7 @@
djstest.addTest(function readMaxAndNullValueEntryTest(handlerAccept) {
var endPoint = feed + "(0)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -97,7 +97,7 @@
djstest.addTest(function readMinAndZeroValueEntryTest(handlerAccept) {
var endPoint = feed + "(1)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: "./endpoints/FoodStoreDataServiceV4.svc/Foods(1)", headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: "./endpoints/FoodStoreDataServiceV4.svc/Foods(1)", headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -112,7 +112,7 @@
djstest.addTest(function readNullNestedComplexTypeEntryTest(handlerAccept) {
var endPoint = feed + "(2)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -128,7 +128,7 @@
djstest.addTest(function readNullComplexTypeEntryTest(handlerAccept) {
var endPoint = feed + "(3)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -144,7 +144,7 @@
djstest.addTest(function readNullPropertiesDerivedEntryTest(handlerAccept) {
djstest.assertsExpected(1);
var endPoint = feed + "(4)";
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -161,7 +161,7 @@
djstest.assertsExpected(1);
var endPoint = feed + "(5)";
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endPoint,
function (expectedData) {
@@ -177,7 +177,7 @@
djstest.addTest(function readEntryWithInlineFeedTest(handlerAccept) {
var endpoint = categoriesFeed + "(0)?$expand=Foods";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -194,7 +194,7 @@
djstest.addTest(function readFeedWithEmptyInlineFeedTest(handlerAccept) {
var endpoint = categoriesFeed + "?$filter=Name eq 'Empty Category'&$expand=Foods";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -211,7 +211,7 @@
djstest.addTest(function readEntryWithInlineEntryTest(handlerAccept) {
var endpoint = feed + "(0)?$expand=Category";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -228,7 +228,7 @@
djstest.addTest(function readFeedWithNullInlineEntryTest(handlerAccept) {
var endpoint = feed + "?$expand=Category&$filter=Category eq null";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -244,7 +244,7 @@
djstest.addTest(function readFeedWithInlineCountTest(handlerAccept) {
var endpoint = feed + "?$count=true";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -261,7 +261,7 @@
djstest.addTest(function selectSinglePropertyOnEntryTest(handlerAccept) {
var endpoint = feed + "(0)?$select=Name";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -276,7 +276,7 @@
djstest.addTest(function selectComplexTypeOnFeedTest(handlerAccept) {
var endpoint = feed + "?$select=Packaging";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -291,7 +291,7 @@
djstest.addTest(function selectMultiplePropertiesOnEntryTest(handlerAccept) {
var endpoint = feed + "(3)?$select=Packaging,ExpirationDate,IsAvailable";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -306,7 +306,7 @@
djstest.addTest(function readPagedCategoriesCollectionTest(handlerAccept) {
var endpoint = categoriesFeed;
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -320,7 +320,7 @@
djstest.addTest(function readPagedCollectionWithInlineCountTest(handlerAccept) {
var endpoint = categoriesFeed + "?$count=true";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readFeed(endpoint,
function (expectedData) {
@@ -335,7 +335,7 @@
djstest.addTest(function readEntryWithNamedStreams(handlerAccept) {
var endpoint = feed + "(1)?$expand=Category";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -349,7 +349,7 @@
djstest.addTest(function readEntryWithCollectionProperties(handlerAccept) {
var endpoint = feed + "(0)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
window.ODataReadOracle.readEntry(endpoint,
function (expectedData) {
@@ -363,7 +363,7 @@
djstest.addTest(function invalidEntryReadTest(handlerAccept) {
var endPoint = feed + "(16)";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
djstest.assert(false, "We should not get here because data is not valid.");
djstest.done()
@@ -378,7 +378,7 @@
djstest.addTest(function invalidFeedReadTest(handlerAccept) {
var endPoint = feed + "Invalid";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
djstest.assert(false, "We should not get here because data is not valid.");
djstest.done();
@@ -393,7 +393,7 @@
djstest.addTest(function standardErrorReadTest(handlerAccept) {
var endPoint = feed + "?$foo=bar";
djstest.assertsExpected(2);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
djstest.assert(false, "We should not get here because data is not valid.");
djstest.done()
@@ -408,7 +408,7 @@
djstest.addTest(function inStreamErrorReadTest(handlerAccept) {
var endPoint = "./endpoints/ErrorDataService.svc/Entities";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
djstest.assert(false, "Unexpected call to success handler with response: " + djstest.toString(response));
djstest.done()
}, function (err) {
@@ -423,7 +423,7 @@
djstest.addTest(function readFullFeedBasicAuthTest(handlerAccept) {
var endpoint = "./endpoints/BasicAuthDataService.svc/Customers";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
window.ODataReadOracle.readFeed({ url: endpoint, user: user, password: password }, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -434,7 +434,7 @@
djstest.addTest(function readEntryBasicAuthTest(handlerAccept) {
var endpoint = "./endpoints/BasicAuthDataService.svc/Customers(1)";
djstest.assertsExpected(1);
- odatajs.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
+ odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
window.ODataReadOracle.readEntry({ url: endpoint, user: user, password: password }, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -454,7 +454,7 @@
djstest.addTest(function validReadServiceDocumentTest(params) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
function (data, response) {
window.ODataReadOracle.readServiceDocument(serviceName,
function (expectedData) {
@@ -473,7 +473,7 @@
djstest.addTest(function invalidReadServiceDocumentTest(params) {
djstest.assertsExpected(2);
- odatajs.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
function success(data, response) {
djstest.fail("Reading service document should produce error with " + params.handlerAccept);
djstest.done();
@@ -494,7 +494,7 @@
djstest.addTest(function validReadMetadataTest(params) {
djstest.assertsExpected(1);
var endPoint = params.serviceName + "$metadata";
- odatajs.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
function (data, response) {
window.ODataReadOracle.readMetadata(endPoint,
function (expectedData) {
@@ -514,7 +514,7 @@
djstest.addTest(function invlaidReadMetadataTest(params) {
djstest.assertsExpected(2);
var endPoint = params.serviceName + "$metadata";
- odatajs.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
+ odatajs.oData.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
function success(data, response) {
djstest.fail("Reading metadata should produce error with " + params.handlerAccept);
djstest.done();
@@ -547,7 +547,7 @@
OData.defaultHttpClient = modifyTypeHttpClient;
- odatajs.read({ requestUri: csdlFile, headers: { Accept: "text/xml"} },
+ odatajs.oData.read({ requestUri: csdlFile, headers: { Accept: "text/xml"} },
function (data) {
window.ODataReadOracle.readMetadata(csdlFile,
function (expectedData) {
@@ -563,7 +563,7 @@
djstest.addTest(function verifyNonDefaultReadMethodCalled() {
var endPoint = feed + "(0)";
djstest.assertsExpected(2);
- odatajs.read(
+ odatajs.oData.read(
{ requestUri: endPoint },
function success(data, response) {
djstest.assert(true, "Test executed");
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-request-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-request-functional-tests.js b/JSLib/tests/odata-request-functional-tests.js
index 0516d02..b6644af 100644
--- a/JSLib/tests/odata-request-functional-tests.js
+++ b/JSLib/tests/odata-request-functional-tests.js
@@ -32,7 +32,7 @@
var verifyPost = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
djstest.log(httpOperation);
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code: " + httpOperation);
djstest.log("Uri:" + request.requestUri);
@@ -46,7 +46,7 @@
var verifyPut = function(request, done) {
var httpOperation = request.method + " " + request.requestUri;
djstest.log(httpOperation);
- odatajs.request(request, function(data, response) {
+ odatajs.oData.request(request, function(data, response) {
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
djstest.log("Uri:" + request.requestUri);
@@ -62,7 +62,7 @@
var httpOperation = request.method + " " + request.requestUri;
djstest.log(httpOperation);
ODataReadOracle.readEntry(request.requestUri, function (originalData) {
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code");
djstest.log("Uri:" + request.requestUri);
@@ -361,7 +361,7 @@
djstest.addTest(function deleteEntityTest(headers) {
var endpoint = categoriesFeed + "(0)";
djstest.assertsExpected(2);
- odatajs.request({
+ odatajs.oData.request({
requestUri: endpoint,
method: "DELETE",
headers: headers
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-roundtrip-functional-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-roundtrip-functional-tests.js b/JSLib/tests/odata-roundtrip-functional-tests.js
index 65757b5..ba0c23d 100644
--- a/JSLib/tests/odata-roundtrip-functional-tests.js
+++ b/JSLib/tests/odata-roundtrip-functional-tests.js
@@ -24,7 +24,7 @@
var verifyPost = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code: " + httpOperation);
ODataReadOracle.readJson(data.__metadata.uri, function (expectedData) {
djstest.assertAreEqualDeep(response.data, expectedData, "Verify new entry against response: " + httpOperation);
@@ -35,7 +35,7 @@
var verifyPut = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
ODataReadOracle.readJson(request.requestUri, function (actualData) {
djstest.assertAreEqualDeep(actualData, request.data, "Verify updated entry: " + httpOperation);
@@ -47,7 +47,7 @@
var verifyMerge = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
ODataReadOracle.readJson(request.requestUri, function (originalData) {
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code");
ODataReadOracle.readJson(request.requestUri, function (actualData) {
// Merge the original data with the updated data to get the expected data
@@ -143,7 +143,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(42)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(42)", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.CategoryID = 27;
var newRequest = {
requestUri: categoriesFeed,
@@ -166,7 +166,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(0)/Foods(42)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)/Foods(42)", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.FoodID = 94;
var newRequest = {
requestUri: categoriesFeed + "(0)/Foods",
@@ -189,7 +189,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(0)/Foods(0)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)/Foods(0)", headers: { Accept: mimeType} }, function (actualData, response) {
var newRequest = {
requestUri: categoriesFeed + "(0)/Foods(0)",
method: "PUT",
@@ -217,7 +217,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
var newRequest = {
requestUri: categoriesFeed,
method: "POST",
@@ -249,7 +249,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: foodsFeed + "(" + newFood.FoodID + ")", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.FoodID = 76;
var newRequest = {
requestUri: foodsFeed,
@@ -280,7 +280,7 @@
};
verifyRequest(request, function () {
- odatajs.read({ requestUri: categoriesFeed + "(1)", headers: { Accept: mimeType} }, function (actualData, response) {
+ odatajs.oData.read({ requestUri: categoriesFeed + "(1)", headers: { Accept: mimeType} }, function (actualData, response) {
actualData.CategoryID = 2;
var newRequest = {
requestUri: categoriesFeed + "(2)",
@@ -295,7 +295,7 @@
}, "Put, read put data, put read data (mimeType = " + mimeType + ")", headers);
djstest.addTest(function addEntityTest(headers) {
- odatajs.read({ requestUri: foodsFeed + "(0)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: foodsFeed + "(0)", headers: { Accept: mimeType} },
function (actualData, response) {
actualData.CategoryID = 216;
var request = {
@@ -306,7 +306,7 @@
};
verifyRequest(request,
function () {
- odatajs.read({ requestUri: foodsFeed + "(216)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: foodsFeed + "(216)", headers: { Accept: mimeType} },
function (data, response) {
ODataReadOracle.readJson(foodsFeed + "(216)",
function (expectedData) {
@@ -319,7 +319,7 @@
}, "Read data with dates, post read data with dates to new ID, read new ID data with dates" + mimeType + ")", headers);
djstest.addTest(function addEntityTest(headers) {
- odatajs.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
function (actualData, response) {
actualData.CategoryID = 81;
var request = {
@@ -330,7 +330,7 @@
};
verifyRequest(request,
function () {
- odatajs.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
function (data, response) {
ODataReadOracle.readJson(categoriesFeed + "(81)",
function (expectedData) {
@@ -348,7 +348,7 @@
djstest.addTest(function addEntityTest(headers) {
- odatajs.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(0)", headers: { Accept: mimeType} },
function (actualData, response) {
actualData.CategoryID = 81;
var request = {
@@ -359,7 +359,7 @@
};
verifyRequest(request,
function () {
- odatajs.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
+ odatajs.oData.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
function (data, response) {
ODataReadOracle.readJson(categoriesFeed + "(81)",
function (expectedData) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/JSLib/tests/odata-tests.js
----------------------------------------------------------------------
diff --git a/JSLib/tests/odata-tests.js b/JSLib/tests/odata-tests.js
index 7469ae0..565e139 100644
--- a/JSLib/tests/odata-tests.js
+++ b/JSLib/tests/odata-tests.js
@@ -57,7 +57,7 @@
});
djstest.addTest(function simpleLocalReadTest() {
- odatajs.read(localFeed, function (data, request) {
+ odatajs.oData.read(localFeed, function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
djstest.done();
@@ -65,7 +65,7 @@
});
djstest.addTest(function simpleLocalReadWithRequestTest() {
- odatajs.read({ requestUri: localFeed, headers: { Accept: "application/json"} }, function (data, response) {
+ odatajs.oData.read({ requestUri: localFeed, headers: { Accept: "application/json"} }, function (data, response) {
djstest.assert(data !== null, "data !== null");
djstest.assert(response !== null, "response !== null");
djstest.assertAreEqual(data, response.data, "data === response.data");
@@ -83,7 +83,7 @@
OData.defaultHttpClient.enableJsonpCallback = true;
var iframesBefore = countIFrames();
- odatajs.read(northwindService + "Regions", function (data, request) {
+ odatajs.oData.read(northwindService + "Regions", function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
@@ -100,7 +100,7 @@
djstest.addTest(function simpleReadWithParamsTest() {
OData.defaultHttpClient.enableJsonpCallback = true;
- odatajs.read(northwindFeed + "?$top=3", function (data, request) {
+ odatajs.oData.read(northwindFeed + "?$top=3", function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
restoreJsonpCallback();
@@ -110,7 +110,7 @@
djstest.addTest(function simpleReadWithNoParamsTest() {
OData.defaultHttpClient.enableJsonpCallback = true;
- odatajs.read(northwindFeed + "?", function (data, request) {
+ odatajs.oData.read(northwindFeed + "?", function (data, request) {
djstest.assert(data !== null, "data !== null");
djstest.assert(request !== null, "request !== null");
restoreJsonpCallback();
@@ -122,7 +122,7 @@
// Verifies that JSONP will timeout, and that the
// enableJsonpCallback flag can be set on the request itself.
var iframesBefore = countIFrames();
- odatajs.request({
+ odatajs.oData.request({
requestUri: northwindFeed + "?$fail=true",
timeoutMS: 100,
enableJsonpCallback: true
@@ -179,7 +179,7 @@
try {
var i, len;
for (i = 0, len = testUris.length; i < len; i++) {
- odatajs.request({ requestUri: testUris[i] });
+ odatajs.oData.request({ requestUri: testUris[i] });
}
}
finally {
@@ -218,7 +218,7 @@
MockHttpClient.addResponse("requestUpdateTest", { status: 200, body: "test response" });
MockHttpClient.addResponse("requestUpdateTest", { status: 500, body: "error response" });
- odatajs.request({ requestUri: "requestUpdateTest", method: "POST" }, testSuccess, testError, testHandler, MockHttpClient);
+ odatajs.oData.request({ requestUri: "requestUpdateTest", method: "POST" }, testSuccess, testError, testHandler, MockHttpClient);
djstest.done();
});
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/demo/scripts/datajs_demo.js
----------------------------------------------------------------------
diff --git a/datajs/demo/scripts/datajs_demo.js b/datajs/demo/scripts/datajs_demo.js
index 63cd9a7..24ac24d 100644
--- a/datajs/demo/scripts/datajs_demo.js
+++ b/datajs/demo/scripts/datajs_demo.js
@@ -93,7 +93,7 @@ var readWithJsonP = function() {
enableJsonpCallback: true,
};
- odatajs.read(oRequest, function (data) {
+ odatajs.oData.read(oRequest, function (data) {
document.getElementById("simpleReadWithJSONP").innerHTML = JSON.stringify(data, undefined, 2);
},
function (oError) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/src/index.js
----------------------------------------------------------------------
diff --git a/datajs/src/index.js b/datajs/src/index.js
index 4d0848e..e2fd697 100644
--- a/datajs/src/index.js
+++ b/datajs/src/index.js
@@ -22,14 +22,11 @@ if ( window.odatajs===undefined) {
}
window.odatajs = require('./lib/datajs.js');
-window.odatajs.oData = require('./lib/odata.js');
+window.odatajs.oData = require('./lib/odata.js');
window.odatajs.store = require('./lib/store.js');
window.odatajs.cache = require('./lib/cache.js');
-window.odatajs.read = window.odatajs.oData.read;
-window.odatajs.request = window.odatajs.oData.request;
-
/*
function extend(target) {
var sources = [].slice.call(arguments, 1);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-batch-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-batch-functional-tests.js b/datajs/tests/odata-batch-functional-tests.js
index 98c4775..328bb66 100644
--- a/datajs/tests/odata-batch-functional-tests.js
+++ b/datajs/tests/odata-batch-functional-tests.js
@@ -41,7 +41,7 @@
};
var verifyBatchRequest = function (serviceRoot, batchRequests, elementTypes, done) {
- odatajs.request({ requestUri: serviceRoot + "/$batch", method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.oData.request({ requestUri: serviceRoot + "/$batch", method: "POST", data: { __batchRequests: batchRequests} },
function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.accepted, "Verify response code");
djstest.assertAreEqual(data.__batchResponses.length, batchRequests.length, "Verify batch response count");
@@ -263,7 +263,7 @@
}
];
- odatajs.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.oData.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
function (data, response) {
var batchResponses = data.__batchResponses;
var error = batchResponses[3].__changeResponses[0];
@@ -281,7 +281,7 @@
var batchRequests = [{ requestUri: "Categories", method: "POST", data: { CategoryID: 42, Name: "New Category"}}];
djstest.assertsExpected(1);
- odatajs.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.oData.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
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();
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-batch-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-batch-tests.js b/datajs/tests/odata-batch-tests.js
index 9f5b8c9..71a1547 100644
--- a/datajs/tests/odata-batch-tests.js
+++ b/datajs/tests/odata-batch-tests.js
@@ -91,7 +91,7 @@
djstest.done();
});
- odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
+ odatajs.oData.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeComplexBatchTest() {
@@ -169,7 +169,7 @@
djstest.done();
});
- odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
+ odatajs.oData.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeChangeSetTest() {
@@ -219,7 +219,7 @@
djstest.done();
});
- odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
+ odatajs.oData.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeNestedChangeSetsTest() {
@@ -230,7 +230,7 @@
};
djstest.expectException(function () {
- odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler);
+ odatajs.oData.request(request, null, null, window.odatajs.oData.batch.batchHandler);
});
djstest.done();
@@ -254,7 +254,7 @@
};
djstest.expectException(function () {
- odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler);
+ odatajs.oData.request(request, null, null, window.odatajs.oData.batch.batchHandler);
});
djstest.done();
@@ -296,7 +296,7 @@ Location: http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/Categ
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
djstest.assert(data.__batchResponses, "data.__batchResponses is defined");
djstest.assertAreEqual(data.__batchResponses[0].headers["Location"], "http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/Categories(42)", "part 1 of the response was read");
djstest.assertAreEqual(data.__batchResponses[1].headers["Location"], "http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/Categories(43)", "part 2 of the response was read");
@@ -382,7 +382,7 @@ OData-Version: 4.0;\r\n\
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
var batchResponses = data.__batchResponses;
djstest.assert(batchResponses, "data contains the batch responses");
@@ -439,7 +439,7 @@ Content-Type: application/json\r\n\
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
var batchResponses = data.__batchResponses;
djstest.assert(batchResponses, "data.__batchResponses is defined");
djstest.assertAreEqual(batchResponses.length, 2, "batch contains two responses");
@@ -487,7 +487,7 @@ Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE7
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- odatajs.read("http://testuri.org", function (data, response) {
+ odatajs.oData.read("http://testuri.org", function (data, response) {
var batchResponses = data.__batchResponses;
djstest.assert(batchResponses, "data.__batchResponses is defined");
djstest.assertAreEqual(batchResponses.length, 2, "batch contains two responses");
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-handler-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-handler-tests.js b/datajs/tests/odata-handler-tests.js
index 949ff98..aa824c7 100644
--- a/datajs/tests/odata-handler-tests.js
+++ b/datajs/tests/odata-handler-tests.js
@@ -51,7 +51,7 @@
testItem = handledData;
testItem.Name = "Updated name";
- odatajs.request({
+ odatajs.oData.request({
method: "PUT",
data: testItem,
requestUri: uri,
@@ -60,7 +60,7 @@
var itemUpdatedCallback = function (data, response) {
djstest.assertAreEqual(response.statusCode, 204, "Expecting no content on update");
- odatajs.request({
+ odatajs.oData.request({
method: "DELETE",
requestUri: uri
}, itemDeletedCallback);
@@ -71,7 +71,7 @@
};
$.post(serviceUri + "ResetData", function () {
- odatajs.request({
+ odatajs.oData.request({
requestUri: baseUri,
method: "POST",
data: { CategoryID: 1001, Name: "Name #1001" }
@@ -81,7 +81,7 @@
djstest.addTest(function errorHandlerTest() {
djstest.assertsExpected(1);
- odatajs.read("./endpoints/FoodStoreDataServiceV4.svc/Categories?$reserved-misused=true",
+ odatajs.oData.read("./endpoints/FoodStoreDataServiceV4.svc/Categories?$reserved-misused=true",
function (data) {
djstest.fail("expected an error callback");
djstest.done();
@@ -99,7 +99,7 @@
body: " text ",
headers: { "Content-Type": "text/plain" }
});
- odatajs.read("textHandlerParseTest", function (data) {
+ odatajs.oData.read("textHandlerParseTest", function (data) {
djstest.assertAreEqual(data, " text ", "data matches");
djstest.done();
}, function (err) {
@@ -115,7 +115,7 @@
body: "",
headers: { "Content-Type": "text/plain" }
});
- odatajs.read("textHandlerParseTest", function (data) {
+ odatajs.oData.read("textHandlerParseTest", function (data) {
djstest.assertAreEqual(data, "", "data matches");
djstest.done();
}, function (err) {
@@ -129,7 +129,7 @@
MockHttpClient.clear().addRequestVerifier("uri", function (request) {
djstest.assertAreEqual(request.body, "text", "text in request");
}).addResponse("uri", { statusCode: 200, body: "", headers: { "Content-Type": "text/plain"} });
- odatajs.request({ requestUri: "uri", method: "POST", data: "text", headers: { "Content-Type": "text/plain"} }, function (data) {
+ odatajs.oData.request({ requestUri: "uri", method: "POST", data: "text", headers: { "Content-Type": "text/plain"} }, function (data) {
djstest.done();
}, function (err) {
djstest.fail("expected success");
@@ -142,7 +142,7 @@
MockHttpClient.clear().addRequestVerifier("uri", function (request) {
djstest.assertAreEqual(request.body, "", "text in request");
}).addResponse("uri", { statusCode: 200, body: "", headers: { "Content-Type": "text/plain"} });
- odatajs.request({ requestUri: "uri", method: "POST", data: "", headers: { "Content-Type": "text/plain"} }, function (data) {
+ odatajs.oData.request({ requestUri: "uri", method: "POST", data: "", headers: { "Content-Type": "text/plain"} }, function (data) {
djstest.done();
}, function (err) {
djstest.fail("expected success");
@@ -344,7 +344,7 @@
});
djstest.addTest(function readServiceDocumentTest(headers) {
- odatajs.request({
+ odatajs.oData.request({
requestUri: endpoint,
method: "GET",
headers: headers
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-json-light-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-json-light-tests.js b/datajs/tests/odata-json-light-tests.js
index 320a58e..fd2c8d4 100644
--- a/datajs/tests/odata-json-light-tests.js
+++ b/datajs/tests/odata-json-light-tests.js
@@ -295,7 +295,7 @@
djstest.done();
});
- odatajs.request({
+ odatajs.oData.request({
requestUri: requestUri || "http://someUri",
headers: { "Content-Type": "application/json" },
method: "PUT",
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-json-parse-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-json-parse-tests.js b/datajs/tests/odata-json-parse-tests.js
index 0ac9cc7..00f0ba2 100644
--- a/datajs/tests/odata-json-parse-tests.js
+++ b/datajs/tests/odata-json-parse-tests.js
@@ -37,7 +37,7 @@
requestUri: "http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/$metadata", //"http://localhost:6630/PrimitiveKeys.svc/$metadata",
data: null,
};
- odatajs.read(metadataRequest, metaDatasuccess, errorFunc,OData.metadataHandler);
+ odatajs.oData.read(metadataRequest, metaDatasuccess, errorFunc,OData.metadataHandler);
}
djstest.addTest(function test1() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-json-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-json-tests.js b/datajs/tests/odata-json-tests.js
index 7894598..93a468e 100644
--- a/datajs/tests/odata-json-tests.js
+++ b/datajs/tests/odata-json-tests.js
@@ -787,7 +787,7 @@
}
});
- odatajs.read("/foo", function (data, response) {
+ odatajs.oData.read("/foo", function (data, response) {
// djstest.assertAreEqual(data.results.length, 2, "data.results.length has two entries");
djstest.assertAreEqual(response.headers.unknown, "u", "u unmodified");
djstest.assertAreEqual(response.headers["Content-Encoding"], "compress, gzip", "Content-Encoding available");
@@ -832,7 +832,7 @@
"odata-maxversion": "4.0", "prefer": "prefer"
}
};
- odatajs.request(request, function (data) { }, undefined, undefined, MockHttpClient);
+ odatajs.oData.request(request, function (data) { }, undefined, undefined, MockHttpClient);
});
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/06770e2b/datajs/tests/odata-links-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-links-functional-tests.js b/datajs/tests/odata-links-functional-tests.js
index c509f00..eb64ec0 100644
--- a/datajs/tests/odata-links-functional-tests.js
+++ b/datajs/tests/odata-links-functional-tests.js
@@ -169,7 +169,7 @@
djstest.addTest(function readValidLinksFeedTests(params) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: params.linksFeed, headers: headers },
+ odatajs.oData.read({ requestUri: params.linksFeed, headers: headers },
function (data, response) {
window.ODataReadOracle.readLinksFeed(params.linksFeed,
function (expectedData) {
@@ -184,7 +184,7 @@
djstest.addTest(function readValidLinksEntryTest(params) {
djstest.assertsExpected(1);
- odatajs.read({ requestUri: params.linksEntry, headers: headers },
+ odatajs.oData.read({ requestUri: params.linksEntry, headers: headers },
function (data, response) {
window.ODataReadOracle.readLinksEntry(params.linksEntry,
function (expectedData) {
@@ -207,7 +207,7 @@
};
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
var httpOperation = request.method + " " + request.requestUri;
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
ODataReadOracle.readLinksEntry(request.requestUri, function (actualData) {
@@ -241,11 +241,11 @@
data: null
};
- odatajs.request(deletionRequest, function (data, response) {
+ odatajs.oData.request(deletionRequest, function (data, response) {
var httpOperation = deletionRequest.method + " " + deletionRequest.requestUri;
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
- odatajs.read(request.requestUri, function (data, response) {
+ odatajs.oData.read(request.requestUri, function (data, response) {
var httpOperation = "Read " + request.requestUri;
djstest.assertAreEqual(0, response.data.value.length, "Verify links against the request: " + httpOperation);
djstest.done();
@@ -254,12 +254,12 @@
};
// add
- odatajs.request(request, function (data, response) {
+ odatajs.oData.request(request, function (data, response) {
var httpOperation = request.method + " " + request.requestUri;
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
- odatajs.read(request.requestUri, function (data, response) {
+ odatajs.oData.read(request.requestUri, function (data, response) {
ODataReadOracle.readLinksFeed(request.requestUri, function (actualData) {
djstest.assertAreEqualDeep(actualData, response.data, "Verify updated links entry against the request: " + httpOperation);
deleteAndVerify();