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 09:58:44 UTC
[2/3] [OLINGO-407] JS- V4's window.OData is not defined yet: part 2 -
define window.odatajs.read() & .request()
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 2bac8d1..98c4775 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) {
- OData.request({ requestUri: serviceRoot + "/$batch", method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.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 @@
}
];
- OData.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.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);
- OData.request({ requestUri: batchUri, method: "POST", data: { __batchRequests: batchRequests} },
+ odatajs.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/689c94cb/datajs/tests/odata-batch-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-batch-tests.js b/datajs/tests/odata-batch-tests.js
index 4dc1393..9f5b8c9 100644
--- a/datajs/tests/odata-batch-tests.js
+++ b/datajs/tests/odata-batch-tests.js
@@ -30,7 +30,7 @@
version: "4.0"
};
- var jsonPayload = OData.json.jsonSerializer(OData.json.jsonHandler, testPayload, { "OData-Version": "4.0" });
+ var jsonPayload = window.odatajs.oData.json.jsonSerializer(window.odatajs.oData.json.jsonHandler, testPayload, { "OData-Version": "4.0" });
djstest.addTest(function writeRequestTest() {
var request = {
@@ -46,7 +46,7 @@
"\r\n" +
"test request";
- var actual = OData.batch.writeRequest(request);
+ var actual = window.odatajs.oData.batch.writeRequest(request);
djstest.assertAreEqual(actual, expected, "WriteRequest serializes a request properly");
djstest.done();
});
@@ -82,7 +82,7 @@
"\r\n--<batchBoundary>--\r\n";
MockHttpClient.clear().addRequestVerifier(request.requestUri, function (request) {
- var cType = OData.handler.contentType(request.headers["Content-Type"]);
+ var cType = window.odatajs.oData.handler.contentType(request.headers["Content-Type"]);
var boundary = cType.properties["boundary"];
var expected = template.replace(/<batchBoundary>/g, boundary);
@@ -91,7 +91,7 @@
djstest.done();
});
- OData.request(request, null, null, OData.batch.batchHandler, MockHttpClient);
+ odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeComplexBatchTest() {
@@ -157,8 +157,8 @@
var start = request.body.indexOf("multipart/mixed");
var end = request.body.indexOf("\r\n", start);
- var csetBoundary = OData.handler.contentType(request.body.substring(start, end)).properties["boundary"];
- var batchBoundary = OData.handler.contentType(request.headers["Content-Type"]).properties["boundary"];
+ var csetBoundary = window.odatajs.oData.handler.contentType(request.body.substring(start, end)).properties["boundary"];
+ var batchBoundary = window.odatajs.oData.handler.contentType(request.headers["Content-Type"]).properties["boundary"];
var expected = template.replace(/<batchBoundary>/g, batchBoundary);
expected = expected.replace(/<changesetBoundary>/g, csetBoundary);
@@ -169,7 +169,7 @@
djstest.done();
});
- OData.request(request, null, null, OData.batch.batchHandler, MockHttpClient);
+ odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeChangeSetTest() {
@@ -207,8 +207,8 @@
var start = request.body.indexOf("multipart/mixed");
var end = request.body.indexOf("\r\n", start);
- var csetBoundary = OData.handler.contentType(request.body.substring(start, end)).properties["boundary"];
- var batchBoundary = OData.handler.contentType(request.headers["Content-Type"]).properties["boundary"];
+ var csetBoundary = window.odatajs.oData.handler.contentType(request.body.substring(start, end)).properties["boundary"];
+ var batchBoundary = window.odatajs.oData.handler.contentType(request.headers["Content-Type"]).properties["boundary"];
var expected = template.replace(/<batchBoundary>/g, batchBoundary);
expected = expected.replace(/<changesetBoundary>/g, csetBoundary);
@@ -219,7 +219,7 @@
djstest.done();
});
- OData.request(request, null, null, OData.batch.batchHandler, MockHttpClient);
+ odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function serializeNestedChangeSetsTest() {
@@ -230,7 +230,7 @@
};
djstest.expectException(function () {
- OData.request(request, null, null, OData.batch.batchHandler);
+ odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler);
});
djstest.done();
@@ -254,7 +254,7 @@
};
djstest.expectException(function () {
- OData.request(request, null, null, OData.batch.batchHandler);
+ odatajs.request(request, null, null, window.odatajs.oData.batch.batchHandler);
});
djstest.done();
@@ -296,14 +296,14 @@ Location: http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/Categ
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- OData.read("http://testuri.org", function (data, response) {
+ odatajs.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");
djstest.assertAreEqual(data.__batchResponses[0].data["CategoryID"], 42, "part 1 data of the response was read");
djstest.assertAreEqual(data.__batchResponses[1].data["CategoryID"], 43, "part 2 data of the response was read");
djstest.done();
- }, null, OData.batch.batchHandler, MockHttpClient);
+ }, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function readBatchWithChangesetTest() {
@@ -382,7 +382,7 @@ OData-Version: 4.0;\r\n\
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- OData.read("http://testuri.org", function (data, response) {
+ odatajs.read("http://testuri.org", function (data, response) {
var batchResponses = data.__batchResponses;
djstest.assert(batchResponses, "data contains the batch responses");
@@ -405,7 +405,7 @@ OData-Version: 4.0;\r\n\
djstest.assertAreEqual(changesetResponses3[0].data["CategoryID"], 43, "part 1 data of the changeset response of the response 3 was read");
djstest.assertAreEqual(changesetResponses3[1].data, undefined, "No data defined for no content only response in part 2 of the changeset response of the response 3");
djstest.done();
- }, null, OData.batch.batchHandler, MockHttpClient);
+ }, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
djstest.addTest(function readBatchWithErrorPartTest() {
@@ -439,14 +439,14 @@ Content-Type: application/json\r\n\
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- OData.read("http://testuri.org", function (data, response) {
+ odatajs.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");
djstest.assertAreEqual(batchResponses[0].headers["Location"], "http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/Categories(1)", "part 1 of the response was read");
djstest.assert(batchResponses[1].response, "part 2 of the response was read");
djstest.done();
- }, null, OData.batch.batchHandler, MockHttpClient);
+ }, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
});
@@ -487,7 +487,7 @@ Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE7
};
MockHttpClient.clear().addResponse("http://testuri.org", response);
- OData.read("http://testuri.org", function (data, response) {
+ odatajs.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");
@@ -496,7 +496,7 @@ Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE7
var error = batchResponses[1].__changeResponses[0];
djstest.assert(error.response.body.indexOf("GET operation cannot be specified in a change set") > -1, "Response contains expected message");
djstest.done();
- }, null, OData.batch.batchHandler, MockHttpClient);
+ }, null, window.odatajs.oData.batch.batchHandler, MockHttpClient);
djstest.done();
});
@@ -542,14 +542,14 @@ Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE7
'--batchresponse_fb681875-73dc-4e62-9898-a0af89021341--\r\n'
};
- var oldPartHandler = OData.batch.batchHandler.partHandler;
+ var oldPartHandler = window.odatajs.oData.batch.batchHandler.partHandler;
- OData.batch.batchHandler.partHandler = testHandler;
+ window.odatajs.oData.batch.batchHandler.partHandler = testHandler;
- OData.batch.batchHandler.write(request, { recognizeDates: true });
- OData.batch.batchHandler.read(response, { recognizeDates: true });
+ window.odatajs.oData.batch.batchHandler.write(request, { recognizeDates: true });
+ window.odatajs.oData.batch.batchHandler.read(response, { recognizeDates: true });
- OData.batch.batchHandler.partHandler = oldPartHandler;
+ window.odatajs.oData.batch.batchHandler.partHandler = oldPartHandler;
djstest.done();
});
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/datajs/tests/odata-cache-filter-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-filter-functional-tests.js b/datajs/tests/odata-cache-filter-functional-tests.js
index 1d19771..0fd08f3 100644
--- a/datajs/tests/odata-cache-filter-functional-tests.js
+++ b/datajs/tests/odata-cache-filter-functional-tests.js
@@ -292,11 +292,11 @@
module("Functional", {
setup: function () {
this.observableHttpClient = new ObservableHttpClient();
- OData.net.defaultHttpClient = this.observableHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = this.observableHttpClient;
},
teardown: function () {
- OData.net.defaultHttpClient = this.observableHttpClient.provider;
+ window.odatajs.oData.net.defaultHttpClient = this.observableHttpClient.provider;
}
});
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/datajs/tests/odata-cache-fperf-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-fperf-tests.js b/datajs/tests/odata-cache-fperf-tests.js
index caf75ad..cfb698c 100644
--- a/datajs/tests/odata-cache-fperf-tests.js
+++ b/datajs/tests/odata-cache-fperf-tests.js
@@ -21,7 +21,7 @@
var slowHttpClient = {
latency: 750,
- provider: OData.net.defaultHttpClient,
+ provider: window.odatajs.oData.net.defaultHttpClient,
request: function (request, success, error) {
setTimeout(function () {
slowHttpClient.provider.request(request, success, error);
@@ -35,10 +35,10 @@
module("Functional", {
setup: function () {
- OData.net.defaultHttpClient = slowHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = slowHttpClient;
},
teardown: function () {
- OData.net.defaultHttpClient = slowHttpClient.provider;
+ window.odatajs.oData.net.defaultHttpClient = slowHttpClient.provider;
}
});
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/datajs/tests/odata-cache-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-functional-tests.js b/datajs/tests/odata-cache-functional-tests.js
index fc8d230..ac63460 100644
--- a/datajs/tests/odata-cache-functional-tests.js
+++ b/datajs/tests/odata-cache-functional-tests.js
@@ -341,7 +341,7 @@
};
this.observableHttpClient = new ObservableHttpClient();
- OData.net.defaultHttpClient = this.observableHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = this.observableHttpClient;
this.caches = [];
var that = this;
@@ -351,7 +351,7 @@
},
teardown: function () {
- OData.net.defaultHttpClient = this.observableHttpClient.provider;
+ window.odatajs.oData.net.defaultHttpClient = this.observableHttpClient.provider;
var clearActions = [];
var that = this;
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/datajs/tests/odata-handler-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-handler-tests.js b/datajs/tests/odata-handler-tests.js
index e56a3a8..949ff98 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";
- OData.request({
+ odatajs.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");
- OData.request({
+ odatajs.request({
method: "DELETE",
requestUri: uri
}, itemDeletedCallback);
@@ -71,7 +71,7 @@
};
$.post(serviceUri + "ResetData", function () {
- OData.request({
+ odatajs.request({
requestUri: baseUri,
method: "POST",
data: { CategoryID: 1001, Name: "Name #1001" }
@@ -81,7 +81,7 @@
djstest.addTest(function errorHandlerTest() {
djstest.assertsExpected(1);
- OData.read("./endpoints/FoodStoreDataServiceV4.svc/Categories?$reserved-misused=true",
+ odatajs.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" }
});
- OData.read("textHandlerParseTest", function (data) {
+ odatajs.read("textHandlerParseTest", function (data) {
djstest.assertAreEqual(data, " text ", "data matches");
djstest.done();
}, function (err) {
@@ -115,7 +115,7 @@
body: "",
headers: { "Content-Type": "text/plain" }
});
- OData.read("textHandlerParseTest", function (data) {
+ odatajs.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"} });
- OData.request({ requestUri: "uri", method: "POST", data: "text", headers: { "Content-Type": "text/plain"} }, function (data) {
+ odatajs.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"} });
- OData.request({ requestUri: "uri", method: "POST", data: "", headers: { "Content-Type": "text/plain"} }, function (data) {
+ odatajs.request({ requestUri: "uri", method: "POST", data: "", headers: { "Content-Type": "text/plain"} }, function (data) {
djstest.done();
}, function (err) {
djstest.fail("expected success");
@@ -156,27 +156,27 @@
{
response: { headers: { "Content-Type": "application/json", "OData-Version": "4.0" }, body: "response 0" },
shouldHit: true,
- context: { contentType: OData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
+ context: { contentType: window.odatajs.oData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
},
{
response: { headers: { "Content-Type": "application/json" }, body: "response 1" },
shouldHit: true,
- context: { contentType: OData.handler.contentType("application/json"), dataServiceVersion: "" }
+ context: { contentType: window.odatajs.oData.handler.contentType("application/json"), dataServiceVersion: "" }
},
{
response: { headers: { "Content-Type": "otherMediaType" }, body: "response 2" },
shouldHit: false,
- context: { contentType: OData.handler.contentType("otherMediaType"), dataServiceVersion: "" }
+ context: { contentType: window.odatajs.oData.handler.contentType("otherMediaType"), dataServiceVersion: "" }
},
{
response: { headers: { "Content-Type": "application/json", "OData-Version": "4.0" }, body: "response 3" },
shouldHit: true,
- context: { contentType: OData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
+ context: { contentType: window.odatajs.oData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
},
{
response: { body: "response 4" },
shouldHit: false,
- context: { contentType: OData.handler.contentType("application/json"), dataServiceVersion: "" }
+ context: { contentType: window.odatajs.oData.handler.contentType("application/json"), dataServiceVersion: "" }
},
{
response: null,
@@ -200,7 +200,7 @@
return body;
};
- var testHandler = OData.handler.handler(testRead, null, "application/json", "4.0");
+ var testHandler = window.odatajs.oData.handler.handler(testRead, null, "application/json", "4.0");
var len, expectedAssertCount = 0;
for (i = 0, len = tests.length; i < len; i++) {
@@ -223,17 +223,17 @@
{
request: { headers: { "Content-Type": "application/json", "OData-Version": "4.0" }, data: "request 0" },
shouldHit: true,
- context: { contentType: OData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
+ context: { contentType: window.odatajs.oData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
},
{
request: { headers: { "Content-Type": "application/json" }, data: "request 1" },
shouldHit: true,
- context: { contentType: OData.handler.contentType("application/json"), dataServiceVersion: undefined }
+ context: { contentType: window.odatajs.oData.handler.contentType("application/json"), dataServiceVersion: undefined }
},
{
request: { headers: { "Content-Type": "otherMediaType" }, data: "request 2" },
shouldHit: false,
- context: { contentType: OData.handler.contentType("otherMediaType"), dataServiceVersion: undefined }
+ context: { contentType: window.odatajs.oData.handler.contentType("otherMediaType"), dataServiceVersion: undefined }
},
{
request: { headers: {}, data: "request 3" },
@@ -243,7 +243,7 @@
{
request: { headers: { "Content-Type": "application/json", "OData-Version": "4.0" }, data: "request 4" },
shouldHit: true,
- context: { contentType: OData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
+ context: { contentType: window.odatajs.oData.handler.contentType("application/json"), dataServiceVersion: "4.0" }
},
{
request: null,
@@ -266,7 +266,7 @@
return data;
};
- var testHandler = OData.handler.handler(null, testWrite, "application/json", "4.0");
+ var testHandler = window.odatajs.oData.handler.handler(null, testWrite, "application/json", "4.0");
var i, len, expectedAssertCount = 0;
for (i = 0, len = tests.length; i < len; i++) {
@@ -285,11 +285,11 @@
djstest.addTest(function handlerWriteUpdatesRequestContentTypeTest() {
var testWrite = function (handler, data, context) {
- context.contentType = OData.handler.contentType("my new content type");
+ context.contentType = window.odatajs.oData.handler.contentType("my new content type");
return data;
};
- var testHandler = OData.handler.handler(null, testWrite, "application/json", "4.0");
+ var testHandler = window.odatajs.oData.handler.handler(null, testWrite, "application/json", "4.0");
var tests = [
{ request: { headers: { "Content-Type": "application/json" }, data: "request 0" }, expected: "application/json" },
@@ -316,13 +316,13 @@
var i, len, cTypeString;
for (i = 0, len = tests.length; i < len; i++) {
- var actual = OData.handler.contentType(tests[i].contentType);
+ var actual = window.odatajs.oData.handler.contentType(tests[i].contentType);
djstest.assertAreEqual(actual.mediaType, tests[i].expected.mediaType, "Content type media type is parsed correctly");
djstest.assertAreEqualDeep(actual.properties, tests[i].expected.properties, "Content type properties are parsed correctly");
}
- djstest.assert(!OData.handler.contentType(undefined), "contentType returns undefined for undefined input");
- djstest.assert(!OData.handler.contentType(null), "contentType returns undefined for null input");
+ djstest.assert(! window.odatajs.oData.handler.contentType(undefined), "contentType returns undefined for undefined input");
+ djstest.assert(! window.odatajs.oData.handler.contentType(null), "contentType returns undefined for null input");
djstest.done();
});
@@ -336,7 +336,7 @@
var i, len, cTypeString;
for (i = 0, len = tests.length; i < len; i++) {
- cTypeString = OData.handler.contentTypeToString(tests[i].contentType);
+ cTypeString = window.odatajs.oData.handler.contentTypeToString(tests[i].contentType);
djstest.assertAreEqual(cTypeString, tests[i].expected, "contentTypeToString returns the correct contentType string");
}
@@ -344,7 +344,7 @@
});
djstest.addTest(function readServiceDocumentTest(headers) {
- OData.request({
+ odatajs.request({
requestUri: endpoint,
method: "GET",
headers: headers
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 7d94e57..320a58e 100644
--- a/datajs/tests/odata-json-light-tests.js
+++ b/datajs/tests/odata-json-light-tests.js
@@ -295,7 +295,7 @@
djstest.done();
});
- OData.request({
+ odatajs.request({
requestUri: requestUri || "http://someUri",
headers: { "Content-Type": "application/json" },
method: "PUT",
@@ -306,7 +306,7 @@
var verifyReadJsonLightData = function (input, expected, message, model) {
var response = { headers: { "Content-Type": "application/json;odata.metadata=full", DataServiceVersion: "4.0" }, body: JSON.stringify(input) };
- OData.json.jsonHandler.read(response, { metadata: model });
+ window.odatajs.oData.json.jsonHandler.read(response, { metadata: model });
djstest.assertAreEqualDeep(response.data, expected, message);
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 d5021f0..0ac9cc7 100644
--- a/datajs/tests/odata-json-parse-tests.js
+++ b/datajs/tests/odata-json-parse-tests.js
@@ -37,30 +37,30 @@
requestUri: "http://localhost:4002/tests/endpoints/FoodStoreDataServiceV4.svc/$metadata", //"http://localhost:6630/PrimitiveKeys.svc/$metadata",
data: null,
};
- OData.read(metadataRequest, metaDatasuccess, errorFunc,OData.metadataHandler);
+ odatajs.read(metadataRequest, metaDatasuccess, errorFunc,OData.metadataHandler);
}
djstest.addTest(function test1() {
var checkAll = function (metadata, input, expected) {
- var info = OData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
+ var info = window.odatajs.oData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
djstest.assertAreEqual(info,expected, "Test context fragment: "+ input);
};
var checkLastTypeName = function (metadata, input, expectedKind, expectedLastTypeName) {
- var info = OData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
+ var info = window.odatajs.oData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
djstest.assertAreEqual(info.detectedPayloadKind,expectedKind, "Test context fragment: "+ input);
djstest.assertAreEqual(info.typeName,expectedLastTypeName, "Test context fragment: "+ input);
};
var checkProjection = function (metadata, input, expectedKind, expectedLastTypeName, projection) {
- var info = OData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
+ var info = window.odatajs.oData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
djstest.assertAreEqual(info.detectedPayloadKind,expectedKind, "Test context fragment: "+ input);
djstest.assertAreEqual(info.typeName,expectedLastTypeName, "Test context fragment: "+ input);
djstest.assertAreEqual(info.projection,projection, "Test context fragment: "+ input);
};
var checkKind = function (metadata, input, expected) {
- var info = OData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
+ var info = window.odatajs.oData.json.createPayloadInfo({ "@odata.context" : input}, metadata);
djstest.assertAreEqual(info.detectedPayloadKind,expected, "Test context fragment: "+ input);
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/datajs/tests/odata-json-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-json-tests.js b/datajs/tests/odata-json-tests.js
index 72a8a07..7894598 100644
--- a/datajs/tests/odata-json-tests.js
+++ b/datajs/tests/odata-json-tests.js
@@ -193,7 +193,7 @@
var i, len;
for (i = 0, len = tests.length; i < len; i++) {
var data = JSON.stringify(tests[i].expected);
- var actual = OData.json.jsonParser(OData.json.jsonHandler, data, tests[i].context);
+ var actual = window.odatajs.oData.json.jsonParser(window.odatajs.oData.json.jsonHandler, data, tests[i].context);
djstest.assertAreEqualDeep(actual, tests[i].expected, "test " + i + "didn't return the expected data");
}
@@ -766,7 +766,7 @@
var i, len;
for (i = 0, len = tests.length; i < len; i++) {
var data = tests[i].data ? tests[i].data : tests[i].expected;
- var actual = OData.json.jsonSerializer(OData.json.jsonHandler, data, tests[i].context);
+ var actual = window.odatajs.oData.json.jsonSerializer(window.odatajs.oData.json.jsonHandler, data, tests[i].context);
var expected = JSON.stringify(tests[i].expected);
djstest.assertAreEqualDeep(actual, expected, "test " + i + "didn't return the expected data");
}
@@ -787,7 +787,7 @@
}
});
- OData.read("/foo", function (data, response) {
+ odatajs.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"
}
};
- OData.request(request, function (data) { }, undefined, undefined, MockHttpClient);
+ odatajs.request(request, function (data) { }, undefined, undefined, MockHttpClient);
});
@@ -845,7 +845,7 @@
body: JSON.stringify(input)
};
- OData.json.jsonHandler.read(response, { metadata: model });
+ window.odatajs.oData.json.jsonHandler.read(response, { metadata: model });
djstest.assertAreEqualDeep(response.data, expected, message);
};
@@ -859,7 +859,7 @@
body: JSON.stringify(input)
};
- OData.json.jsonHandler.read(response, { metadata: model });
+ window.odatajs.oData.json.jsonHandler.read(response, { metadata: model });
djstest.assertAreEqualDeep(response.data, expected, message);
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 9f52357..c509f00 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);
- OData.read({ requestUri: params.linksFeed, headers: headers },
+ odatajs.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);
- OData.read({ requestUri: params.linksEntry, headers: headers },
+ odatajs.read({ requestUri: params.linksEntry, headers: headers },
function (data, response) {
window.ODataReadOracle.readLinksEntry(params.linksEntry,
function (expectedData) {
@@ -207,7 +207,7 @@
};
- OData.request(request, function (data, response) {
+ odatajs.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
};
- OData.request(deletionRequest, function (data, response) {
+ odatajs.request(deletionRequest, function (data, response) {
var httpOperation = deletionRequest.method + " " + deletionRequest.requestUri;
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
- OData.read(request.requestUri, function (data, response) {
+ odatajs.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
- OData.request(request, function (data, response) {
+ odatajs.request(request, function (data, response) {
var httpOperation = request.method + " " + request.requestUri;
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
- OData.read(request.requestUri, function (data, response) {
+ odatajs.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();
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 c342271..9e8ed01 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) {
- OData.read(metadataUri, function (metadata) {
+ odatajs.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);
- OData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.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);
- OData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.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) {
- OData.request({ requestUri: params.feedUri, method: "POST", headers: djstest.clone(mimeHeaders), data: postEntry }, function (data, response) {
+ odatajs.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);
- OData.request({ requestUri: entryUri, method: "PUT", headers: djstest.clone(mimeHeaders), data: params.testEntry.data }, function (data, response) {
+ odatajs.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) {
- OData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
+ odatajs.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;
- OData.read(foodStoreDataService + "/$metadata", function (metadata) {
- OData.read({ requestUri: specialDaysEndpoint, headers: { Accept: params.accept} }, function (data, response) {
+ odatajs.read(foodStoreDataService + "/$metadata", function (metadata) {
+ odatajs.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/689c94cb/datajs/tests/odata-metadata-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-metadata-tests.js b/datajs/tests/odata-metadata-tests.js
index 6f18e4f..9d22e20 100644
--- a/datajs/tests/odata-metadata-tests.js
+++ b/datajs/tests/odata-metadata-tests.js
@@ -33,11 +33,11 @@
for (i = 0, len = cases.length; i < len; i++) {
var response = cases[i].i;
var testClient = { request: function (r, success, error) { success(response); } };
- window.OData.read("foo", function (data) {
+ window.odatajs.read("foo", function (data) {
djstest.assertAreEqualDeep(data, cases[i].e, "handler result matches target");
}, function (err) {
djstest.fail(err.message);
- }, window.OData.metadataHandler, testClient);
+ }, window.odatajs.oData.metadataHandler, testClient);
}
djstest.done();
@@ -58,7 +58,7 @@
var i, len;
for (i = 0, len = cases.length; i < len; i++) {
- djstest.assertAreEqual(window.OData.metadata.scriptCase(cases[i].i), cases[i].e, "processed input matches expected value");
+ djstest.assertAreEqual(window.odatajs.oData.metadata.scriptCase(cases[i].i), cases[i].e, "processed input matches expected value");
}
djstest.done();
@@ -66,7 +66,7 @@
djstest.addTest(function testGetChildSchema() {
// Test cases as input parent / input element / result tuples.
- var schema = window.OData.metadata.schema;
+ var schema = window.odatajs.oData.metadata.schema;
var cases = [
{ ip: schema.elements.EntityType, ie: "Property", e: { isArray: true, propertyName: "property"} },
{ ip: schema.elements.EntityType, ie: "Key", e: { isArray: true, propertyName: "key"} },
@@ -76,7 +76,7 @@
var i, len;
for (i = 0, len = cases.length; i < len; i++) {
- var result = window.OData.metadata.getChildSchema(cases[i].ip, cases[i].ie);
+ var result = window.odatajs.oData.metadata.getChildSchema(cases[i].ip, cases[i].ie);
djstest.assertAreEqualDeep(result, cases[i].e, "getChildSchema matches target");
}
@@ -425,7 +425,7 @@
var i, len;
for (i = 0, len = cases.length; i < len; i++) {
var doc = window.odatajs.xml.xmlParse(cases[i].i);
- var schema = window.OData.metadata.parseConceptualModelElement(doc.documentElement);
+ var schema = window.odatajs.oData.metadata.parseConceptualModelElement(doc.documentElement);
djstest.assertAreEqualDeep(schema, cases[i].e, "parseConceptualModelElement result matches target");
}
@@ -447,7 +447,7 @@
var doc = window.odatajs.xml.xmlParse(testCsdl);
- var schema = window.OData.metadata.parseConceptualModelElement(doc.documentElement);
+ var schema = window.odatajs.oData.metadata.parseConceptualModelElement(doc.documentElement);
djstest.assertAreEqual(schema.dataServices.schema[0].term.length, 2, "schema.DataServices.Schema.Term.length === 2");
djstest.assertAreEqual(schema.dataServices.schema[0].term[0].name, "Rating", "schema.DataServices.Schema.Term[0].name === 'Rating'");
@@ -481,7 +481,7 @@
var doc = window.odatajs.xml.xmlParse(testCsdl);
- var schema = window.OData.metadata.parseConceptualModelElement(doc.documentElement);
+ var schema = window.odatajs.oData.metadata.parseConceptualModelElement(doc.documentElement);
djstest.assertAreEqual(schema.dataServices.schema[0].annotations.length, 2, "Annotations number");
djstest.assertAreEqual(schema.dataServices.schema[0].annotations[0].annotation.length, 1, "Annotation number");
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/datajs/tests/odata-net-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-net-tests.js b/datajs/tests/odata-net-tests.js
index 9efce6d..7164ff1 100644
--- a/datajs/tests/odata-net-tests.js
+++ b/datajs/tests/odata-net-tests.js
@@ -36,17 +36,17 @@
};
var oldXmlHttpRequest = window.XMLHttpRequest;
- var oldEnableJsonpCallback = OData.net.defaultHttpClient.enableJsonpCallback;
+ var oldEnableJsonpCallback = window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback;
try {
window.XMLHttpRequest = MockXMLHttpRequest.XMLHttpRequest;
var i, len;
for (i = 0, len = tests.length; i < len; i++) {
MockXMLHttpRequest.addResponse(tests[i].url, tests[i].response);
- OData.net.defaultHttpClient.enableJsonpCallback = false;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = false;
//Need a closure to capture the current test being executed.
(function (test) {
- OData.net.defaultHttpClient.request(
+ window.odatajs.oData.net.defaultHttpClient.request(
{ requestUri: test.url, headers: {} },
function (response) {
djstest.assert(response.statusCode >= 200 & response.statusCode <= 299, "response status is in the success range");
@@ -66,7 +66,7 @@
var timer = setInterval(function () {
if (sentCount === tests.length) {
clearInterval(timer)
- OData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
window.XMLHttpRequest = oldXmlHttpRequest;
MockXMLHttpRequest.reset();
djstest.done();
@@ -81,12 +81,12 @@
djstest.assertsExpected(1);
- var oldEnableJsonpCallback = OData.net.defaultHttpClient.enableJsonpCallback;
+ var oldEnableJsonpCallback = window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback;
try {
window.XMLHttpRequest = MockXMLHttpRequest.XMLHttpRequest;
- OData.net.defaultHttpClient.enableJsonpCallback = false;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = false;
- OData.net.defaultHttpClient.request(
+ window.odatajs.oData.net.defaultHttpClient.request(
{ requestUri: "http://test1", timeoutMS: 10, headers: { MockTimeOut: true} },
function (response) {
djstest.fail("success method was hit when not expected");
@@ -102,7 +102,7 @@
var timer = setInterval(function () {
if (testDone) {
clearInterval(timer);
- OData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
window.XMLHttpRequest = oldXmlHttpRequest;
MockXMLHttpRequest.reset();
djstest.done();
@@ -117,12 +117,12 @@
djstest.assertsExpected(1);
- var oldEnableJsonpCallback = OData.net.defaultHttpClient.enableJsonpCallback;
+ var oldEnableJsonpCallback = window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback;
try {
window.XMLHttpRequest = MockXMLHttpRequest.XMLHttpRequest;
- OData.net.defaultHttpClient.enableJsonpCallback = false;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = false;
- var result = OData.net.defaultHttpClient.request(
+ var result = window.odatajs.oData.net.defaultHttpClient.request(
{ requestUri: "http://test1", headers: { MockNoOp: true} },
function (response) {
djstest.fail("success method was hit when not expected");
@@ -134,7 +134,7 @@
result.abort();
}
finally {
- OData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
window.XMLHttpRequest = oldXmlHttpRequest;
MockXMLHttpRequest.reset();
djstest.done();
@@ -148,10 +148,10 @@
djstest.assertsExpected(1);
- var oldEnableJsonpCallback = OData.net.defaultHttpClient.enableJsonpCallback;
+ var oldEnableJsonpCallback = window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback;
try {
window.XMLHttpRequest = MockXMLHttpRequest.XMLHttpRequest;
- OData.net.defaultHttpClient.enableJsonpCallback = false;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = false;
MockXMLHttpRequest.addResponse("http://test1", { headers: {}, status: 200, body: "test body" });
@@ -160,7 +160,7 @@
testDone = true;
};
- result = OData.net.defaultHttpClient.request(
+ result = window.odatajs.oData.net.defaultHttpClient.request(
{ requestUri: "http://test1", headers: {} },
function (response) {
djstest.pass("success method was hit");
@@ -174,7 +174,7 @@
var timer = setInterval(function () {
if (testDone) {
clearInterval(timer);
- OData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
window.XMLHttpRequest = oldXmlHttpRequest;
MockXMLHttpRequest.reset();
djstest.done();
@@ -200,10 +200,10 @@
];
var oldXmlHttpRequest = window.XMLHttpRequest;
- var oldEnableJsonpCallback = OData.net.defaultHttpClient.enableJsonpCallback;
+ var oldEnableJsonpCallback = window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback;
try {
window.XMLHttpRequest = MockXMLHttpRequest.XMLHttpRequest;
- OData.net.defaultHttpClient.enableJsonpCallback = false;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = false;
var i, len;
for (i = 0, len = tests.length; i < len; i++) {
@@ -212,14 +212,14 @@
djstest.assertAreEqualDeep(request, tests[i].expected, "request matches target");
});
- OData.net.defaultHttpClient.request(
+ window.odatajs.oData.net.defaultHttpClient.request(
tests[i].request,
function (response) { });
}
}
finally {
// Restore original values.
- OData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = oldEnableJsonpCallback;
window.XMLHttpRequest = oldXmlHttpRequest;
}
djstest.done();
@@ -240,21 +240,21 @@
{ pass: true, input: { headers: { Accept: "application/xml"}} }
];
for (var i = 0; i < tests.length; i++) {
- var actual = OData.net.canUseJSONP(tests[i].input);
+ var actual = window.odatajs.oData.net.canUseJSONP(tests[i].input);
djstest.assert(actual === tests[i].pass, "test " + i + " didn't actually match pass (" + tests[i].pass + ")");
}
djstest.done();
});
djstest.addTest(function isAbsoluteUrlTest() {
- djstest.assert(OData.net.isAbsoluteUrl("http://something/"));
- djstest.assert(OData.net.isAbsoluteUrl("http://malformed url/"));
- djstest.assert(OData.net.isAbsoluteUrl("https://localhost/"));
- djstest.assert(OData.net.isAbsoluteUrl("file://another-protocol/"));
- djstest.assert(!OData.net.isAbsoluteUrl("/path"));
- djstest.assert(!OData.net.isAbsoluteUrl("?query-string"));
- djstest.assert(!OData.net.isAbsoluteUrl(""));
- djstest.assert(!OData.net.isAbsoluteUrl("mailto:someone"));
+ djstest.assert(window.odatajs.oData.net.isAbsoluteUrl("http://something/"));
+ djstest.assert(window.odatajs.oData.net.isAbsoluteUrl("http://malformed url/"));
+ djstest.assert(window.odatajs.oData.net.isAbsoluteUrl("https://localhost/"));
+ djstest.assert(window.odatajs.oData.net.isAbsoluteUrl("file://another-protocol/"));
+ djstest.assert(!window.odatajs.oData.net.isAbsoluteUrl("/path"));
+ djstest.assert(!window.odatajs.oData.net.isAbsoluteUrl("?query-string"));
+ djstest.assert(!window.odatajs.oData.net.isAbsoluteUrl(""));
+ djstest.assert(!window.odatajs.oData.net.isAbsoluteUrl("mailto:someone"));
djstest.done();
});
@@ -274,10 +274,10 @@
];
var i, len;
for (i = 0, len = localUrls.length; i < len; i++) {
- djstest.assert(OData.net.isLocalUrl(localUrls[i]), "is local: [" + localUrls[i] + "]");
+ djstest.assert(window.odatajs.oData.net.isLocalUrl(localUrls[i]), "is local: [" + localUrls[i] + "]");
}
for (i = 0, len = remoteUrls.length; i < len; i++) {
- djstest.assert(!OData.net.isLocalUrl(remoteUrls[i]), "is not local: [" + remoteUrls[i] + "]");
+ djstest.assert(!window.odatajs.oData.net.isLocalUrl(remoteUrls[i]), "is not local: [" + remoteUrls[i] + "]");
}
djstest.done();
});
@@ -285,7 +285,7 @@
// DATAJS INTERNAL END
djstest.addTest(function userPasswordTest() {
- OData.request({
+ odatajs.request({
requestUri: "./endpoints/FoodStoreDataServiceV4.svc/UserNameAndPassword",
user: "the-user",
password: "the-password"
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/datajs/tests/odata-perf-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-perf-tests.js b/datajs/tests/odata-perf-tests.js
index 2d3746a..e04ce99 100644
--- a/datajs/tests/odata-perf-tests.js
+++ b/datajs/tests/odata-perf-tests.js
@@ -25,7 +25,7 @@
var timedHttpClient = {
duration: 0,
- provider: OData.net.defaultHttpClient,
+ provider: window.odatajs.oData.net.defaultHttpClient,
request: function (request, success, error) {
var startTime = new Date();
return timedHttpClient.provider.request(request, function () {
@@ -53,28 +53,28 @@
});
},
teardown: function () {
- OData.net.defaultHttpClient = timedHttpClient.provider;
+ window.odatajs.oData.net.defaultHttpClient = timedHttpClient.provider;
}
});
- OData.net.defaultHttpClient.enableJsonpCallback = true;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = true;
$.each(feeds, function (_, feed) {
$.each([5, 500], function (_, items) {
var params = $.extend({}, feed, { items: items, readUri: feed.uri + "?$top=" + items });
djstest.addTest(function readPerfTest(params) {
var measureRead = function (metadata) {
var startTime = new Date();
- OData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function () {
+ odatajs.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();
}, unexpectedErrorHandler, undefined, undefined, metadata);
};
- OData.net.defaultHttpClient = timedHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
- OData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.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++) {
- OData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
+ odatajs.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) {
- OData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.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 () {
- OData.read({ requestUri: params.readUri, headers: { Accept: params.mimeType }, enableJsonpCallback: true }, function (_, response) {
+ odatajs.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) {
- OData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
} else {
measureRead();
}
@@ -157,18 +157,18 @@
djstest.addTest(function postPerfTest(params) {
var measurePost = function (metadata) {
var startTime = new Date();
- OData.request(params.request, function () {
+ odatajs.request(params.request, function () {
var duration = new Date() - startTime - timedHttpClient.duration;
djstest.pass("Duration: " + duration + " ms (Network: " + timedHttpClient.duration + " ms)");
djstest.done();
}, unexpectedErrorHandler, undefined, undefined, metadata);
};
- OData.net.defaultHttpClient = timedHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
- OData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.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++) {
- OData.request(params.request, function (_, response) {
+ odatajs.request(params.request, function (_, response) {
count++;
if (count >= total) {
Instrument.getBrowserMemorySize(function (memoryAfter) {
@@ -194,11 +194,11 @@
});
};
- OData.net.defaultHttpClient = timedHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
- OData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.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 () {
- OData.request(params.request, function (_, response) {
+ odatajs.request(params.request, function (_, response) {
count++;
if (count < total) {
setTimeout(makeRequest, 0);
@@ -228,11 +228,11 @@
});
};
- OData.net.defaultHttpClient = timedHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
- OData.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
+ odatajs.read(params.service + "$metadata", measurePost, unexpectedErrorHandler, OData.metadataHandler);
} else {
measurePost();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 167db54..1c552e4 100644
--- a/datajs/tests/odata-read-crossdomain-functional-tests.js
+++ b/datajs/tests/odata-read-crossdomain-functional-tests.js
@@ -58,11 +58,11 @@
module("CrossDomain", {
setup: function () {
- this.oldEnableJsonpCallback = OData.net.defaultHttpClient.enableJsonpCallback;
- OData.net.defaultHttpClient.enableJsonpCallback = true;
+ this.oldEnableJsonpCallback = window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = true;
},
teardown: function () {
- OData.net.defaultHttpClient.enableJsonpCallback = this.oldEnableJsonpCallback;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = this.oldEnableJsonpCallback;
}
});
@@ -76,7 +76,7 @@
}
djstest.log("Reading data over the wire.");
- OData.read(request, function (data, response) {
+ odatajs.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.");
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
+ odatajs.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);
@@ -118,7 +118,7 @@
var dataCacheReadRangeSingleTest = function (params) {
var options = { name: "cache", source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize, cacheSize: params.cacheSize };
- OData.net.defaultHttpClient.enableJsonpCallback = true;
+ window.odatajs.oData.net.defaultHttpClient.enableJsonpCallback = true;
var cache = odatajs.cache.createDataCache(options);
cache.readRange(params.skip, params.take).then(function (data) {
validateExpectedRange(cache, data, params.feed, params.skip, params.take);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 79c92bc..9bd24e0 100644
--- a/datajs/tests/odata-read-functional-tests.js
+++ b/datajs/tests/odata-read-functional-tests.js
@@ -68,7 +68,7 @@
djstest.wait(function (done) {
$.post(service + "ResetData", done);
});
- OData.json.jsonHandler.recognizeDates = false;
+ window.odatajs.oData.json.jsonHandler.recognizeDates = false;
}
});
@@ -76,7 +76,7 @@
djstest.addTest(function readFullFeedTest(handlerAccept) {
djstest.assertsExpected(1);
- OData.read({ requestUri: feed, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: "./endpoints/FoodStoreDataServiceV4.svc/Foods(1)", headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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)";
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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)";
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} }, function (data, response) {
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
+ odatajs.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);
- OData.read({ requestUri: endpoint, headers: { Accept: handlerAccept }, user: user, password: password }, function (data, response) {
+ odatajs.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);
- OData.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
+ odatajs.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);
- OData.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
+ odatajs.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";
- OData.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
+ odatajs.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";
- OData.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
+ odatajs.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
function success(data, response) {
djstest.fail("Reading metadata should produce error with " + params.handlerAccept);
djstest.done();
@@ -545,7 +545,7 @@
djstest.addFullTest(true, function metadataElementExtensionsTest() {
var csdlFile = "./endpoints/CustomAnnotations.xml";
var modifyTypeHttpClient = {};
- var originalHttpClient = OData.net.defaultHttpClient;
+ var originalHttpClient = window.odatajs.oData.net.defaultHttpClient;
// Modify the content-type of the response so that it is accepted by the metadataHandler.
// By default, the content-type of CustomAnnotations.xml comes back as text/xml
@@ -556,9 +556,9 @@
}, error);
}
- OData.net.defaultHttpClient = modifyTypeHttpClient;
+ window.odatajs.oData.net.defaultHttpClient = modifyTypeHttpClient;
- OData.read({ requestUri: csdlFile, headers: { Accept: "text/xml"} },
+ odatajs.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);
- OData.read(
+ odatajs.read(
{ requestUri: endPoint },
function success(data, response) {
djstest.assert(true, "Test executed");
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/689c94cb/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 f20475d..d7ea160 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);
- OData.request(request, function (data, response) {
+ odatajs.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);
- OData.request(request, function(data, response) {
+ odatajs.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) {
- OData.request(request, function (data, response) {
+ odatajs.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);
- OData.request({
+ odatajs.request({
requestUri: endpoint,
method: "DELETE",
headers: headers