[OLINGO-418] rename ODataReadOracle -> ODataVerifyReader
diff --git a/odatajs/tests/cache-tests.js b/odatajs/tests/cache-tests.js
index f4c1a1c..7e03764 100644
--- a/odatajs/tests/cache-tests.js
+++ b/odatajs/tests/cache-tests.js
@@ -635,7 +635,7 @@
return result;
};
- ODataReadOracle.readJsonAcrossServerPages(foodsFeed, function (expectData) {
+ ODataVerifyReader.readJsonAcrossServerPages(foodsFeed, function (expectData) {
$.each(tests, function (_, test) {
createNewCache(options).then(function (cache) {
try {
diff --git a/odatajs/tests/common/ODataReadOracle.svc b/odatajs/tests/common/ODataVerifyReader.svc
similarity index 97%
rename from odatajs/tests/common/ODataReadOracle.svc
rename to odatajs/tests/common/ODataVerifyReader.svc
index 339666c..101cf36 100644
--- a/odatajs/tests/common/ODataReadOracle.svc
+++ b/odatajs/tests/common/ODataVerifyReader.svc
@@ -18,7 +18,7 @@
*/
<%@ ServiceHost Language="C#" Debug="true" Factory="System.ServiceModel.Activation.WebScriptServiceHostFactory"
- Service="DataJS.Tests.ODataReadOracle" %>
+ Service="DataJS.Tests.ODataVerifyReader" %>
//uncomment this line to debug JSON serialization.
//#define DEBUG_SERIALIZATION
@@ -47,7 +47,7 @@
[ServiceContract]
[ServiceBehavior(IncludeExceptionDetailInFaults = true)]
[AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
- public class ODataReadOracle
+ public class ODataVerifyReader
{
const string jsonlightMediaType = "application/json";
diff --git a/odatajs/tests/common/ODataReadOracle.js b/odatajs/tests/common/odataVerifyReader.js
similarity index 98%
rename from odatajs/tests/common/ODataReadOracle.js
rename to odatajs/tests/common/odataVerifyReader.js
index 83967ce..4e25568 100644
--- a/odatajs/tests/common/ODataReadOracle.js
+++ b/odatajs/tests/common/odataVerifyReader.js
@@ -155,7 +155,7 @@
* @param {Function} reviver - The reviver function to run on each deserialized object
* @param {Function} success - Success callback
*/
- var url = "./common/ODataReadOracle.svc/" + endpoint;
+ var url = "./common/ODataVerifyReader.svc/" + endpoint;
if (mimeType) {
data.mimeType = mimeType;
}
@@ -188,7 +188,7 @@
}
};
- window.ODataReadOracle = {
+ window.ODataVerifyReader = {
readFeed: readFeed,
readEntry: readEntry,
readLinksEntry: readLinksEntry,
diff --git a/odatajs/tests/odata-batch-functional-tests.html b/odatajs/tests/odata-batch-functional-tests.html
index 4f79204..baf9b54 100644
--- a/odatajs/tests/odata-batch-functional-tests.html
+++ b/odatajs/tests/odata-batch-functional-tests.html
@@ -29,7 +29,7 @@
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.10.0.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="common/TestSynchronizerClient.js"></script>
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
diff --git a/odatajs/tests/odata-batch-functional-tests.js b/odatajs/tests/odata-batch-functional-tests.js
index 328bb66..4ff56ce 100644
--- a/odatajs/tests/odata-batch-functional-tests.js
+++ b/odatajs/tests/odata-batch-functional-tests.js
@@ -53,7 +53,7 @@
var verifyBatchResponses = function (batchRequests, elementTypes, serviceRoot, batchResponses, done) {
forEachAsync(batchRequests, function (index, batchRequest, doneOne) {
if (batchRequest.requestUri) {
- var readFeedOrEntry = elementTypes[index] == "feed" ? ODataReadOracle.readFeed : ODataReadOracle.readEntry;
+ var readFeedOrEntry = elementTypes[index] == "feed" ? ODataVerifyReader.readFeed : ODataVerifyReader.readEntry;
djstest.assertAreEqual(batchResponses[index].statusCode, httpStatusCode.ok, "Verify response code for: GET " + batchRequest.requestUri);
readFeedOrEntry(serviceRoot + "/" + batchRequest.requestUri, function (expectedData) {
djstest.assertAreEqualDeep(batchResponses[index].data, expectedData, "Verify data for: GET " + batchRequest.requestUri);
@@ -73,7 +73,7 @@
if (changeRequest.method == "POST") {
djstest.assertAreEqual(changeResponse.statusCode, httpStatusCode.created, "Verify response code for: " + httpOperation);
- ODataReadOracle.readEntry(changeResponse.headers["Location"], function (expectedData) {
+ ODataVerifyReader.readEntry(changeResponse.headers["Location"], function (expectedData) {
djstest.assertAreEqualDeep(changeResponse.data, expectedData, "Verify response data for: " + httpOperation);
doneOne();
}, changeRequest.headers.Accept);
diff --git a/odatajs/tests/odata-cache-filter-functional-tests.html b/odatajs/tests/odata-cache-filter-functional-tests.html
index 94cfe2e..6e25f80 100644
--- a/odatajs/tests/odata-cache-filter-functional-tests.html
+++ b/odatajs/tests/odata-cache-filter-functional-tests.html
@@ -40,7 +40,7 @@
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="common/CacheOracle.js"></script>
<script type="text/javascript" src="common/ObservableHttpClient.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="odata-cache-filter-functional-tests.js"></script>
</head>
<body>
diff --git a/odatajs/tests/odata-cache-filter-functional-tests.js b/odatajs/tests/odata-cache-filter-functional-tests.js
index 0fd08f3..c9024d2 100644
--- a/odatajs/tests/odata-cache-filter-functional-tests.js
+++ b/odatajs/tests/odata-cache-filter-functional-tests.js
@@ -162,7 +162,7 @@
index = 0;
}
- window.ODataReadOracle.readJsonAcrossServerPages(feed, function (expectData) {
+ window.ODataVerifyReader.readJsonAcrossServerPages(feed, function (expectData) {
if (backwards) {
cache.filterBack(index, count, predicate).then(function (actualResults) {
var expectedResults = CacheOracle.getExpectedFilterResults(expectData, index, count, predicate, backwards);
diff --git a/odatajs/tests/odata-cache-functional-tests.html b/odatajs/tests/odata-cache-functional-tests.html
index f158030..0a5618b 100644
--- a/odatajs/tests/odata-cache-functional-tests.html
+++ b/odatajs/tests/odata-cache-functional-tests.html
@@ -40,7 +40,7 @@
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="common/CacheOracle.js"></script>
<script type="text/javascript" src="common/ObservableHttpClient.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="odata-cache-functional-tests.js"></script>
</head>
<body>
diff --git a/odatajs/tests/odata-cache-functional-tests.js b/odatajs/tests/odata-cache-functional-tests.js
index ac63460..4e4b4dd 100644
--- a/odatajs/tests/odata-cache-functional-tests.js
+++ b/odatajs/tests/odata-cache-functional-tests.js
@@ -154,7 +154,7 @@
if (typeof source === "string") {
var expectedRangeUrl = source + "?$skip=" + skipValue + "&$top=" + takeValue;
- window.ODataReadOracle.readJsonAcrossServerPages(expectedRangeUrl, assertData);
+ window.ODataVerifyReader.readJsonAcrossServerPages(expectedRangeUrl, assertData);
} else {
source.read(skipValue, takeValue, assertData);
}
diff --git a/odatajs/tests/odata-cache-rx-functional-tests.html b/odatajs/tests/odata-cache-rx-functional-tests.html
index aab512c..728e833 100644
--- a/odatajs/tests/odata-cache-rx-functional-tests.html
+++ b/odatajs/tests/odata-cache-rx-functional-tests.html
@@ -37,7 +37,7 @@
<script type="text/javascript" src="../build/odatajs-4.0.0-beta-01.js"></script>
<script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/ODataVerifyReader.js"></script>
<script type="text/javascript" src="common/rx.js"></script>
<script type="text/javascript" src="odata-cache-rx-functional-tests.js"></script>
</head>
diff --git a/odatajs/tests/odata-cache-rx-functional-tests.js b/odatajs/tests/odata-cache-rx-functional-tests.js
index 453e586..714cccb 100644
--- a/odatajs/tests/odata-cache-rx-functional-tests.js
+++ b/odatajs/tests/odata-cache-rx-functional-tests.js
@@ -75,7 +75,7 @@
var options = { name: "cache" + new Date().valueOf(), source: params.feedUri, pageSize: params.pageSize, prefetchSize: 0 };
var cache = odatajs.cache.createDataCache(options);
- ODataReadOracle.readJsonAcrossServerPages(params.feedUri, function (collection) {
+ ODataVerifyReader.readJsonAcrossServerPages(params.feedUri, function (collection) {
assertObservables(params.operator(cache.toObservable()), params.operator(window.Rx.Observable.FromArray(collection.value)), function () {
djstest.destroyCacheAndDone(cache);
});
diff --git a/odatajs/tests/odata-links-functional-tests.html b/odatajs/tests/odata-links-functional-tests.html
index 21952d8..48eaac7 100644
--- a/odatajs/tests/odata-links-functional-tests.html
+++ b/odatajs/tests/odata-links-functional-tests.html
@@ -30,7 +30,7 @@
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.10.0.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="common/TestSynchronizerClient.js"></script>
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
diff --git a/odatajs/tests/odata-links-functional-tests.js b/odatajs/tests/odata-links-functional-tests.js
index eb64ec0..8ff2f5d 100644
--- a/odatajs/tests/odata-links-functional-tests.js
+++ b/odatajs/tests/odata-links-functional-tests.js
@@ -171,7 +171,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: params.linksFeed, headers: headers },
function (data, response) {
- window.ODataReadOracle.readLinksFeed(params.linksFeed,
+ window.ODataVerifyReader.readLinksFeed(params.linksFeed,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -186,7 +186,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: params.linksEntry, headers: headers },
function (data, response) {
- window.ODataReadOracle.readLinksEntry(params.linksEntry,
+ window.ODataVerifyReader.readLinksEntry(params.linksEntry,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -210,7 +210,7 @@
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) {
+ ODataVerifyReader.readLinksEntry(request.requestUri, function (actualData) {
if (actualData && actualData["@odata.context"]) {
delete actualData["@odata.context"];
}
@@ -260,7 +260,7 @@
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
odatajs.oData.read(request.requestUri, function (data, response) {
- ODataReadOracle.readLinksFeed(request.requestUri, function (actualData) {
+ ODataVerifyReader.readLinksFeed(request.requestUri, function (actualData) {
djstest.assertAreEqualDeep(actualData, response.data, "Verify updated links entry against the request: " + httpOperation);
deleteAndVerify();
});
diff --git a/odatajs/tests/odata-metadata-awareness-functional-tests.html b/odatajs/tests/odata-metadata-awareness-functional-tests.html
index fc5bb0b..2b33dbc 100644
--- a/odatajs/tests/odata-metadata-awareness-functional-tests.html
+++ b/odatajs/tests/odata-metadata-awareness-functional-tests.html
@@ -29,7 +29,7 @@
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.10.0.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="common/TestSynchronizerClient.js"></script>
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
diff --git a/odatajs/tests/odata-metadata-awareness-functional-tests.js b/odatajs/tests/odata-metadata-awareness-functional-tests.js
index a5d2887..1f5638d 100644
--- a/odatajs/tests/odata-metadata-awareness-functional-tests.js
+++ b/odatajs/tests/odata-metadata-awareness-functional-tests.js
@@ -134,7 +134,7 @@
OData.defaultMetadata.push(metadata);
odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
- ODataReadOracle.readJson(entryUri, function (expectedData) {
+ ODataVerifyReader.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
djstest.done();
})
@@ -163,7 +163,7 @@
OData.defaultMetadata.push(metadata);
odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
- ODataReadOracle.readJson(entryUri, function (expectedData) {
+ ODataVerifyReader.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
djstest.done();
})
@@ -177,7 +177,7 @@
getMetadata(function (metadata) {
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) {
+ ODataVerifyReader.readJson(feedUri + "(" + postEntry.ID + ")", function (actualData) {
djstest.assertWithoutMetadata(actualData, postEntry, "Verify new entry data against server");
djstest.done();
})
@@ -192,7 +192,7 @@
OData.defaultMetadata.push(metadata);
odatajs.oData.request({ requestUri: entryUri, method: "PUT", headers: djstest.clone(mimeHeaders), data: params.testEntry.data }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code");
- ODataReadOracle.readJson(entryUri, function (actualData) {
+ ODataVerifyReader.readJson(entryUri, function (actualData) {
djstest.assertWithoutMetadata(actualData, $.extend({ ID: 0 }, params.testEntry.data), "Verify updated entry data against server");
djstest.done();
})
@@ -210,7 +210,7 @@
getMetadata(function (metadata) {
odatajs.oData.read({ requestUri: entryUri, headers: acceptHeaders }, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.ok, "Verify response code");
- ODataReadOracle.readJson(entryUri, function (expectedData) {
+ ODataVerifyReader.readJson(entryUri, function (expectedData) {
djstest.assertWithoutMetadata(data, expectedData, "Verify data");
djstest.done();
})
@@ -230,7 +230,7 @@
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) {
+ window.ODataVerifyReader.readFeed(specialDaysEndpoint, function (expectedData) {
// Fix up the string property that has a "date-like" string deliberately injected
expectedData.results[2].Name = "/Date(" + expectedData.results[2].Name.valueOf() + ")/";
djstest.assertAreEqualDeep(data, expectedData, "Verify response data");
diff --git a/odatajs/tests/odata-qunit-tests.htm b/odatajs/tests/odata-qunit-tests.htm
index 3054691..6d2de29 100644
--- a/odatajs/tests/odata-qunit-tests.htm
+++ b/odatajs/tests/odata-qunit-tests.htm
@@ -34,7 +34,7 @@
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.10.0.js"></script>
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="common/TestSynchronizerClient.js"></script>
<!--<script type="text/javascript" src="common/rx.js"></script>-->
diff --git a/odatajs/tests/odata-read-crossdomain-functional-tests.html b/odatajs/tests/odata-read-crossdomain-functional-tests.html
index 86ce093..784aec6 100644
--- a/odatajs/tests/odata-read-crossdomain-functional-tests.html
+++ b/odatajs/tests/odata-read-crossdomain-functional-tests.html
@@ -30,7 +30,7 @@
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.10.0.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/ODataVerifyReader.js"></script>
<script type="text/javascript" src="common/TestSynchronizerClient.js"></script>
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
diff --git a/odatajs/tests/odata-read-crossdomain-functional-tests.js b/odatajs/tests/odata-read-crossdomain-functional-tests.js
index 9e8aca9..06dcfa1 100644
--- a/odatajs/tests/odata-read-crossdomain-functional-tests.js
+++ b/odatajs/tests/odata-read-crossdomain-functional-tests.js
@@ -78,7 +78,7 @@
djstest.log("Reading data over the wire.");
odatajs.oData.read(request, function (data, response) {
djstest.log("Verifying data over the wire from Oracle.");
- window.ODataReadOracle.readFeed(azureOdataFeed, function (expectedData) {
+ window.ODataVerifyReader.readFeed(azureOdataFeed, function (expectedData) {
data = fixConstructors(data);
djstest.assertWithoutMetadata(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -93,7 +93,7 @@
djstest.log("Reading data over the wire.");
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) {
+ window.ODataVerifyReader.readEntry(endPoint, function (expectedData) {
data = fixConstructors(data);
djstest.assertWithoutMetadata(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -127,7 +127,7 @@
var validateExpectedRange = function (cache, data, feed, skipValue, takeValue) {
var expectedRangeUrl = feed + "?$skip=" + skipValue + "&$top=" + takeValue;
- window.ODataReadOracle.readFeed(expectedRangeUrl, function (expectedData) {
+ window.ODataVerifyReader.readFeed(expectedRangeUrl, function (expectedData) {
if (expectedData.results) {
expectedData = expectedData.results;
}
diff --git a/odatajs/tests/odata-read-functional-tests.html b/odatajs/tests/odata-read-functional-tests.html
index 11d930d..7114113 100644
--- a/odatajs/tests/odata-read-functional-tests.html
+++ b/odatajs/tests/odata-read-functional-tests.html
@@ -30,7 +30,7 @@
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.10.0.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/ODataVerifyReader.js"></script>
<script type="text/javascript" src="common/TestSynchronizerClient.js"></script>
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
diff --git a/odatajs/tests/odata-read-functional-tests.js b/odatajs/tests/odata-read-functional-tests.js
index 6253856..29f28e4 100644
--- a/odatajs/tests/odata-read-functional-tests.js
+++ b/odatajs/tests/odata-read-functional-tests.js
@@ -78,7 +78,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: feed, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readFeed(feed,
+ window.ODataVerifyReader.readFeed(feed,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -94,7 +94,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endPoint,
+ window.ODataVerifyReader.readEntry(endPoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -110,7 +110,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: "./endpoints/FoodStoreDataServiceV4.svc/Foods(1)", headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endPoint,
+ window.ODataVerifyReader.readEntry(endPoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -125,7 +125,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endPoint,
+ window.ODataVerifyReader.readEntry(endPoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -141,7 +141,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endPoint,
+ window.ODataVerifyReader.readEntry(endPoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -157,7 +157,7 @@
var endPoint = feed + "(4)";
odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endPoint,
+ window.ODataVerifyReader.readEntry(endPoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -174,7 +174,7 @@
var endPoint = feed + "(5)";
odatajs.oData.read({ requestUri: endPoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endPoint,
+ window.ODataVerifyReader.readEntry(endPoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -190,7 +190,7 @@
djstest.assertsExpected(2);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endpoint,
+ window.ODataVerifyReader.readEntry(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data.value, expectedData.value, "Verify inline feed");
djstest.assertAreEqualDeep(data, expectedData, "Verify entry");
@@ -207,7 +207,7 @@
djstest.assertsExpected(2);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readFeed(endpoint,
+ window.ODataVerifyReader.readFeed(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data.value, expectedData.value, "Verify inline feed");
djstest.assertAreEqualDeep(data, expectedData, "Verify feed");
@@ -224,7 +224,7 @@
djstest.assertsExpected(2);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endpoint,
+ window.ODataVerifyReader.readEntry(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data.Category, expectedData.Category, "Verify inline entry");
djstest.assertAreEqualDeep(data, expectedData, "Verify entry");
@@ -241,7 +241,7 @@
djstest.assertsExpected(2);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readFeed(endpoint,
+ window.ODataVerifyReader.readFeed(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data.value, expectedData.value, "Verify inline data");
djstest.assertAreEqualDeep(data, expectedData, "Verify feed");
@@ -257,7 +257,7 @@
djstest.assertsExpected(2);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readFeed(endpoint,
+ window.ODataVerifyReader.readFeed(endpoint,
function (expectedData) {
djstest.assertAreEqual(data["@odata.count"], expectedData["@odata.count"], "Verify count in response data");
djstest.assertAreEqualDeep(data, expectedData, "Verify feed");
@@ -274,7 +274,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endpoint,
+ window.ODataVerifyReader.readEntry(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify select result");
djstest.done();
@@ -289,7 +289,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readFeed(endpoint,
+ window.ODataVerifyReader.readFeed(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify select result");
djstest.done();
@@ -304,7 +304,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endpoint,
+ window.ODataVerifyReader.readEntry(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify select result");
djstest.done();
@@ -319,7 +319,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readFeed(endpoint,
+ window.ODataVerifyReader.readFeed(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify response data");
djstest.done();
@@ -333,7 +333,7 @@
djstest.assertsExpected(2);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readFeed(endpoint,
+ window.ODataVerifyReader.readFeed(endpoint,
function (expectedData) {
djstest.assertAreEqual(data["@odata.context"], expectedData["@odata.context"], "Verify count in response data");
djstest.assertAreEqualDeep(data, expectedData, "Verify feed");
@@ -348,7 +348,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endpoint,
+ window.ODataVerifyReader.readEntry(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify entry");
djstest.done();
@@ -362,7 +362,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: endpoint, headers: { Accept: handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readEntry(endpoint,
+ window.ODataVerifyReader.readEntry(endpoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify entry");
djstest.done();
@@ -435,7 +435,7 @@
var endpoint = "./endpoints/BasicAuthDataService.svc/Customers";
djstest.assertsExpected(1);
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) {
+ window.ODataVerifyReader.readFeed({ url: endpoint, user: user, password: password }, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
}, handlerAccept);
@@ -446,7 +446,7 @@
var endpoint = "./endpoints/BasicAuthDataService.svc/Customers(1)";
djstest.assertsExpected(1);
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) {
+ window.ODataVerifyReader.readEntry({ url: endpoint, user: user, password: password }, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
}, handlerAccept);
@@ -467,7 +467,7 @@
djstest.assertsExpected(1);
odatajs.oData.read({ requestUri: params.serviceName, headers: { Accept: params.handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readServiceDocument(serviceName,
+ window.ODataVerifyReader.readServiceDocument(serviceName,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -507,7 +507,7 @@
var endPoint = params.serviceName + "$metadata";
odatajs.oData.read({ requestUri: endPoint, headers: { Accept: params.handlerAccept} },
function (data, response) {
- window.ODataReadOracle.readMetadata(endPoint,
+ window.ODataVerifyReader.readMetadata(endPoint,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -560,7 +560,7 @@
odatajs.oData.read({ requestUri: csdlFile, headers: { Accept: "text/xml"} },
function (data) {
- window.ODataReadOracle.readMetadata(csdlFile,
+ window.ODataVerifyReader.readMetadata(csdlFile,
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
diff --git a/odatajs/tests/odata-request-functional-tests.html b/odatajs/tests/odata-request-functional-tests.html
index 4148634..331cf8c 100644
--- a/odatajs/tests/odata-request-functional-tests.html
+++ b/odatajs/tests/odata-request-functional-tests.html
@@ -29,7 +29,7 @@
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.10.0.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="common/TestSynchronizerClient.js"></script>
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
diff --git a/odatajs/tests/odata-request-functional-tests.js b/odatajs/tests/odata-request-functional-tests.js
index 82e4258..eadb6a6 100644
--- a/odatajs/tests/odata-request-functional-tests.js
+++ b/odatajs/tests/odata-request-functional-tests.js
@@ -51,7 +51,7 @@
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code: " + httpOperation);
djstest.log("Uri:" + request.requestUri);
- ODataReadOracle.readEntry(response.headers["Location"], function (expectedData) {
+ ODataVerifyReader.readEntry(response.headers["Location"], function (expectedData) {
djstest.assertAreEqualDeep(response.data, expectedData, "Verify new entry against response: " + httpOperation);
done();
}, request.headers.Accept);
@@ -65,7 +65,7 @@
djstest.log("Status code:" + response.statusCode);
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
djstest.log("Uri:" + request.requestUri);
- ODataReadOracle.readEntry(request.requestUri, function(actualData) {
+ ODataVerifyReader.readEntry(request.requestUri, function(actualData) {
var requestData = tryRemoveOdataType(request.data);
djstest.assertAreEqualDeep(subset(actualData, requestData), requestData, "Verify updated entry: " + httpOperation);
done();
@@ -76,12 +76,12 @@
var verifyPatch = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
djstest.log(httpOperation);
- ODataReadOracle.readEntry(request.requestUri, function (originalData) {
+ ODataVerifyReader.readEntry(request.requestUri, function (originalData) {
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);
- ODataReadOracle.readEntry(request.requestUri, function (actualData) {
+ ODataVerifyReader.readEntry(request.requestUri, function (actualData) {
// Merge the original data with the updated data to get the expected data
var expectedData = $.extend(true, {}, originalData, request.data);
@@ -256,7 +256,7 @@
djstest.assertsExpected(3);
verifyRequest(request, function () {
- ODataReadOracle.readEntry(foodsFeed + "(" + newFood.FoodID + ")", function (actualData) {
+ ODataVerifyReader.readEntry(foodsFeed + "(" + newFood.FoodID + ")", function (actualData) {
djstest.assertAreEqual(actualData.Name, newFood.Name, "Verify inline entities were added");
djstest.done();
}, headers ? headers.Accept : undefined);
@@ -278,7 +278,7 @@
djstest.assertsExpected(3);
verifyRequest(request, function () {
- ODataReadOracle.readEntry(categoriesFeed + "(" + request.data.Category.CategoryID + ")", function (actualData) {
+ ODataVerifyReader.readEntry(categoriesFeed + "(" + request.data.Category.CategoryID + ")", function (actualData) {
djstest.assertAreEqual(actualData.Name, request.data.Category.Name, "Verify inline entities were added");
djstest.done();
}, headers ? headers.Accept : undefined);
diff --git a/odatajs/tests/odata-roundtrip-functional-tests.js b/odatajs/tests/odata-roundtrip-functional-tests.js
index 6e3c356..597c273 100644
--- a/odatajs/tests/odata-roundtrip-functional-tests.js
+++ b/odatajs/tests/odata-roundtrip-functional-tests.js
@@ -41,7 +41,7 @@
var httpOperation = request.method + " " + request.requestUri;
odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.created, "Verify response code: " + httpOperation);
- ODataReadOracle.readJson(data.__metadata.uri, function (expectedData) {
+ ODataVerifyReader.readJson(data.__metadata.uri, function (expectedData) {
djstest.assertAreEqualDeep(response.data, expectedData, "Verify new entry against response: " + httpOperation);
done();
}, request.headers.Accept);
@@ -52,7 +52,7 @@
var httpOperation = request.method + " " + request.requestUri;
odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code: " + httpOperation);
- ODataReadOracle.readJson(request.requestUri, function (actualData) {
+ ODataVerifyReader.readJson(request.requestUri, function (actualData) {
djstest.assertAreEqualDeep(actualData, request.data, "Verify updated entry: " + httpOperation);
done();
}, request.headers.Accept);
@@ -61,10 +61,10 @@
var verifyMerge = function (request, done) {
var httpOperation = request.method + " " + request.requestUri;
- ODataReadOracle.readJson(request.requestUri, function (originalData) {
+ ODataVerifyReader.readJson(request.requestUri, function (originalData) {
odatajs.oData.request(request, function (data, response) {
djstest.assertAreEqual(response.statusCode, httpStatusCode.noContent, "Verify response code");
- ODataReadOracle.readJson(request.requestUri, function (actualData) {
+ ODataVerifyReader.readJson(request.requestUri, function (actualData) {
// Merge the original data with the updated data to get the expected data
var expectedData = $.extend(true, {}, originalData, request.data);
djstest.assertAreEqualDeep(actualData, expectedData, "Verify merged data");
@@ -323,7 +323,7 @@
function () {
odatajs.oData.read({ requestUri: foodsFeed + "(216)", headers: { Accept: mimeType} },
function (data, response) {
- ODataReadOracle.readJson(foodsFeed + "(216)",
+ ODataVerifyReader.readJson(foodsFeed + "(216)",
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -347,7 +347,7 @@
function () {
odatajs.oData.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
function (data, response) {
- ODataReadOracle.readJson(categoriesFeed + "(81)",
+ ODataVerifyReader.readJson(categoriesFeed + "(81)",
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
@@ -376,7 +376,7 @@
function () {
odatajs.oData.read({ requestUri: categoriesFeed + "(81)", headers: { Accept: mimeType} },
function (data, response) {
- ODataReadOracle.readJson(categoriesFeed + "(81)",
+ ODataVerifyReader.readJson(categoriesFeed + "(81)",
function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Response data not same as expected");
djstest.done();
diff --git a/odatajs/tests/odatajs-cache-large-collection-functional-tests.html b/odatajs/tests/odatajs-cache-large-collection-functional-tests.html
index 746d912..1a0056e 100644
--- a/odatajs/tests/odatajs-cache-large-collection-functional-tests.html
+++ b/odatajs/tests/odatajs-cache-large-collection-functional-tests.html
@@ -40,7 +40,7 @@
<script type="text/javascript" src="common/djstest-browser.js"></script>
<script type="text/javascript" src="common/CacheOracle.js"></script>
<script type="text/javascript" src="common/ObservableHttpClient.js"></script>
- <script type="text/javascript" src="common/ODataReadOracle.js"></script>
+ <script type="text/javascript" src="common/odataVerifyReader.js"></script>
<script type="text/javascript" src="odatajs-cache-large-collection-functional-tests.js"></script>
</head>
diff --git a/odatajs/tests/odatajs-cache-large-collection-functional-tests.js b/odatajs/tests/odatajs-cache-large-collection-functional-tests.js
index 557510e..a9b37e5 100644
--- a/odatajs/tests/odatajs-cache-large-collection-functional-tests.js
+++ b/odatajs/tests/odatajs-cache-large-collection-functional-tests.js
@@ -144,7 +144,7 @@
cache.readRange(params.skip, params.take).then(function (data) {
var expectedRangeUrl = params.feed + "?$skip=" + params.skip + "&$top=" + params.take;
cacheOracle.verifyRequests(session.requests, session.responses, params.skip, params.take, "largeCollection requests with prefetch", false, true);
- window.ODataReadOracle.readJsonAcrossServerPages(expectedRangeUrl, function (expectedData) {
+ window.ODataVerifyReader.readJsonAcrossServerPages(expectedRangeUrl, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify response data");
});
}, function (err) {
@@ -170,7 +170,7 @@
cache.readRange(params.skip, params.take).then(function (data) {
var expectedRangeUrl = params.feed + "?$skip=" + params.skip + "&$top=" + params.take;
cacheOracle.verifyRequests(session.requests, session.responses, params.skip, params.take, "largeCollection requests without prefetch", false, false);
- window.ODataReadOracle.readJsonAcrossServerPages(expectedRangeUrl, function (expectedData) {
+ window.ODataVerifyReader.readJsonAcrossServerPages(expectedRangeUrl, function (expectedData) {
djstest.assertAreEqualDeep(data, expectedData, "Verify response data");
djstest.done();
});
