You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by bi...@apache.org on 2014/07/21 03:49:56 UTC
git commit: Fix the failure test cases by referring the correct
datajs object
Repository: olingo-odata4-js
Updated Branches:
refs/heads/master 8bf398ddb -> e7c3a6733
Fix the failure test cases by referring the correct datajs object
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/e7c3a673
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/e7c3a673
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/e7c3a673
Branch: refs/heads/master
Commit: e7c3a6733a68d4ea556d8351eaaaf3edf5a21e35
Parents: 8bf398d
Author: Bing Li <bi...@apache.org>
Authored: Mon Jul 21 09:43:33 2014 +0800
Committer: Bing Li <bi...@apache.org>
Committed: Mon Jul 21 09:43:33 2014 +0800
----------------------------------------------------------------------
datajs/JSLib.csproj | 49 ++++++++++----------
datajs/tests/common/common.js | 8 ++++
datajs/tests/odata-batch-functional-tests.html | 3 +-
.../odata-cache-filter-functional-tests.html | 3 +-
datajs/tests/odata-cache-fperf-tests.html | 3 +-
datajs/tests/odata-cache-functional-tests.html | 3 +-
.../tests/odata-cache-rx-functional-tests.html | 2 +-
datajs/tests/odata-links-functional-tests.html | 2 +-
...ata-metadata-awareness-functional-tests.html | 3 +-
datajs/tests/odata-perf-tests.html | 3 +-
datajs/tests/odata-qunit-tests.htm | 5 +-
...odata-read-crossdomain-functional-tests.html | 3 +-
datajs/tests/odata-read-functional-tests.html | 4 +-
.../tests/odata-request-functional-tests.html | 4 +-
14 files changed, 55 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/datajs/JSLib.csproj
----------------------------------------------------------------------
diff --git a/datajs/JSLib.csproj b/datajs/JSLib.csproj
index c1c0d5f..f6fcf3b 100644
--- a/datajs/JSLib.csproj
+++ b/datajs/JSLib.csproj
@@ -38,30 +38,31 @@
</PropertyGroup>
<ItemGroup>
<Content Include="src\index.js" />
- <Content Include="src\banner.txt" />
- <Content Include="src\lib\cache.js" />
- <Content Include="src\lib\datajs.js" />
- <Content Include="src\lib\odata.js" />
- <Content Include="src\lib\store.js" />
- <Content Include="src\lib\cache\source.js" />
- <Content Include="src\lib\datajs\deferred.js" />
- <Content Include="src\lib\datajs\utils.js" />
- <Content Include="src\lib\datajs\xml.js" />
- <Content Include="src\lib\odata\atom.js" />
- <Content Include="src\lib\odata\batch.js" />
- <Content Include="src\lib\odata\gml.js" />
- <Content Include="src\lib\odata\handler.js" />
- <Content Include="src\lib\odata\json.js" />
- <Content Include="src\lib\odata\json-light.js" />
- <Content Include="src\lib\odata\metadata.js" />
- <Content Include="src\lib\odata\net.js" />
- <Content Include="src\lib\odata\utils.js" />
- <Content Include="src\lib\odata\xml.js" />
- <Content Include="src\lib\store\dom.js" />
- <Content Include="src\lib\store\indexeddb.js" />
- <Content Include="src\lib\store\memory.js" />
+ <Content Include="src\banner.txt" />
+ <Content Include="src\lib\cache.js" />
+ <Content Include="src\lib\datajs.js" />
+ <Content Include="src\lib\odata.js" />
+ <Content Include="src\lib\store.js" />
+ <Content Include="src\lib\cache\source.js" />
+ <Content Include="src\lib\datajs\deferred.js" />
+ <Content Include="src\lib\datajs\utils.js" />
+ <Content Include="src\lib\datajs\xml.js" />
+ <Content Include="src\lib\odata\atom.js" />
+ <Content Include="src\lib\odata\batch.js" />
+ <Content Include="src\lib\odata\gml.js" />
+ <Content Include="src\lib\odata\handler.js" />
+ <Content Include="src\lib\odata\json.js" />
+ <Content Include="src\lib\odata\json-light.js" />
+ <Content Include="src\lib\odata\metadata.js" />
+ <Content Include="src\lib\odata\net.js" />
+ <Content Include="src\lib\odata\utils.js" />
+ <Content Include="src\lib\odata\xml.js" />
+ <Content Include="src\lib\store\dom.js" />
+ <Content Include="src\lib\store\indexeddb.js" />
+ <Content Include="src\lib\store\memory.js" />
<Content Include="tests\cache-tests.js" />
<Content Include="tests\common\CacheOracle.js" />
+ <Content Include="tests\common\common.js" />
<Content Include="tests\common\Instrument.svc" />
<Content Include="tests\common\Instrument.js" />
<Content Include="tests\common\mockXMLHttpRequest.js" />
@@ -166,9 +167,7 @@
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="src\" />
- </ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/datajs/tests/common/common.js
----------------------------------------------------------------------
diff --git a/datajs/tests/common/common.js b/datajs/tests/common/common.js
new file mode 100644
index 0000000..876b052
--- /dev/null
+++ b/datajs/tests/common/common.js
@@ -0,0 +1,8 @@
+(function (window, undefined) {
+ window.OData = window.datajs.V4.oData;
+ window.temp = window.datajs.V4;
+ window.temp.store = window.datajs.V4.store;
+ window.temp.cache = window.datajs.V4.cache;
+ window.datajs = window.temp;
+ delete window.temp;
+})(this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 927690f..c12fa04 100644
--- a/datajs/tests/odata-batch-functional-tests.html
+++ b/datajs/tests/odata-batch-functional-tests.html
@@ -16,7 +16,8 @@
</script>
<!-- To do: on Oata library 6.1.0, there contains a change about "Content-Id" in the batch request change set header (odata v4.0 protocol spec. Chapter 11.7.3 Change sets). This change makes most the batch related test cases not work. Need to do a fix. -->
- <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.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>-->
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 0c9d7dd..5537ed2 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-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<!--
<script type="text/javascript" src="../src/datajs.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 062654f..befdcfe 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-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<!--
<script type="text/javascript" src="../src/datajs.js"></script>
<script type="text/javascript" src="../src/utils.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 e77a7f8..59baca0 100644
--- a/datajs/tests/odata-cache-functional-tests.html
+++ b/datajs/tests/odata-cache-functional-tests.html
@@ -40,7 +40,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="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="common/CacheOracle.js"></script>
<script type="text/javascript" src="common/ObservableHttpClient.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 6359e65..e75c131 100644
--- a/datajs/tests/odata-cache-rx-functional-tests.html
+++ b/datajs/tests/odata-cache-rx-functional-tests.html
@@ -40,7 +40,7 @@
<script type="text/javascript" src="../src/cache-source.js"></script>
<script type="text/javascript" src="../src/cache.js"></script>-->
<script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
-
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="common/ODataReadOracle.js"></script>
<script type="text/javascript" src="common/rx.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 98e3799..9c748d3 100644
--- a/datajs/tests/odata-links-functional-tests.html
+++ b/datajs/tests/odata-links-functional-tests.html
@@ -32,7 +32,7 @@
<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-2.0.0.js"></script>
-
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="odata-links-functional-tests.js"></script>
</head>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 6a97fb2..4e7fa76 100644
--- a/datajs/tests/odata-metadata-awareness-functional-tests.html
+++ b/datajs/tests/odata-metadata-awareness-functional-tests.html
@@ -30,7 +30,8 @@
<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-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="odata-metadata-awareness-functional-tests.js"></script>
</head>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/datajs/tests/odata-perf-tests.html
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-perf-tests.html b/datajs/tests/odata-perf-tests.html
index d7e3f6e..cb2e141 100644
--- a/datajs/tests/odata-perf-tests.html
+++ b/datajs/tests/odata-perf-tests.html
@@ -30,7 +30,8 @@
<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-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="common/Instrument.js"></script>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/datajs/tests/odata-qunit-tests.htm
----------------------------------------------------------------------
diff --git a/datajs/tests/odata-qunit-tests.htm b/datajs/tests/odata-qunit-tests.htm
index 5dd5fbe..07e7ee4 100644
--- a/datajs/tests/odata-qunit-tests.htm
+++ b/datajs/tests/odata-qunit-tests.htm
@@ -40,8 +40,9 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
<script type="text/javascript">
window.TestSynchronizer.init(QUnit);
</script>
-
- <script type="text/javascript" src="../build/datajs-2.0.0.min.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.min.js"></script>
+ <script type="text/javascript" src="common/common.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>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 575e88b..1713450 100644
--- a/datajs/tests/odata-read-crossdomain-functional-tests.html
+++ b/datajs/tests/odata-read-crossdomain-functional-tests.html
@@ -40,7 +40,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="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
<script type="text/javascript" src="odata-read-crossdomain-functional-tests.js"></script>
</head>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 af3316d..0e33dda 100644
--- a/datajs/tests/odata-read-functional-tests.html
+++ b/datajs/tests/odata-read-functional-tests.html
@@ -31,9 +31,9 @@
<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-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
-
<script type="text/javascript" src="odata-read-functional-tests.js"></script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/e7c3a673/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 0c260e0..ff3bbcc 100644
--- a/datajs/tests/odata-request-functional-tests.html
+++ b/datajs/tests/odata-request-functional-tests.html
@@ -30,9 +30,9 @@
<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-2.0.0.js"></script>
+ <script type="text/javascript" src="../build/datajs-2.0.0.js"></script>
+ <script type="text/javascript" src="common/common.js"></script>
<script type="text/javascript" src="common/djstest.js"></script>
-
<script type="text/javascript" src="odata-request-functional-tests.js"></script>
</head>
<body>