You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ko...@apache.org on 2014/05/20 16:18:03 UTC
git commit: [OLINGO-238] adopt tests/cache-tests.js
tests/store-tests.js
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master 1f6d84f2c -> ebcc1e00f
[OLINGO-238] adopt tests/cache-tests.js tests/store-tests.js
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/commit/ebcc1e00
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/ebcc1e00
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/ebcc1e00
Branch: refs/heads/master
Commit: ebcc1e00fce3e90877ee985820b7f92598b794e7
Parents: 1f6d84f
Author: Sven Kobler <sv...@sap.com>
Authored: Tue May 20 16:17:07 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Tue May 20 16:17:07 2014 +0200
----------------------------------------------------------------------
datajs/src/index.js | 8 +--
datajs/src/lib/cache.js | 4 +-
datajs/src/lib/cache/source.js | 4 +-
datajs/src/lib/store/dom.js | 2 +-
datajs/src/lib/store/indexeddb.js | 2 +-
datajs/src/lib/store/memory.js | 2 +-
datajs/tests/cache-tests.js | 94 ++++++++++++++++-----------------
datajs/tests/odata-qunit-tests.htm | 5 +-
datajs/tests/store-tests.js | 6 +--
9 files changed, 64 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/src/index.js
----------------------------------------------------------------------
diff --git a/datajs/src/index.js b/datajs/src/index.js
index 6c6e28f..d255574 100644
--- a/datajs/src/index.js
+++ b/datajs/src/index.js
@@ -2,10 +2,12 @@
window.datajs = require('./lib/datajs.js');
window.OData = require('./lib/odata.js');
+/**/
+window.datajs.store = require('./lib/store.js');
+window.datajs.cache = require('./lib/cache.js');
-
-extend(window.OData, require('./lib/store.js'));
-extend(window.OData, require('./lib/cache.js'));
+//extend(window.OData, require('./lib/store.js'));
+//extend(window.OData, require('./lib/cache.js'));
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/src/lib/cache.js
----------------------------------------------------------------------
diff --git a/datajs/src/lib/cache.js b/datajs/src/lib/cache.js
index ba0dda2..9980644 100644
--- a/datajs/src/lib/cache.js
+++ b/datajs/src/lib/cache.js
@@ -20,7 +20,7 @@
// cache.js
-exports.storeReq = require("./store.js");
+
var utils = require('./datajs.js').utils;
@@ -43,7 +43,7 @@ var ODataCacheSource = require('./cache/source').ODataCacheSource;
var getJsonValueArraryLength = utils.getJsonValueArraryLength;
var sliceJsonValueArray = utils.sliceJsonValueArray;
var concatJsonValueArray = utils.concatJsonValueArray;
-
+var storeReq = require('./datajs.js').store;
// CONTENT START
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/src/lib/cache/source.js
----------------------------------------------------------------------
diff --git a/datajs/src/lib/cache/source.js b/datajs/src/lib/cache/source.js
index f6beeb4..6cd3548 100644
--- a/datajs/src/lib/cache/source.js
+++ b/datajs/src/lib/cache/source.js
@@ -20,7 +20,7 @@
// cache-source.js
var utils = require("./../datajs.js").utils;
-var odataRequest = require("./../odata.js").request;
+var odataRequest = require("./../odata.js");
var parseInt10 = utils.parseInt10;
var normalizeURICase = utils.normalizeURICase;
@@ -112,7 +112,7 @@ var queryForData = function (uri, options, success, error) {
/// <returns type="Object">Object with an abort method.</returns>
var request = buildODataRequest(uri, options);
- var currentRequest = odata.request(request, function (newData) {
+ var currentRequest = odataRequest.request(request, function (newData) {
var nextLink = newData["@odata.nextLink"];
if (nextLink) {
var index = uri.indexOf(".svc/", 0);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/src/lib/store/dom.js
----------------------------------------------------------------------
diff --git a/datajs/src/lib/store/dom.js b/datajs/src/lib/store/dom.js
index 259bbfc..bab1433 100644
--- a/datajs/src/lib/store/dom.js
+++ b/datajs/src/lib/store/dom.js
@@ -315,5 +315,5 @@ DomStore.prototype.update = function (key, value, success, error) {
};
// DATAJS INTERNAL START
-exports.DomStore = DomStore;
+module.exports = DomStore;
// DATAJS INTERNAL END
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/src/lib/store/indexeddb.js
----------------------------------------------------------------------
diff --git a/datajs/src/lib/store/indexeddb.js b/datajs/src/lib/store/indexeddb.js
index 1dba252..d37563c 100644
--- a/datajs/src/lib/store/indexeddb.js
+++ b/datajs/src/lib/store/indexeddb.js
@@ -413,7 +413,7 @@ IndexedDBStore.prototype.update = function (key, value, success, error) {
};
// DATAJS INTERNAL START
-exports.IndexedDBStore = IndexedDBStore;
+module.exports = IndexedDBStore;
// DATAJS INTERNAL END
// CONTENT END
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/src/lib/store/memory.js
----------------------------------------------------------------------
diff --git a/datajs/src/lib/store/memory.js b/datajs/src/lib/store/memory.js
index b3cf1cd..7e2df90 100644
--- a/datajs/src/lib/store/memory.js
+++ b/datajs/src/lib/store/memory.js
@@ -228,7 +228,7 @@ MemoryStore.prototype.defaultError = throwErrorCallback;
MemoryStore.prototype.mechanism = "memory";
// DATAJS INTERNAL START
-exports.MemoryStore = MemoryStore;
+module.exports = MemoryStore;
// DATAJS INTERNAL END
// CONTENT END
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/tests/cache-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/cache-tests.js b/datajs/tests/cache-tests.js
index 13fd4b9..91ab3ca 100644
--- a/datajs/tests/cache-tests.js
+++ b/datajs/tests/cache-tests.js
@@ -35,7 +35,7 @@
};
djstest.addTest(function dataCacheCountTest() {
- var cache = datajs.createDataCache({ name: "cache", source: foodsFeed });
+ var cache = datajs.cache.createDataCache({ name: "cache", source: foodsFeed });
cache.count().then(function (count) {
djstest.assertAreEqual(count, collectionSize, "expected count for Foods");
djstest.destroyCacheAndDone(cache);
@@ -43,7 +43,7 @@
});
djstest.addTest(function dataCacheCountOnLocalTest() {
- var cache = datajs.createDataCache({ name: "cache", source: foodsFeed, pageSize: collectionSize + 10, mechanism: "memory" });
+ var cache = datajs.cache.createDataCache({ name: "cache", source: foodsFeed, pageSize: collectionSize + 10, mechanism: "memory" });
cache.readRange(0, collectionSize + 10).then(function (data) {
var expectedCount = data.value ? data.value.length : 0;
cache.count().then(function (count) {
@@ -55,7 +55,7 @@
djstest.addTest(function dataCacheCountAbortTest() {
// Abort before completion.
- var cache = datajs.createDataCache({ name: "cache", source: foodsFeed });
+ var cache = datajs.cache.createDataCache({ name: "cache", source: foodsFeed });
var item = cache.count().then(thenFailTest, function (err) {
djstest.assertAreEqual(true, err.canceled, "err.aborted is true");
djstest.destroyCacheAndDone(cache);
@@ -87,9 +87,9 @@
}
};
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
cache.clear().then(function () {
- var newCache = datajs.createDataCache(options);
+ var newCache = datajs.cache.createDataCache(options);
resolve(newCache);
}, function (err) {
rejected = true;
@@ -350,7 +350,7 @@
then(function (cache) {
cache.readRange(0, 2).then(function () {
options.source = "HtTp://ExampleURI.cOm/my%20service.svc";
- var newCache = datajs.createDataCache(options);
+ var newCache = datajs.cache.createDataCache(options);
newCache.readRange(0, 2).then(function (data) {
djstest.assertAreEqualDeep(data.value, [1, 2], "Got the expected data from the new cache instance");
newCache.clear().then(function () {
@@ -503,7 +503,7 @@
return null;
}
};
- var cache = datajs.createDataCache({
+ var cache = datajs.cache.createDataCache({
name: "mem", mechanism: "memory", source: "http://www.example.org/service/",
httpClient: httpClient
});
@@ -514,18 +514,18 @@
});
djstest.addTest(function dataCacheDestoryStopsThePrefetcherTest() {
- var oldHttpClientRequest = OData.defaultHttpClient.request;
+ var oldHttpClientRequest = OData.net.defaultHttpClient.request;
var prefetchCount = 0;
var theCache;
- OData.defaultHttpClient.request = function (request, success, error) {
+ OData.net.defaultHttpClient.request = function (request, success, error) {
prefetchCount++;
djstest.assert(prefetchCount <= 3, "Expected prefetch request");
if (prefetchCount === 3) {
theCache.clear().then(function () {
djstest.assertAreEqual(prefetchCount, 3, "cache.clear() stopped the prefetcher");
djstest.done();
- OData.defaultHttpClient.request = oldHttpClientRequest;
+ OData.net.defaultHttpClient.request = oldHttpClientRequest;
}, thenFailTest);
return {
abort: function () { }
@@ -541,7 +541,7 @@
cache.readRange(0, 0).then(null, thenFailTest);
});
} catch (e) {
- OData.defaultHttpClient.request = oldHttpClientRequest;
+ OData.net.defaultHttpClient.request = oldHttpClientRequest;
djstest.fail("Exception thrown, prefetchSize: " + tests[count] + " error: " + e.message);
djstest.done();
}
@@ -675,53 +675,53 @@
var cache;
// Verify the defaults.
- cache = datajs.createDataCache({ name: "name", source: "src" });
+ cache = datajs.cache.createDataCache({ name: "name", source: "src" });
djstest.assertAreEqual(cache.onidle, undefined, "onidle is undefined");
// Verify specific values.
- cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: 3, idle: 123 });
+ cache = datajs.cache.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: 3, idle: 123 });
djstest.assertAreEqual(cache.onidle, 123, "onidle is as specified");
// Verify 0 pageSize
djstest.expectException(function () {
- datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 0, prefetchSize: 3, idle: 123 });
+ datajs.cache.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 0, prefetchSize: 3, idle: 123 });
}, "zero pageSize");
// Verify negative pageSize
djstest.expectException(function () {
- datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: -2, prefetchSize: 3, idle: 123 });
+ datajs.cache.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: -2, prefetchSize: 3, idle: 123 });
}, "negative pageSize");
// Verify NaN pageSize
djstest.expectException(function () {
- cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: "2", prefetchSize: 3, idle: 123 });
+ cache = datajs.cache.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: "2", prefetchSize: 3, idle: 123 });
}, "NaN pageSize");
// Verify NaN cacheSize
djstest.expectException(function () {
- cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: "1", pageSize: 2, prefetchSize: 3, idle: 123 });
+ cache = datajs.cache.createDataCache({ name: "name", source: "src", cacheSize: "1", pageSize: 2, prefetchSize: 3, idle: 123 });
}, "NaN cacheSize");
// Verify NaN prefetchSize
djstest.expectException(function () {
- cache = datajs.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: "3", idle: 123 });
+ cache = datajs.cache.createDataCache({ name: "name", source: "src", cacheSize: 1, pageSize: 2, prefetchSize: "3", idle: 123 });
}, "NaN prefetchSize");
// Verify undefined name
djstest.expectException(function () {
- datajs.createDataCache({ source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
+ datajs.cache.createDataCache({ source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
}, "undefined name");
// Verify null name
djstest.expectException(function () {
- datajs.createDataCache({ name: null, source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
+ datajs.cache.createDataCache({ name: null, source: "src", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
}, "null name");
// Verify undefined source
djstest.expectException(function () {
- datajs.createDataCache({ name: "name", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
+ datajs.cache.createDataCache({ name: "name", cacheSize: 1, pageSize: 1, prefetchSize: 3, idle: 123 });
}, "undefined source");
djstest.done();
@@ -747,7 +747,7 @@
}
};
- var cache = datajs.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
+ var cache = datajs.cache.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
cache.count().then(function () {
cache.readRange(0, 5).then(function () {
djstest.done();
@@ -760,13 +760,13 @@
var failures = ["read-settings", "write-settings", "v2"];
var failureIndex = 0;
- var originalStore = datajs.createStore;
+ var originalStore = datajs.store.createStore;
var restoreStore = function () {
- datajs.createStore = originalStore;
+ datajs.store.createStore = originalStore;
};
var storeError = { message: "cacheInitializationFailTest error" };
- datajs.createStore = function (name, mechanism) {
+ datajs.store.createStore = function (name, mechanism) {
return {
addOrUpdate: function (key, value, successCallback, errorCallback) {
if (failures[failureIndex] === "write-settings") {
@@ -795,7 +795,7 @@
var nextFailure = function () {
djstest.log("Failure mode: " + failures[failureIndex]);
- var cache = datajs.createDataCache({ name: "name", source: "foo", mechanism: "memory", pageSize: 10 });
+ var cache = datajs.cache.createDataCache({ name: "name", source: "foo", mechanism: "memory", pageSize: 10 });
try {
// The first readRange should succeed, because the data cache isn't really initialized at this time.
cache.readRange(1, 2).then(djstest.failAndDoneCallback("No function should succeed"), function (err) {
@@ -854,7 +854,7 @@
}
};
- var cache = datajs.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
+ var cache = datajs.cache.createDataCache({ name: "name", source: cacheSource, mechanism: "memory", pageSize: 10 });
cache.readRange(0, 5).then(function () {
djstest.fail("unexpected call to then success");
djstest.done();
@@ -951,20 +951,20 @@
var complete = false;
window.MockHttpClient.clear().addResponse("*", { statusCode: 500, body: "server error" });
window.MockHttpClient.async = true;
- var savedClient = OData.defaultHttpClient;
- OData.defaultHttpClient = window.MockHttpClient;
+ var savedClient = OData.net.defaultHttpClient;
+ OData.net.defaultHttpClient = window.MockHttpClient;
cache.toObservable().Subscribe(function (item) {
- OData.defaultHttpClient = savedClient;
+ OData.net.defaultHttpClient = savedClient;
djstest.fail("Unexpected call to OnNext");
}, function (err) {
djstest.assert(complete === false, "complete === false");
djstest.assert(err, "err defined");
- OData.defaultHttpClient = savedClient;
+ OData.net.defaultHttpClient = savedClient;
complete = true;
djstest.done();
}, function (complete) {
djstest.fail("Unexpected call to complete. Error handler should be called.");
- OData.defaultHttpClient = savedClient;
+ OData.net.defaultHttpClient = savedClient;
complete = true;
djstest.done();
});
@@ -975,7 +975,7 @@
djstest.addTest(function createDeferredTest() {
// Verify basic use of deferred object.
- var deferred = datajs.createDeferred();
+ var deferred = datajs.deferred.createDeferred();
deferred.then(function (val1, val2) {
djstest.assertAreEqual(val1, 1, "val1 is as specified");
djstest.assertAreEqual(val2, 2, "val2 is as specified");
@@ -986,7 +986,7 @@
djstest.addTest(function deferredThenTest() {
// Verify then registration and chaining.
- var deferred = datajs.createDeferred();
+ var deferred = datajs.deferred.createDeferred();
deferred.then(function (val1, val2) {
djstest.assertAreEqual(val1, 1, "val1 is as specified");
djstest.assertAreEqual(val2, 2, "val2 is as specified");
@@ -996,7 +996,7 @@
djstest.assert(foo !== "foo", "argument for chained 'then' is *not* result of previous call");
djstest.assert(foo === 1, "argument for chained 'then' is same as for previous call");
- var other = datajs.createDeferred();
+ var other = datajs.deferred.createDeferred();
other.then(null, function (err, msg) {
djstest.assertAreEqual("error", err, "err is as specified");
djstest.assertAreEqual("message", msg, "msg is as specified");
@@ -1007,7 +1007,7 @@
djstest.assertAreEqual("error", err, "err is as specified");
djstest.assertAreEqual("message", msg, "msg is as specified");
- var multiple = datajs.createDeferred();
+ var multiple = datajs.deferred.createDeferred();
var count = 0;
// See Compatibility Note A in DjsDeferred remarks.
@@ -1037,12 +1037,12 @@
djstest.addTest(function deferredResolveTest() {
// Resolve with no arguments.
- var deferred = datajs.createDeferred();
+ var deferred = datajs.deferred.createDeferred();
deferred.then(function (arg) {
djstest.assertAreEqual(arg, undefined, "resolve with no args shows up as undefined");
// Resolve with no callbacks.
- var other = datajs.createDeferred();
+ var other = datajs.deferred.createDeferred();
other.resolve();
djstest.done();
});
@@ -1052,12 +1052,12 @@
djstest.addTest(function deferredRejectTest() {
// Resolve with no arguments.
- var deferred = datajs.createDeferred();
+ var deferred = datajs.deferred.createDeferred();
deferred.then(null, function (arg) {
djstest.assertAreEqual(arg, undefined, "reject with no args shows up as undefined");
// Resolve with no callbacks.
- var other = datajs.createDeferred();
+ var other = datajs.deferred.createDeferred();
other.reject();
djstest.done();
});
@@ -1079,7 +1079,7 @@
var i, len;
for (i = 0, len = tests.length; i < len; i++) {
var test = tests[i];
- djstest.assertAreEqual(datajs.estimateSize(test.i), test.e);
+ djstest.assertAreEqual(datajs.cache.estimateSize(test.i), test.e);
}
djstest.done();
});
@@ -1099,7 +1099,7 @@
}
});
- var cache = datajs.createDataCache({
+ var cache = datajs.cache.createDataCache({
name: "cacheOptionsTunnel",
source: "http://foo-bar/",
user: "the-user",
@@ -1121,7 +1121,7 @@
djstest.addTest(function dataCacheHandlesFullStoreTest() {
var TestStore = function (name) {
- var that = new window.datajs.MemoryStore(name);
+ var that = new window.datajs.store.MemoryStore(name);
that.addOrUpdate = function (key, value, success, error) {
if (key === "__settings") {
window.setTimeout(function () {
@@ -1160,14 +1160,14 @@
}
};
- var originalCreateStore = window.datajs.createStore;
+ var originalCreateStore = window.datajs.store.createStore;
- window.datajs.createStore = function (name, mechanism) {
+ window.datajs.store.createStore = function (name, mechanism) {
return TestStore(name);
};
try {
- var cache = datajs.createDataCache({
+ var cache = datajs.cache.createDataCache({
name: "cache",
pageSize: 5,
prefetchSize: 0,
@@ -1175,7 +1175,7 @@
mechanism: "teststore"
});
} finally {
- window.datajs.createStore = originalCreateStore;
+ window.datajs.store.createStore = originalCreateStore;
}
cache.readRange(0, 5).then(function (data) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/tests/odata-qunit-tests.htm
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-qunit-tests.htm b/datajs/tests/odata-qunit-tests.htm
index cbc154b..21cceae 100644
--- a/datajs/tests/odata-qunit-tests.htm
+++ b/datajs/tests/odata-qunit-tests.htm
@@ -83,9 +83,8 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
<script type="text/javascript" src="odata-handler-tests.js"></script>
<script type="text/javascript" src="odata-net-tests.js"></script>
<script type="text/javascript" src="odata-batch-tests.js"></script>
-
-<!--SK TODO enable <script type="text/javascript" src="cache-tests.js"></script>-->
-<!--SK TODO enable <script type="text/javascript" src="store-tests.js"></script>-->
+ <script type="text/javascript" src="cache-tests.js"></script>
+ <script type="text/javascript" src="store-tests.js"></script>
<!--SK TODO enable <script type="text/javascript" src="store-indexeddb-tests.js"></script>-->
</head>
<body>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/ebcc1e00/datajs/tests/store-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/store-tests.js b/datajs/tests/store-tests.js
index 1a05849..39a7492 100644
--- a/datajs/tests/store-tests.js
+++ b/datajs/tests/store-tests.js
@@ -78,7 +78,7 @@
module("Unit", {
mechanism: mechanism,
createStore: function (name) {
- var store = datajs.createStore(name + "_" + this.mechanism, this.mechanism);
+ var store = datajs.store.createStore(name + "_" + this.mechanism, this.mechanism);
this.stores.push(store);
return store;
},
@@ -641,7 +641,7 @@
for (i = 0, len = tests.length; i < len; i++) {
try {
var test = tests[i];
- var store = datajs.createStore("testStore" + i, tests[i].mechanism);
+ var store = datajs.store.createStore("testStore" + i, tests[i].mechanism);
if (!test.exception) {
djstest.assertAreEqual(store.mechanism, test.expected, "Created store of the expected mechanism");
@@ -672,7 +672,7 @@
];
for (var i in tests) {
- var store = datajs.createStore("best store ever " + i, tests[i]);
+ var store = datajs.store.createStore("best store ever " + i, tests[i]);
djstest.assertAreEqual(store.mechanism, bestMechanism, "Mechanisms match");
}
} else {