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/26 15:08:42 UTC
git commit: [OLINGO-238] adopt datajs-cache-long-haul-tests.html,
datajs-startup-perf-test.html,
datajs-cache-large-collection-functional-tests.html,
odata-batch-functional-tests.html, odata-cache-filter-functional-tests.html
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master 7cd1b6bb7 -> 9b8b0e461
[OLINGO-238] adopt datajs-cache-long-haul-tests.html,datajs-startup-perf-test.html,datajs-cache-large-collection-functional-tests.html,odata-batch-functional-tests.html,odata-cache-filter-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/9b8b0e46
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/9b8b0e46
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/9b8b0e46
Branch: refs/heads/master
Commit: 9b8b0e461d73c48bcc63d8a27109a5f6ec933c68
Parents: 7cd1b6b
Author: Sven Kobler <sv...@sap.com>
Authored: Mon May 26 15:08:25 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Mon May 26 15:08:25 2014 +0200
----------------------------------------------------------------------
.gitignore | 0
datajs/Gruntfile.js | 13 ++++++-------
datajs/package.json | 1 +
datajs/tests/common/ObservableHttpClient.js | 2 +-
...ajs-cache-large-collection-functional-tests.html | 8 +++++---
...atajs-cache-large-collection-functional-tests.js | 8 ++++----
datajs/tests/datajs-cache-long-haul-tests.html | 7 ++++---
datajs/tests/datajs-startup-perf-test.html | 3 ++-
datajs/tests/odata-batch-functional-tests.html | 10 +++++-----
datajs/tests/odata-batch-functional-tests.js | 6 +++---
.../tests/odata-cache-filter-functional-tests.html | 5 +++--
datajs/tests/odata-cache-filter-functional-tests.js | 16 ++++++++--------
datajs/tests/odata-cache-fperf-tests.html | 5 +++--
datajs/tests/odata-cache-fperf-tests.js | 8 ++++----
datajs/tests/odata-cache-functional-tests.html | 6 +++---
datajs/tests/odata-cache-functional-tests.js | 4 ++--
datajs/tests/odata-cache-rx-functional-tests.html | 5 +++--
datajs/tests/odata-cache-rx-functional-tests.js | 2 +-
datajs/tests/odata-fuzz.html | 4 +++-
datajs/tests/odata-links-functional-tests.html | 5 +++--
.../odata-metadata-awareness-functional-tests.html | 6 +++---
datajs/tests/odata-qunit-tests.htm | 2 +-
22 files changed, 68 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/Gruntfile.js
----------------------------------------------------------------------
diff --git a/datajs/Gruntfile.js b/datajs/Gruntfile.js
index 853c53b..2b7a108 100644
--- a/datajs/Gruntfile.js
+++ b/datajs/Gruntfile.js
@@ -14,25 +14,24 @@ module.exports = function(grunt) {
browserifyOptions: {
} ,
bundleOptions: {
- debug: true
+ /*debug: true*/
},
}
}
},
- /*
uglify: {
options: {
- banner: '<%= banner %>',
+ /*banner: '<%= banner %>',*/
sourceMap : true,
sourceMapName : 'build/<%= filename %>.map',
sourceMapIncludeSources :true,
- --sourceMapIn : 'build/<%= filename %>.split_map',--
+ /*--sourceMapIn : 'build/<%= filename %>.split_map',*/
},
build: {
src: 'build/<%= filename %>.js',
dest: 'build/<%= filename %>.min.js'
}
- },*/
+ },
copy: {
saveOrig : {
files: [
@@ -110,7 +109,7 @@ module.exports = function(grunt) {
// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-browserify');
- //grunt.loadNpmTasks('grunt-contrib-uglify');
+ grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks("grunt-connect-proxy");
grunt.loadNpmTasks("grunt-contrib-connect");
@@ -118,7 +117,7 @@ module.exports = function(grunt) {
// Default task.
- grunt.registerTask('build', ['browserify:datajs', 'copy:toDemo']);
+ grunt.registerTask('build', ['browserify:datajs', 'copy:toDemo', "uglify:build"]);
grunt.registerTask('run', ['configureProxies', 'connect:demo']);
grunt.registerTask('test', ['configureProxies', 'connect:test']);
};
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/package.json
----------------------------------------------------------------------
diff --git a/datajs/package.json b/datajs/package.json
index 40579d0..8efc55d 100644
--- a/datajs/package.json
+++ b/datajs/package.json
@@ -22,6 +22,7 @@
"grunt-connect-proxy": "^0.1.10",
"grunt-contrib-connect": "^0.7.1",
"grunt-contrib-copy": "^0.5.0",
+ "grunt-contrib-uglify": "^0.4.0",
"grunt-mocha": "^0.4.10",
"grunt-open": "^0.2.3"
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/common/ObservableHttpClient.js
----------------------------------------------------------------------
diff --git a/datajs/tests/common/ObservableHttpClient.js b/datajs/tests/common/ObservableHttpClient.js
index 2b7fe98..5fdd5eb 100644
--- a/datajs/tests/common/ObservableHttpClient.js
+++ b/datajs/tests/common/ObservableHttpClient.js
@@ -31,7 +31,7 @@
(function (window, undefined) {
var ObservableHttpClient = function (provider) {
- this.provider = provider ? provider : OData.defaultHttpClient;
+ this.provider = provider ? provider : OData.net.defaultHttpClient;
};
ObservableHttpClient.prototype.newSession = function () {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/datajs-cache-large-collection-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/datajs-cache-large-collection-functional-tests.html b/datajs/tests/datajs-cache-large-collection-functional-tests.html
index bf5cad3..8fc4b30 100644
--- a/datajs/tests/datajs-cache-large-collection-functional-tests.html
+++ b/datajs/tests/datajs-cache-large-collection-functional-tests.html
@@ -14,8 +14,9 @@
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</script>
-
- <script type="text/javascript" src="../src/datajs.js"></script>
+ <script type="text/javascript" src="../build/datajs-0.0.0.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>
@@ -36,12 +37,13 @@
<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="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="datajs-cache-large-collection-functional-tests.js"></script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/datajs-cache-large-collection-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/datajs-cache-large-collection-functional-tests.js b/datajs/tests/datajs-cache-large-collection-functional-tests.js
index fd4e826..3523575 100644
--- a/datajs/tests/datajs-cache-large-collection-functional-tests.js
+++ b/datajs/tests/datajs-cache-large-collection-functional-tests.js
@@ -62,7 +62,7 @@
module("Functional", {
setup: function () {
this.observableHttpClient = new ObservableHttpClient();
- OData.defaultHttpClient = this.observableHttpClient;
+ OData.net.defaultHttpClient = this.observableHttpClient;
this.caches = [];
var that = this;
@@ -72,7 +72,7 @@
},
teardown: function () {
- OData.defaultHttpClient = this.observableHttpClient.provider;
+ OData.net.defaultHttpClient = this.observableHttpClient.provider;
var clearActions = [];
var that = this;
@@ -111,7 +111,7 @@
mechanism: params.mechanism, cacheSize: params.cacheSize
};
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
this.caches.push({ name: options.name,
cache: cache
});
@@ -144,7 +144,7 @@
mechanism: params.mechanism, cacheSize: params.cacheSize
};
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
this.caches.push({ name: options.name, cache: cache });
var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/datajs-cache-long-haul-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/datajs-cache-long-haul-tests.html b/datajs/tests/datajs-cache-long-haul-tests.html
index 39eda48..98b3cf0 100644
--- a/datajs/tests/datajs-cache-long-haul-tests.html
+++ b/datajs/tests/datajs-cache-long-haul-tests.html
@@ -7,7 +7,8 @@
<meta http-equiv="expires" content="-1" />
<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.js"></script>
- <script type="text/javascript" src="../src/datajs.js"></script>
+ <script type="text/javascript" src="../build/datajs-0.0.0.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>
<script type="text/javascript" src="../src/odata-utils.js"></script>
@@ -26,7 +27,7 @@
<script type="text/javascript" src="../src/store.js"></script>
<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="common/djstest.js"></script>
<script type="text/javascript" src="common/Instrument.js"></script>
<script type="text/javascript">
@@ -121,7 +122,7 @@
goalRunTimeMS = hourMS * inputHours;
}
OData.defaultHttpClient.enableJsonpCallback = true;
- cache = datajs.createDataCache({ name: "cache" + new Date().valueOf(), source: testFeed, pageSize: 5, prefetchSize: prefetchSize });
+ cache = datajs.cache.createDataCache({ name: "cache" + new Date().valueOf(), source: testFeed, pageSize: 5, prefetchSize: prefetchSize });
failureCount = 0;
iterationsRun = 0;
currentRunTimeMS = 0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/datajs-startup-perf-test.html
----------------------------------------------------------------------
diff --git a/datajs/tests/datajs-startup-perf-test.html b/datajs/tests/datajs-startup-perf-test.html
index 465ee01..58534ed 100644
--- a/datajs/tests/datajs-startup-perf-test.html
+++ b/datajs/tests/datajs-startup-perf-test.html
@@ -38,7 +38,8 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
var durationLimit = 500;
var memorySizeDeltaLimit = 5000000;
- var filename = "datajs-1.1.0.min.js";
+ //var filename = "datajs-0.0.0.min.js";
+ var filename = "../build/datajs-0.0.0.min.js";
var getBrowserMemorySize = Instrument.getBrowserMemorySize;
$.ajax({
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-batch-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-batch-functional-tests.html b/datajs/tests/odata-batch-functional-tests.html
index c2c3759..eaff924 100644
--- a/datajs/tests/odata-batch-functional-tests.html
+++ b/datajs/tests/odata-batch-functional-tests.html
@@ -15,11 +15,11 @@
window.TestSynchronizer.init(QUnit);
</script>
- <script type="text/javascript" src="../src/datajs.js"></script>
+ <script type="text/javascript" src="../build/datajs-0.0.0.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>
-
- <script type="text/javascript" src="../src/odata-utils.js"></script>
+ <script type="text/javascript" src="../src/xml.js"></script>-->
+ <!--<script type="text/javascript" src="../src/odata-utils.js"></script>
<script type="text/javascript" src="../src/odata-handler.js"></script>
<script type="text/javascript" src="../src/odata-gml.js"></script>
<script type="text/javascript" src="../src/odata-xml.js"></script>
@@ -29,7 +29,7 @@
<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="common/djstest.js"></script>
<script type="text/javascript" src="odata-batch-functional-tests.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/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 b30e52c..dedcf8e 100644
--- a/datajs/tests/odata-batch-functional-tests.js
+++ b/datajs/tests/odata-batch-functional-tests.js
@@ -33,7 +33,7 @@
djstest.assertAreEqual(data.__batchResponses.length, batchRequests.length, "Verify batch response count");
verifyBatchResponses(batchRequests, elementTypes, serviceRoot, data.__batchResponses, done);
},
- unexpectedErrorHandler, OData.batchHandler);
+ unexpectedErrorHandler, OData.batch.batchHandler);
};
var verifyBatchResponses = function (batchRequests, elementTypes, serviceRoot, batchResponses, done) {
@@ -234,7 +234,7 @@
function (data, response) {
djstest.assert(response.body.indexOf("An error occurred while processing this request.") > -1, "Verify response error message");
djstest.done();
- }, unexpectedErrorHandler, OData.batchHandler
+ }, unexpectedErrorHandler, OData.batch.batchHandler
);
}, "Update outside changeset");
@@ -265,6 +265,6 @@
batchRequests.splice(3, 1);
batchResponses.splice(3, 1);
verifyBatchResponses(batchRequests, ["entry", null], service, batchResponses, function () { djstest.done(); });
- }, unexpectedErrorHandler, OData.batchHandler);
+ }, unexpectedErrorHandler, OData.batch.batchHandler);
}, "Retrieve inside changeset");
})(this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-cache-filter-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-filter-functional-tests.html b/datajs/tests/odata-cache-filter-functional-tests.html
index 9c5da7e..21a8cb4 100644
--- a/datajs/tests/odata-cache-filter-functional-tests.html
+++ b/datajs/tests/odata-cache-filter-functional-tests.html
@@ -15,7 +15,8 @@
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</script>
-
+ <script type="text/javascript" src="../build/datajs-0.0.0.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>
@@ -40,7 +41,7 @@
<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="common/djstest.js"></script>
<script type="text/javascript" src="common/CacheOracle.js"></script>
<script type="text/javascript" src="common/ObservableHttpClient.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/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 b11cad3..42d03eb 100644
--- a/datajs/tests/odata-cache-filter-functional-tests.js
+++ b/datajs/tests/odata-cache-filter-functional-tests.js
@@ -207,7 +207,7 @@
djstest.assertsExpected(2);
var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);
var session = this.observableHttpClient.newSession();
validateFilterResultsAndRequests(params.feed, cache, params.index, params.count, params.predicate, function () { djstest.destroyCacheAndDone(cache) }, params.backwards, session, cacheOracle);
@@ -217,7 +217,7 @@
djstest.assertsExpected(3);
var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);
var session = this.observableHttpClient.newSession();
@@ -232,7 +232,7 @@
djstest.assertsExpected(2);
var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
var firstfilter = function (finished) {
validateFilterResultsAndRequests(params.feed, cache, params.firstIndex, params.firstCount, params.predicate, finished, params.backwards);
@@ -251,7 +251,7 @@
djstest.assertsExpected(4);
var options = { name: "cache" + new Date().valueOf(), source: params.feed, pageSize: params.pageSize, prefetchSize: params.prefetchSize };
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
var cacheOracle = new CacheOracle(params.feed, params.pageSize, itemsInCollection);
var session = this.observableHttpClient.newSession();
@@ -277,11 +277,11 @@
module("Functional", {
setup: function () {
this.observableHttpClient = new ObservableHttpClient();
- OData.defaultHttpClient = this.observableHttpClient;
+ OData.net.defaultHttpClient = this.observableHttpClient;
},
teardown: function () {
- OData.defaultHttpClient = this.observableHttpClient.provider;
+ OData.net.defaultHttpClient = this.observableHttpClient.provider;
}
});
@@ -372,7 +372,7 @@
function (params) {
djstest.assertsExpected(1);
var options = { name: "cache" + new Date().valueOf(), source: params.feed };
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
try {
params.backwards ?
cache.filterForward(params.index, params.count, params.predicate).then(function (results) {
@@ -396,7 +396,7 @@
function (params) {
djstest.assertsExpected(1);
var options = { name: "cache" + new Date().valueOf(), source: params.feed };
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
try {
params.backwards ?
cache.filterBack(params.index, params.count, params.predicate).then(function (results) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-cache-fperf-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-fperf-tests.html b/datajs/tests/odata-cache-fperf-tests.html
index 3323199..6775d73 100644
--- a/datajs/tests/odata-cache-fperf-tests.html
+++ b/datajs/tests/odata-cache-fperf-tests.html
@@ -15,7 +15,8 @@
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</script>
-
+ <script type="text/javascript" src="../build/datajs-0.0.0.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,7 +40,7 @@
<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="common/CacheOracle.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/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 441022c..abb4155 100644
--- a/datajs/tests/odata-cache-fperf-tests.js
+++ b/datajs/tests/odata-cache-fperf-tests.js
@@ -8,7 +8,7 @@
var slowHttpClient = {
latency: 750,
- provider: OData.defaultHttpClient,
+ provider: OData.net.defaultHttpClient,
request: function (request, success, error) {
setTimeout(function () {
slowHttpClient.provider.request(request, success, error);
@@ -22,10 +22,10 @@
module("Functional", {
setup: function () {
- OData.defaultHttpClient = slowHttpClient;
+ OData.net.defaultHttpClient = slowHttpClient;
},
teardown: function () {
- OData.defaultHttpClient = slowHttpClient.provider;
+ OData.net.defaultHttpClient = slowHttpClient.provider;
}
});
@@ -44,7 +44,7 @@
/// <param name="threshold">The average read time threshold for test to pass; if not specified, defaults to the slowHttpClient latency</param>
/// <returns>The test function</param>
return function () {
- var cache = datajs.createDataCache({ name: "cache" + new Date().valueOf(), source: source, pageSize: pageSize, prefetchSize: prefetchSize });
+ var cache = datajs.cache.createDataCache({ name: "cache" + new Date().valueOf(), source: source, pageSize: pageSize, prefetchSize: prefetchSize });
var totalTime = 0;
var readCount = 0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-cache-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-functional-tests.html b/datajs/tests/odata-cache-functional-tests.html
index e6f2992..08b07ba 100644
--- a/datajs/tests/odata-cache-functional-tests.html
+++ b/datajs/tests/odata-cache-functional-tests.html
@@ -15,7 +15,7 @@
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</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="common/CacheOracle.js"></script>
<script type="text/javascript" src="common/ObservableHttpClient.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/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 1a65c6f..4d83d46 100644
--- a/datajs/tests/odata-cache-functional-tests.js
+++ b/datajs/tests/odata-cache-functional-tests.js
@@ -322,7 +322,7 @@
};
this.observableHttpClient = new ObservableHttpClient();
- OData.defaultHttpClient = this.observableHttpClient;
+ OData.net.defaultHttpClient = this.observableHttpClient;
this.caches = [];
var that = this;
@@ -332,7 +332,7 @@
},
teardown: function () {
- OData.defaultHttpClient = this.observableHttpClient.provider;
+ OData.net.defaultHttpClient = this.observableHttpClient.provider;
var clearActions = [];
var that = this;
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-cache-rx-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-rx-functional-tests.html b/datajs/tests/odata-cache-rx-functional-tests.html
index 8635ec3..f361371 100644
--- a/datajs/tests/odata-cache-rx-functional-tests.html
+++ b/datajs/tests/odata-cache-rx-functional-tests.html
@@ -14,7 +14,7 @@
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</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>
@@ -38,7 +38,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="common/ODataReadOracle.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-cache-rx-functional-tests.js
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-cache-rx-functional-tests.js b/datajs/tests/odata-cache-rx-functional-tests.js
index cb47982..f9c816c 100644
--- a/datajs/tests/odata-cache-rx-functional-tests.js
+++ b/datajs/tests/odata-cache-rx-functional-tests.js
@@ -60,7 +60,7 @@
djstest.addTest(function (params) {
djstest.assertsExpected(1);
var options = { name: "cache" + new Date().valueOf(), source: params.feedUri, pageSize: params.pageSize, prefetchSize: 0 };
- var cache = datajs.createDataCache(options);
+ var cache = datajs.cache.createDataCache(options);
ODataReadOracle.readJsonAcrossServerPages(params.feedUri, function (collection) {
assertObservables(params.operator(cache.toObservable()), params.operator(window.Rx.Observable.FromArray(collection.value)), function () {
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-fuzz.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-fuzz.html b/datajs/tests/odata-fuzz.html
index 5d9c35d..45ec6b8 100644
--- a/datajs/tests/odata-fuzz.html
+++ b/datajs/tests/odata-fuzz.html
@@ -8,6 +8,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.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>
@@ -31,7 +32,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">
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-links-functional-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-links-functional-tests.html b/datajs/tests/odata-links-functional-tests.html
index 95b0d36..685c32e 100644
--- a/datajs/tests/odata-links-functional-tests.html
+++ b/datajs/tests/odata-links-functional-tests.html
@@ -15,7 +15,7 @@
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</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,7 +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-links-functional-tests.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/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 75fb2f2..723cff6 100644
--- a/datajs/tests/odata-metadata-awareness-functional-tests.html
+++ b/datajs/tests/odata-metadata-awareness-functional-tests.html
@@ -14,7 +14,7 @@
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</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-metadata-awareness-functional-tests.js"></script>
</head>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/9b8b0e46/datajs/tests/odata-qunit-tests.htm
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-qunit-tests.htm b/datajs/tests/odata-qunit-tests.htm
index ee182ff..d06b3b8 100644
--- a/datajs/tests/odata-qunit-tests.htm
+++ b/datajs/tests/odata-qunit-tests.htm
@@ -41,7 +41,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
window.TestSynchronizer.init(QUnit);
</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>
<!--SK TODO enable <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>