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/27 13:39:38 UTC
git commit: [OLINGO-238] adopt odata-perf-tests.html
odata-read-crossdomain-functional-tests.html
odata-metadata-awareness-functional-tests.html
odata-read-functional-tests.html odata-request-functional-tests.html
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master 453e686e0 -> 3f455a1d7
[OLINGO-238] adopt odata-perf-tests.html odata-read-crossdomain-functional-tests.html odata-metadata-awareness-functional-tests.html odata-read-functional-tests.html odata-request-functional-tests.html
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/3f455a1d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/3f455a1d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/3f455a1d
Branch: refs/heads/master
Commit: 3f455a1d71e2748f3545fc08a38767764a8627a2
Parents: 453e686
Author: Sven Kobler <sv...@sap.com>
Authored: Tue May 27 13:39:20 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Tue May 27 13:39:20 2014 +0200
----------------------------------------------------------------------
.../odata-metadata-awareness-functional-tests.html | 2 +-
datajs/tests/odata-perf-tests.html | 6 +++---
datajs/tests/odata-perf-tests.js | 14 +++++++-------
.../odata-read-crossdomain-functional-tests.html | 6 +++---
.../tests/odata-read-crossdomain-functional-tests.js | 10 +++++-----
datajs/tests/odata-read-functional-tests.html | 6 +++---
datajs/tests/odata-read-functional-tests.js | 6 +++---
datajs/tests/odata-request-functional-tests.html | 6 +++---
8 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/datajs/tests/odata-metadata-awareness-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-metadata-awareness-functional-tests.html b/datajs/tests/odata-metadata-awareness-functional-tests.html
index 723cff6..7c40fed 100644
--- a/datajs/tests/odata-metadata-awareness-functional-tests.html
+++ b/datajs/tests/odata-metadata-awareness-functional-tests.html
@@ -30,7 +30,7 @@
<script type="text/javascript" src="../src/odata-metadata.js"></script>
<script type="text/javascript" src="../src/odata-batch.js"></script>
<script type="text/javascript" src="../src/odata.js"></script>-->
-<script type="text/javascript" src="../build/datajs-0.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-0.0.0.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="odata-metadata-awareness-functional-tests.js"></script>
</head>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/datajs/tests/odata-perf-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-perf-tests.html b/datajs/tests/odata-perf-tests.html
index bdcbfb5..bb1921e 100644
--- a/datajs/tests/odata-perf-tests.html
+++ b/datajs/tests/odata-perf-tests.html
@@ -15,7 +15,7 @@
window.TestSynchronizer.init(QUnit);
</script>
- <script type="text/javascript" src="../src/datajs.js"></script>
+ <!--<script type="text/javascript" src="../src/datajs.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>
<script type="text/javascript" src="../src/xml.js"></script>
@@ -29,8 +29,8 @@
<script type="text/javascript" src="../src/odata-atom.js"></script>
<script type="text/javascript" src="../src/odata-metadata.js"></script>
<script type="text/javascript" src="../src/odata-batch.js"></script>
- <script type="text/javascript" src="../src/odata.js"></script>
-
+ <script type="text/javascript" src="../src/odata.js"></script>-->
+ <script type="text/javascript" src="../build/datajs-0.0.0.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="common/Instrument.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/datajs/tests/odata-perf-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-perf-tests.js b/datajs/tests/odata-perf-tests.js
index f57bcc0..f873d6e 100644
--- a/datajs/tests/odata-perf-tests.js
+++ b/datajs/tests/odata-perf-tests.js
@@ -11,7 +11,7 @@
var timedHttpClient = {
duration: 0,
- provider: OData.defaultHttpClient,
+ provider: OData.net.defaultHttpClient,
request: function (request, success, error) {
var startTime = new Date();
return timedHttpClient.provider.request(request, function () {
@@ -40,11 +40,11 @@
});
},
teardown: function () {
- OData.defaultHttpClient = timedHttpClient.provider;
+ OData.net.defaultHttpClient = timedHttpClient.provider;
}
});
- OData.defaultHttpClient.enableJsonpCallback = true;
+ 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 });
@@ -58,7 +58,7 @@
}, unexpectedErrorHandler, undefined, undefined, metadata);
};
- OData.defaultHttpClient = timedHttpClient;
+ OData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
OData.read(params.service + "$metadata", measureRead, unexpectedErrorHandler, OData.metadataHandler);
@@ -151,7 +151,7 @@
}, unexpectedErrorHandler, undefined, undefined, metadata);
};
- OData.defaultHttpClient = timedHttpClient;
+ OData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
@@ -181,7 +181,7 @@
});
};
- OData.defaultHttpClient = timedHttpClient;
+ OData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
@@ -215,7 +215,7 @@
});
};
- OData.defaultHttpClient = timedHttpClient;
+ OData.net.defaultHttpClient = timedHttpClient;
djstest.assertsExpected(1);
if (params.metadata) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/datajs/tests/odata-read-crossdomain-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-read-crossdomain-functional-tests.html b/datajs/tests/odata-read-crossdomain-functional-tests.html
index f3e18a6..4f8ec07 100644
--- a/datajs/tests/odata-read-crossdomain-functional-tests.html
+++ b/datajs/tests/odata-read-crossdomain-functional-tests.html
@@ -16,7 +16,7 @@
window.TestSynchronizer.init(QUnit);
</script>
- <script type="text/javascript" src="../src/datajs.js"></script>
+ <!--<script type="text/javascript" src="../src/datajs.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>
<script type="text/javascript" src="../src/xml.js"></script>
@@ -39,8 +39,8 @@
<script type="text/javascript" src="../src/deferred.js"></script>
<script type="text/javascript" src="../src/cache-source.js"></script>
- <script type="text/javascript" src="../src/cache.js"></script>
-
+ <script type="text/javascript" src="../src/cache.js"></script>-->
+ <script type="text/javascript" src="../build/datajs-0.0.0.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="odata-read-crossdomain-functional-tests.js"></script>
</head>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/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 7d1a013..f35b279 100644
--- a/datajs/tests/odata-read-crossdomain-functional-tests.js
+++ b/datajs/tests/odata-read-crossdomain-functional-tests.js
@@ -44,11 +44,11 @@
module("CrossDomain", {
setup: function () {
- this.oldEnableJsonpCallback = OData.defaultHttpClient.enableJsonpCallback;
- OData.defaultHttpClient.enableJsonpCallback = true;
+ this.oldEnableJsonpCallback = OData.net.defaultHttpClient.enableJsonpCallback;
+ OData.net.defaultHttpClient.enableJsonpCallback = true;
},
teardown: function () {
- OData.defaultHttpClient.enableJsonpCallback = this.oldEnableJsonpCallback;
+ OData.net.defaultHttpClient.enableJsonpCallback = this.oldEnableJsonpCallback;
}
});
@@ -104,8 +104,8 @@
var dataCacheReadRangeSingleTest = function (params) {
var options = { name: "cache", source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize, cacheSize: params.cacheSize };
- OData.defaultHttpClient.enableJsonpCallback = true;
- var cache = datajs.createDataCache(options);
+ OData.net.defaultHttpClient.enableJsonpCallback = true;
+ var cache = datajs.cache.createDataCache(options);
cache.readRange(params.skip, params.take).then(function (data) {
validateExpectedRange(cache, data, params.feed, params.skip, params.take);
}, unexpectedErrorHandler);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/datajs/tests/odata-read-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-read-functional-tests.html b/datajs/tests/odata-read-functional-tests.html
index 0a60a3a..1eaffe7 100644
--- a/datajs/tests/odata-read-functional-tests.html
+++ b/datajs/tests/odata-read-functional-tests.html
@@ -16,7 +16,7 @@
window.TestSynchronizer.init(QUnit);
</script>
- <script type="text/javascript" src="../src/datajs.js"></script>
+ <!--<script type="text/javascript" src="../src/datajs.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>
<script type="text/javascript" src="../src/xml.js"></script>
@@ -30,8 +30,8 @@
<script type="text/javascript" src="../src/odata-atom.js"></script>
<script type="text/javascript" src="../src/odata-metadata.js"></script>
<script type="text/javascript" src="../src/odata-batch.js"></script>
- <script type="text/javascript" src="../src/odata.js"></script>
-
+ <script type="text/javascript" src="../src/odata.js"></script>-->
+ <script type="text/javascript" src="../build/datajs-0.0.0.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="odata-read-functional-tests.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/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 ad2a9ea..5343a6e 100644
--- a/datajs/tests/odata-read-functional-tests.js
+++ b/datajs/tests/odata-read-functional-tests.js
@@ -57,7 +57,7 @@
djstest.wait(function (done) {
$.post(service + "ResetData", done);
});
- OData.jsonHandler.recognizeDates = false;
+ OData.json.jsonHandler.recognizeDates = false;
}
});
@@ -534,7 +534,7 @@
djstest.addFullTest(true, function metadataElementExtensionsTest() {
var csdlFile = "./endpoints/CustomAnnotations.xml";
var modifyTypeHttpClient = {};
- var originalHttpClient = OData.defaultHttpClient;
+ var originalHttpClient = 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
@@ -545,7 +545,7 @@
}, error);
}
- OData.defaultHttpClient = modifyTypeHttpClient;
+ OData.net.defaultHttpClient = modifyTypeHttpClient;
OData.read({ requestUri: csdlFile, headers: { Accept: "text/xml"} },
function (data) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/3f455a1d/datajs/tests/odata-request-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-request-functional-tests.html b/datajs/tests/odata-request-functional-tests.html
index 4298493..399c379 100644
--- a/datajs/tests/odata-request-functional-tests.html
+++ b/datajs/tests/odata-request-functional-tests.html
@@ -15,7 +15,7 @@
window.TestSynchronizer.init(QUnit);
</script>
- <script type="text/javascript" src="../src/datajs.js"></script>
+ <!--<script type="text/javascript" src="../src/datajs.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>
<script type="text/javascript" src="../src/xml.js"></script>
@@ -29,8 +29,8 @@
<script type="text/javascript" src="../src/odata-atom.js"></script>
<script type="text/javascript" src="../src/odata-metadata.js"></script>
<script type="text/javascript" src="../src/odata-batch.js"></script>
- <script type="text/javascript" src="../src/odata.js"></script>
-
+ <script type="text/javascript" src="../src/odata.js"></script>-->
+ <script type="text/javascript" src="../build/datajs-0.0.0.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="odata-request-functional-tests.js"></script>