[OLINGO-541] Move the odatajs branch one directory up
diff --git a/.gitignore b/.gitignore
index 1521c8b..703a43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,20 @@
dist
+.idea
+
+localgrunt.config
+
+# testing copies
+../demo/scripts/odatajs-4.0.0-beta-01*
+
+# build artefacts
+build/
+
+# nodejs temporary objects
+node_modules/
+
+# C.net server temporary objects
+bin/
+obj/
+packages/
+JSLib.suo
+JSLib.csproj.user
diff --git a/odatajs/DEPENDENCIES b/DEPENDENCIES
similarity index 100%
rename from odatajs/DEPENDENCIES
rename to DEPENDENCIES
diff --git a/odatajs/Gruntfile.js b/Gruntfile.js
similarity index 100%
rename from odatajs/Gruntfile.js
rename to Gruntfile.js
diff --git a/odatajs/JSLib.csproj b/JSLib.csproj
similarity index 100%
rename from odatajs/JSLib.csproj
rename to JSLib.csproj
diff --git a/odatajs/JSLib.sln b/JSLib.sln
similarity index 100%
rename from odatajs/JSLib.sln
rename to JSLib.sln
diff --git a/odatajs/LICENSE b/LICENSE
similarity index 100%
rename from odatajs/LICENSE
rename to LICENSE
diff --git a/odatajs/NOTICE b/NOTICE
similarity index 100%
rename from odatajs/NOTICE
rename to NOTICE
diff --git a/odatajs/README.md b/README.md
similarity index 100%
rename from odatajs/README.md
rename to README.md
diff --git a/odatajs/Web.config b/Web.config
similarity index 100%
rename from odatajs/Web.config
rename to Web.config
diff --git a/odatajs/demo/scripts/.gitignore b/demo/scripts/.gitignore
similarity index 100%
rename from odatajs/demo/scripts/.gitignore
rename to demo/scripts/.gitignore
diff --git a/odatajs/demo/scripts/datajs_demo.js b/demo/scripts/datajs_demo.js
similarity index 100%
rename from odatajs/demo/scripts/datajs_demo.js
rename to demo/scripts/datajs_demo.js
diff --git a/odatajs/demo/scripts/tools.js b/demo/scripts/tools.js
similarity index 100%
rename from odatajs/demo/scripts/tools.js
rename to demo/scripts/tools.js
diff --git a/odatajs/demo/tester.html b/demo/tester.html
similarity index 98%
rename from odatajs/demo/tester.html
rename to demo/tester.html
index e4e0832..919810c 100644
--- a/odatajs/demo/tester.html
+++ b/demo/tester.html
@@ -24,7 +24,7 @@
<title>datajs startup perf test</title>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="./../build/lib/odatajs-latest.js"></script>
- <script type="text/javascript" src="./scripts/tools.js" ></script>
+ <script type="text/javascript" src="scripts/tools.js" ></script>
<style type="text/css">
.code{font-family:"Courier New",monospace;font-size:13px;line-height:18px;}
.code ul{list-style:none;margin:0 0 0 1.5em;padding:0;}
diff --git a/odatajs/grunt-config/banner.txt b/grunt-config/banner.txt
similarity index 100%
rename from odatajs/grunt-config/banner.txt
rename to grunt-config/banner.txt
diff --git a/odatajs/grunt-config/custom-tasks/rat.js b/grunt-config/custom-tasks/rat.js
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/rat.js
rename to grunt-config/custom-tasks/rat.js
diff --git a/odatajs/grunt-config/custom-tasks/rat/.gitignore b/grunt-config/custom-tasks/rat/.gitignore
similarity index 61%
rename from odatajs/grunt-config/custom-tasks/rat/.gitignore
rename to grunt-config/custom-tasks/rat/.gitignore
index 3a8704d..74c07ca 100644
--- a/odatajs/grunt-config/custom-tasks/rat/.gitignore
+++ b/grunt-config/custom-tasks/rat/.gitignore
@@ -1,3 +1,3 @@
node_modules
-extern-tools/*
+extern-tools/info.md
!extern-tools/info.md
\ No newline at end of file
diff --git a/odatajs/grunt-config/custom-tasks/rat/extern-tools/info.md b/grunt-config/custom-tasks/rat/extern-tools/info.md
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/rat/extern-tools/info.md
rename to grunt-config/custom-tasks/rat/extern-tools/info.md
diff --git a/odatajs/grunt-config/custom-tasks/rat/package.json b/grunt-config/custom-tasks/rat/package.json
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/rat/package.json
rename to grunt-config/custom-tasks/rat/package.json
diff --git a/odatajs/grunt-config/custom-tasks/rat/readme.md b/grunt-config/custom-tasks/rat/readme.md
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/rat/readme.md
rename to grunt-config/custom-tasks/rat/readme.md
diff --git a/odatajs/grunt-config/custom-tasks/rat/tasks/rat.js b/grunt-config/custom-tasks/rat/tasks/rat.js
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/rat/tasks/rat.js
rename to grunt-config/custom-tasks/rat/tasks/rat.js
diff --git a/odatajs/grunt-config/custom-tasks/sign.js b/grunt-config/custom-tasks/sign.js
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/sign.js
rename to grunt-config/custom-tasks/sign.js
diff --git a/odatajs/grunt-config/custom-tasks/toBrowser.js b/grunt-config/custom-tasks/toBrowser.js
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/toBrowser.js
rename to grunt-config/custom-tasks/toBrowser.js
diff --git a/odatajs/grunt-config/custom-tasks/toBrowser/toBrowser.js b/grunt-config/custom-tasks/toBrowser/toBrowser.js
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/toBrowser/toBrowser.js
rename to grunt-config/custom-tasks/toBrowser/toBrowser.js
diff --git a/odatajs/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js b/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js
similarity index 100%
rename from odatajs/grunt-config/custom-tasks/toBrowser/wrapper-tpl.js
rename to grunt-config/custom-tasks/toBrowser/wrapper-tpl.js
diff --git a/odatajs/grunt-config/nugetpack.nuspec b/grunt-config/nugetpack.nuspec
similarity index 100%
rename from odatajs/grunt-config/nugetpack.nuspec
rename to grunt-config/nugetpack.nuspec
diff --git a/odatajs/grunt-config/rat.js b/grunt-config/rat.js
similarity index 100%
rename from odatajs/grunt-config/rat.js
rename to grunt-config/rat.js
diff --git a/odatajs/grunt-config/release.js b/grunt-config/release.js
similarity index 100%
rename from odatajs/grunt-config/release.js
rename to grunt-config/release.js
diff --git a/odatajs/grunt-config/sign.js b/grunt-config/sign.js
similarity index 100%
rename from odatajs/grunt-config/sign.js
rename to grunt-config/sign.js
diff --git a/odatajs/.gitignore b/odatajs/.gitignore
deleted file mode 100644
index 16af8ff..0000000
--- a/odatajs/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-localgrunt.config
-
-# testing copies
-demo/scripts/odatajs-4.0.0-beta-01*
-
-# build artefacts
-build/
-
-# nodejs temporary objects
-node_modules/
-
-# C.net server temporary objects
-bin/
-obj/
-packages/
-JSLib.suo
-JSLib.csproj.user
diff --git a/odatajs/package.json b/package.json
similarity index 100%
rename from odatajs/package.json
rename to package.json
diff --git a/odatajs/packages.config b/packages.config
similarity index 100%
rename from odatajs/packages.config
rename to packages.config
diff --git a/odatajs/src/index-browser.js b/src/index-browser.js
similarity index 100%
rename from odatajs/src/index-browser.js
rename to src/index-browser.js
diff --git a/odatajs/src/index-node.js b/src/index-node.js
similarity index 100%
rename from odatajs/src/index-node.js
rename to src/index-node.js
diff --git a/odatajs/src/index.js b/src/index.js
similarity index 100%
rename from odatajs/src/index.js
rename to src/index.js
diff --git a/odatajs/src/lib/cache.js b/src/lib/cache.js
similarity index 100%
rename from odatajs/src/lib/cache.js
rename to src/lib/cache.js
diff --git a/odatajs/src/lib/cache/source.js b/src/lib/cache/source.js
similarity index 100%
rename from odatajs/src/lib/cache/source.js
rename to src/lib/cache/source.js
diff --git a/odatajs/src/lib/deferred.js b/src/lib/deferred.js
similarity index 100%
rename from odatajs/src/lib/deferred.js
rename to src/lib/deferred.js
diff --git a/odatajs/src/lib/odata.js b/src/lib/odata.js
similarity index 100%
rename from odatajs/src/lib/odata.js
rename to src/lib/odata.js
diff --git a/odatajs/src/lib/odata/batch.js b/src/lib/odata/batch.js
similarity index 100%
rename from odatajs/src/lib/odata/batch.js
rename to src/lib/odata/batch.js
diff --git a/odatajs/src/lib/odata/handler.js b/src/lib/odata/handler.js
similarity index 100%
rename from odatajs/src/lib/odata/handler.js
rename to src/lib/odata/handler.js
diff --git a/odatajs/src/lib/odata/json.js b/src/lib/odata/json.js
similarity index 100%
rename from odatajs/src/lib/odata/json.js
rename to src/lib/odata/json.js
diff --git a/odatajs/src/lib/odata/metadata.js b/src/lib/odata/metadata.js
similarity index 100%
rename from odatajs/src/lib/odata/metadata.js
rename to src/lib/odata/metadata.js
diff --git a/odatajs/src/lib/odata/net-browser.js b/src/lib/odata/net-browser.js
similarity index 100%
rename from odatajs/src/lib/odata/net-browser.js
rename to src/lib/odata/net-browser.js
diff --git a/odatajs/src/lib/odata/net.js b/src/lib/odata/net.js
similarity index 100%
rename from odatajs/src/lib/odata/net.js
rename to src/lib/odata/net.js
diff --git a/odatajs/src/lib/odata/odatautils.js b/src/lib/odata/odatautils.js
similarity index 100%
rename from odatajs/src/lib/odata/odatautils.js
rename to src/lib/odata/odatautils.js
diff --git a/odatajs/src/lib/store.js b/src/lib/store.js
similarity index 100%
rename from odatajs/src/lib/store.js
rename to src/lib/store.js
diff --git a/odatajs/src/lib/store/dom.js b/src/lib/store/dom.js
similarity index 100%
rename from odatajs/src/lib/store/dom.js
rename to src/lib/store/dom.js
diff --git a/odatajs/src/lib/store/indexeddb.js b/src/lib/store/indexeddb.js
similarity index 100%
rename from odatajs/src/lib/store/indexeddb.js
rename to src/lib/store/indexeddb.js
diff --git a/odatajs/src/lib/store/memory.js b/src/lib/store/memory.js
similarity index 100%
rename from odatajs/src/lib/store/memory.js
rename to src/lib/store/memory.js
diff --git a/odatajs/src/lib/utils.js b/src/lib/utils.js
similarity index 100%
rename from odatajs/src/lib/utils.js
rename to src/lib/utils.js
diff --git a/odatajs/src/lib/xml.js b/src/lib/xml.js
similarity index 100%
rename from odatajs/src/lib/xml.js
rename to src/lib/xml.js
diff --git a/odatajs/test/mocha.opts b/test/mocha.opts
similarity index 100%
rename from odatajs/test/mocha.opts
rename to test/mocha.opts
diff --git a/odatajs/test/test-demo-scenario.js b/test/test-demo-scenario.js
similarity index 100%
rename from odatajs/test/test-demo-scenario.js
rename to test/test-demo-scenario.js
diff --git a/odatajs/test/test-odata-json.js b/test/test-odata-json.js
similarity index 100%
rename from odatajs/test/test-odata-json.js
rename to test/test-odata-json.js
diff --git a/odatajs/test/test-utils.js b/test/test-utils.js
similarity index 100%
rename from odatajs/test/test-utils.js
rename to test/test-utils.js
diff --git a/odatajs/test/test.js b/test/test.js
similarity index 100%
rename from odatajs/test/test.js
rename to test/test.js
diff --git a/odatajs/tests/cache-tests.js b/tests/cache-tests.js
similarity index 100%
rename from odatajs/tests/cache-tests.js
rename to tests/cache-tests.js
diff --git a/odatajs/tests/code/ReflectionDataContext.cs b/tests/code/ReflectionDataContext.cs
similarity index 100%
rename from odatajs/tests/code/ReflectionDataContext.cs
rename to tests/code/ReflectionDataContext.cs
diff --git a/odatajs/tests/code/csdlreader.cs b/tests/code/csdlreader.cs
similarity index 100%
rename from odatajs/tests/code/csdlreader.cs
rename to tests/code/csdlreader.cs
diff --git a/odatajs/tests/code/jsdate.cs b/tests/code/jsdate.cs
similarity index 100%
rename from odatajs/tests/code/jsdate.cs
rename to tests/code/jsdate.cs
diff --git a/odatajs/tests/code/jsonobject.cs b/tests/code/jsonobject.cs
similarity index 100%
rename from odatajs/tests/code/jsonobject.cs
rename to tests/code/jsonobject.cs
diff --git a/odatajs/tests/code/readerutils.cs b/tests/code/readerutils.cs
similarity index 100%
rename from odatajs/tests/code/readerutils.cs
rename to tests/code/readerutils.cs
diff --git a/odatajs/tests/common/CacheVerifier.js b/tests/common/CacheVerifier.js
similarity index 100%
rename from odatajs/tests/common/CacheVerifier.js
rename to tests/common/CacheVerifier.js
diff --git a/odatajs/tests/common/Instrument.js b/tests/common/Instrument.js
similarity index 100%
rename from odatajs/tests/common/Instrument.js
rename to tests/common/Instrument.js
diff --git a/odatajs/tests/common/Instrument.svc b/tests/common/Instrument.svc
similarity index 100%
rename from odatajs/tests/common/Instrument.svc
rename to tests/common/Instrument.svc
diff --git a/odatajs/tests/common/ODataVerifyReader.svc b/tests/common/ODataVerifyReader.svc
similarity index 100%
rename from odatajs/tests/common/ODataVerifyReader.svc
rename to tests/common/ODataVerifyReader.svc
diff --git a/odatajs/tests/common/ObservableHttpClient.js b/tests/common/ObservableHttpClient.js
similarity index 100%
rename from odatajs/tests/common/ObservableHttpClient.js
rename to tests/common/ObservableHttpClient.js
diff --git a/odatajs/tests/common/TestLogger.svc b/tests/common/TestLogger.svc
similarity index 100%
rename from odatajs/tests/common/TestLogger.svc
rename to tests/common/TestLogger.svc
diff --git a/odatajs/tests/common/TestSynchronizerClient.js b/tests/common/TestSynchronizerClient.js
similarity index 100%
rename from odatajs/tests/common/TestSynchronizerClient.js
rename to tests/common/TestSynchronizerClient.js
diff --git a/odatajs/tests/common/common.js b/tests/common/common.js
similarity index 100%
rename from odatajs/tests/common/common.js
rename to tests/common/common.js
diff --git a/odatajs/tests/common/djstest-browser.js b/tests/common/djstest-browser.js
similarity index 100%
rename from odatajs/tests/common/djstest-browser.js
rename to tests/common/djstest-browser.js
diff --git a/odatajs/tests/common/djstest.js b/tests/common/djstest.js
similarity index 100%
rename from odatajs/tests/common/djstest.js
rename to tests/common/djstest.js
diff --git a/odatajs/tests/common/mockHttpClient.js b/tests/common/mockHttpClient.js
similarity index 100%
rename from odatajs/tests/common/mockHttpClient.js
rename to tests/common/mockHttpClient.js
diff --git a/odatajs/tests/common/mockXMLHttpRequest.js b/tests/common/mockXMLHttpRequest.js
similarity index 100%
rename from odatajs/tests/common/mockXMLHttpRequest.js
rename to tests/common/mockXMLHttpRequest.js
diff --git a/odatajs/tests/common/odataVerifyReader.js b/tests/common/odataVerifyReader.js
similarity index 100%
rename from odatajs/tests/common/odataVerifyReader.js
rename to tests/common/odataVerifyReader.js
diff --git a/odatajs/tests/common/rx.js b/tests/common/rx.js
similarity index 100%
rename from odatajs/tests/common/rx.js
rename to tests/common/rx.js
diff --git a/odatajs/tests/e2etest/Test.html b/tests/e2etest/Test.html
similarity index 100%
rename from odatajs/tests/e2etest/Test.html
rename to tests/e2etest/Test.html
diff --git a/odatajs/tests/endpoints/BasicAuthDataService.svc b/tests/endpoints/BasicAuthDataService.svc
similarity index 100%
rename from odatajs/tests/endpoints/BasicAuthDataService.svc
rename to tests/endpoints/BasicAuthDataService.svc
diff --git a/odatajs/tests/endpoints/CustomAnnotations.xml b/tests/endpoints/CustomAnnotations.xml
similarity index 100%
rename from odatajs/tests/endpoints/CustomAnnotations.xml
rename to tests/endpoints/CustomAnnotations.xml
diff --git a/odatajs/tests/endpoints/CustomDataService.svc b/tests/endpoints/CustomDataService.svc
similarity index 100%
rename from odatajs/tests/endpoints/CustomDataService.svc
rename to tests/endpoints/CustomDataService.svc
diff --git a/odatajs/tests/endpoints/EpmDataService.svc b/tests/endpoints/EpmDataService.svc
similarity index 100%
rename from odatajs/tests/endpoints/EpmDataService.svc
rename to tests/endpoints/EpmDataService.svc
diff --git a/odatajs/tests/endpoints/ErrorDataService.svc b/tests/endpoints/ErrorDataService.svc
similarity index 100%
rename from odatajs/tests/endpoints/ErrorDataService.svc
rename to tests/endpoints/ErrorDataService.svc
diff --git a/odatajs/tests/endpoints/FoodStoreDataServiceV4.svc b/tests/endpoints/FoodStoreDataServiceV4.svc
similarity index 100%
rename from odatajs/tests/endpoints/FoodStoreDataServiceV4.svc
rename to tests/endpoints/FoodStoreDataServiceV4.svc
diff --git a/odatajs/tests/endpoints/LargeCollectionService.svc b/tests/endpoints/LargeCollectionService.svc
similarity index 100%
rename from odatajs/tests/endpoints/LargeCollectionService.svc
rename to tests/endpoints/LargeCollectionService.svc
diff --git a/odatajs/tests/endpoints/web.config b/tests/endpoints/web.config
similarity index 100%
rename from odatajs/tests/endpoints/web.config
rename to tests/endpoints/web.config
diff --git a/odatajs/tests/node-test-setup.js b/tests/node-test-setup.js
similarity index 89%
rename from odatajs/tests/node-test-setup.js
rename to tests/node-test-setup.js
index 50fcac2..838bb36 100644
--- a/odatajs/tests/node-test-setup.js
+++ b/tests/node-test-setup.js
@@ -20,10 +20,10 @@
//tools
djstest = require("./common/djstest.js");
-MockHttpClient = require("./common/MockHttpClient.js").init({});
+MockHttpClient = require("./common/mockHttpClient.js").init({});
//lib
-datajs = require('./../src/lib/datajs.js');
+datajs = require('././lib/datajs.js');
OData = require('./../src/lib/odata.js');
diff --git a/odatajs/tests/odata-batch-functional-tests.html b/tests/odata-batch-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-batch-functional-tests.html
rename to tests/odata-batch-functional-tests.html
diff --git a/odatajs/tests/odata-batch-functional-tests.js b/tests/odata-batch-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-batch-functional-tests.js
rename to tests/odata-batch-functional-tests.js
diff --git a/odatajs/tests/odata-batch-tests.js b/tests/odata-batch-tests.js
similarity index 100%
rename from odatajs/tests/odata-batch-tests.js
rename to tests/odata-batch-tests.js
diff --git a/odatajs/tests/odata-cache-filter-functional-tests.html b/tests/odata-cache-filter-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-cache-filter-functional-tests.html
rename to tests/odata-cache-filter-functional-tests.html
diff --git a/odatajs/tests/odata-cache-filter-functional-tests.js b/tests/odata-cache-filter-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-cache-filter-functional-tests.js
rename to tests/odata-cache-filter-functional-tests.js
diff --git a/odatajs/tests/odata-cache-fperf-tests.html b/tests/odata-cache-fperf-tests.html
similarity index 100%
rename from odatajs/tests/odata-cache-fperf-tests.html
rename to tests/odata-cache-fperf-tests.html
diff --git a/odatajs/tests/odata-cache-fperf-tests.js b/tests/odata-cache-fperf-tests.js
similarity index 100%
rename from odatajs/tests/odata-cache-fperf-tests.js
rename to tests/odata-cache-fperf-tests.js
diff --git a/odatajs/tests/odata-cache-functional-tests.html b/tests/odata-cache-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-cache-functional-tests.html
rename to tests/odata-cache-functional-tests.html
diff --git a/odatajs/tests/odata-cache-functional-tests.js b/tests/odata-cache-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-cache-functional-tests.js
rename to tests/odata-cache-functional-tests.js
diff --git a/odatajs/tests/odata-cache-rx-functional-tests.html b/tests/odata-cache-rx-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-cache-rx-functional-tests.html
rename to tests/odata-cache-rx-functional-tests.html
diff --git a/odatajs/tests/odata-cache-rx-functional-tests.js b/tests/odata-cache-rx-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-cache-rx-functional-tests.js
rename to tests/odata-cache-rx-functional-tests.js
diff --git a/odatajs/tests/odata-fuzz.html b/tests/odata-fuzz.html
similarity index 100%
rename from odatajs/tests/odata-fuzz.html
rename to tests/odata-fuzz.html
diff --git a/odatajs/tests/odata-handler-tests.js b/tests/odata-handler-tests.js
similarity index 100%
rename from odatajs/tests/odata-handler-tests.js
rename to tests/odata-handler-tests.js
diff --git a/odatajs/tests/odata-json-light-tests.js b/tests/odata-json-light-tests.js
similarity index 100%
rename from odatajs/tests/odata-json-light-tests.js
rename to tests/odata-json-light-tests.js
diff --git a/odatajs/tests/odata-json-parse-tests.html b/tests/odata-json-parse-tests.html
similarity index 100%
rename from odatajs/tests/odata-json-parse-tests.html
rename to tests/odata-json-parse-tests.html
diff --git a/odatajs/tests/odata-json-parse-tests.js b/tests/odata-json-parse-tests.js
similarity index 100%
rename from odatajs/tests/odata-json-parse-tests.js
rename to tests/odata-json-parse-tests.js
diff --git a/odatajs/tests/odata-json-tests.js b/tests/odata-json-tests.js
similarity index 100%
rename from odatajs/tests/odata-json-tests.js
rename to tests/odata-json-tests.js
diff --git a/odatajs/tests/odata-links-functional-tests.html b/tests/odata-links-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-links-functional-tests.html
rename to tests/odata-links-functional-tests.html
diff --git a/odatajs/tests/odata-links-functional-tests.js b/tests/odata-links-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-links-functional-tests.js
rename to tests/odata-links-functional-tests.js
diff --git a/odatajs/tests/odata-metadata-awareness-functional-tests.html b/tests/odata-metadata-awareness-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-metadata-awareness-functional-tests.html
rename to tests/odata-metadata-awareness-functional-tests.html
diff --git a/odatajs/tests/odata-metadata-awareness-functional-tests.js b/tests/odata-metadata-awareness-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-metadata-awareness-functional-tests.js
rename to tests/odata-metadata-awareness-functional-tests.js
diff --git a/odatajs/tests/odata-metadata-tests.js b/tests/odata-metadata-tests.js
similarity index 100%
rename from odatajs/tests/odata-metadata-tests.js
rename to tests/odata-metadata-tests.js
diff --git a/odatajs/tests/odata-net-tests.js b/tests/odata-net-tests.js
similarity index 100%
rename from odatajs/tests/odata-net-tests.js
rename to tests/odata-net-tests.js
diff --git a/odatajs/tests/odata-perf-tests.html b/tests/odata-perf-tests.html
similarity index 100%
rename from odatajs/tests/odata-perf-tests.html
rename to tests/odata-perf-tests.html
diff --git a/odatajs/tests/odata-perf-tests.js b/tests/odata-perf-tests.js
similarity index 100%
rename from odatajs/tests/odata-perf-tests.js
rename to tests/odata-perf-tests.js
diff --git a/odatajs/tests/odata-qunit-tests.htm b/tests/odata-qunit-tests.htm
similarity index 89%
rename from odatajs/tests/odata-qunit-tests.htm
rename to tests/odata-qunit-tests.htm
index 064699d..4c6a838 100644
--- a/odatajs/tests/odata-qunit-tests.htm
+++ b/tests/odata-qunit-tests.htm
@@ -45,12 +45,12 @@
<script type="text/javascript" src="../build/lib/odatajs-latest.js"></script>
<script type="text/javascript" src="common/common.js"></script>
- <script type="text/javascript" src="./common/mockHttpClient.js"></script>
- <script type="text/javascript" src="./common/mockXMLHttpRequest.js"></script>
+ <script type="text/javascript" src="common/mockHttpClient.js"></script>
+ <script type="text/javascript" src="common/mockXMLHttpRequest.js"></script>
- <script type="text/javascript" src="./common/djstest.js"></script>
- <script type="text/javascript" src="./common/djstest-browser.js"></script>
- <script type="text/javascript" src="./common/CacheVerifier.js"></script>
+ <script type="text/javascript" src="common/djstest.js"></script>
+ <script type="text/javascript" src="common/djstest-browser.js"></script>
+ <script type="text/javascript" src="common/CacheVerifier.js"></script>
<!--bingl: disable the failure test case. Will fix them in the next change set-->
<!-- <script type="text/javascript" src="odata-tests.js"></script>-->
diff --git a/odatajs/tests/odata-read-crossdomain-functional-tests.html b/tests/odata-read-crossdomain-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-read-crossdomain-functional-tests.html
rename to tests/odata-read-crossdomain-functional-tests.html
diff --git a/odatajs/tests/odata-read-crossdomain-functional-tests.js b/tests/odata-read-crossdomain-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-read-crossdomain-functional-tests.js
rename to tests/odata-read-crossdomain-functional-tests.js
diff --git a/odatajs/tests/odata-read-functional-tests.html b/tests/odata-read-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-read-functional-tests.html
rename to tests/odata-read-functional-tests.html
diff --git a/odatajs/tests/odata-read-functional-tests.js b/tests/odata-read-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-read-functional-tests.js
rename to tests/odata-read-functional-tests.js
diff --git a/odatajs/tests/odata-request-functional-tests.html b/tests/odata-request-functional-tests.html
similarity index 100%
rename from odatajs/tests/odata-request-functional-tests.html
rename to tests/odata-request-functional-tests.html
diff --git a/odatajs/tests/odata-request-functional-tests.js b/tests/odata-request-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-request-functional-tests.js
rename to tests/odata-request-functional-tests.js
diff --git a/odatajs/tests/odata-roundtrip-functional-tests.js b/tests/odata-roundtrip-functional-tests.js
similarity index 100%
rename from odatajs/tests/odata-roundtrip-functional-tests.js
rename to tests/odata-roundtrip-functional-tests.js
diff --git a/odatajs/tests/odata-tests.js b/tests/odata-tests.js
similarity index 100%
rename from odatajs/tests/odata-tests.js
rename to tests/odata-tests.js
diff --git a/odatajs/tests/odata-xml-tests.js b/tests/odata-xml-tests.js
similarity index 100%
rename from odatajs/tests/odata-xml-tests.js
rename to tests/odata-xml-tests.js
diff --git a/odatajs/tests/odatajs-cache-large-collection-functional-tests.html b/tests/odatajs-cache-large-collection-functional-tests.html
similarity index 100%
rename from odatajs/tests/odatajs-cache-large-collection-functional-tests.html
rename to tests/odatajs-cache-large-collection-functional-tests.html
diff --git a/odatajs/tests/odatajs-cache-large-collection-functional-tests.js b/tests/odatajs-cache-large-collection-functional-tests.js
similarity index 100%
rename from odatajs/tests/odatajs-cache-large-collection-functional-tests.js
rename to tests/odatajs-cache-large-collection-functional-tests.js
diff --git a/odatajs/tests/odatajs-cache-long-haul-tests.html b/tests/odatajs-cache-long-haul-tests.html
similarity index 100%
rename from odatajs/tests/odatajs-cache-long-haul-tests.html
rename to tests/odatajs-cache-long-haul-tests.html
diff --git a/odatajs/tests/odatajs-startup-perf-test.html b/tests/odatajs-startup-perf-test.html
similarity index 100%
rename from odatajs/tests/odatajs-startup-perf-test.html
rename to tests/odatajs-startup-perf-test.html
diff --git a/odatajs/tests/run-tests.wsf b/tests/run-tests.wsf
similarity index 100%
rename from odatajs/tests/run-tests.wsf
rename to tests/run-tests.wsf
diff --git a/odatajs/tests/store-indexeddb-tests.js b/tests/store-indexeddb-tests.js
similarity index 100%
rename from odatajs/tests/store-indexeddb-tests.js
rename to tests/store-indexeddb-tests.js
diff --git a/odatajs/tests/store-tests.js b/tests/store-tests.js
similarity index 100%
rename from odatajs/tests/store-tests.js
rename to tests/store-tests.js
diff --git a/odatajs/tests/test-list.js b/tests/test-list.js
similarity index 100%
rename from odatajs/tests/test-list.js
rename to tests/test-list.js
diff --git a/odatajs/tests/test-manager.html b/tests/test-manager.html
similarity index 100%
rename from odatajs/tests/test-manager.html
rename to tests/test-manager.html
