Author: pyaschenko
Date: 2010-04-26 10:59:30 -0400 (Mon, 26 Apr 2010)
New Revision: 16810
Added:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-jsf-ajax-qunit.js
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-clear.js
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-getSize.js
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-isEmpty.js
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-submitFirst.js
Modified:
root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java
root/framework/trunk/impl/src/test/resources/javascript/richfaces-client-api.html
Log:
queue qunit tests
Modified: root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java
===================================================================
---
root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java 2010-04-26
14:33:58 UTC (rev 16809)
+++
root/framework/trunk/impl/src/test/java/org/richfaces/javascript/QUnitTest.java 2010-04-26
14:59:30 UTC (rev 16810)
@@ -118,5 +118,10 @@
runTest(getClass().getClassLoader().getResource("javascript/4_0_0.html"));
runTest(getClass().getClassLoader().getResource("javascript/richfaces-client-api.html"),
"?richfaces-event");
runTest(getClass().getClassLoader().getResource("javascript/richfaces-client-api.html"),
"?jquery-position");
+
runTest(getClass().getClassLoader().getResource("javascript/richfaces-client-api.html"),
"?richfaces-queue-request");
+
runTest(getClass().getClassLoader().getResource("javascript/richfaces-client-api.html"),
"?richfaces-queue-getSize");
+
runTest(getClass().getClassLoader().getResource("javascript/richfaces-client-api.html"),
"?richfaces-queue-isEmpty");
+
runTest(getClass().getClassLoader().getResource("javascript/richfaces-client-api.html"),
"?richfaces-queue-clear");
+
runTest(getClass().getClassLoader().getResource("javascript/richfaces-client-api.html"),
"?richfaces-queue-submitFirst");
}
}
Modified:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-client-api.html
===================================================================
---
root/framework/trunk/impl/src/test/resources/javascript/richfaces-client-api.html 2010-04-26
14:33:58 UTC (rev 16809)
+++
root/framework/trunk/impl/src/test/resources/javascript/richfaces-client-api.html 2010-04-26
14:59:30 UTC (rev 16810)
@@ -8,30 +8,25 @@
<script type="text/javascript"
src="../../classes/META-INF/resources/jquery.js"></script>
<script type="text/javascript"
src="qunit/qunit.js"></script>
<script type="text/javascript"
src="../../classes/META-INF/resources/richfaces.js"></script>
+ <script type="text/javascript"
src="richfaces-jsf-ajax-qunit.js"></script>
<script type="text/javascript"
src="../../classes/META-INF/resources/jquery.position.js"></script>
+ <script type="text/javascript"
src="../../classes/META-INF/resources/richfaces-queue.js"></script>
<script type="text/javascript"
src="../../classes/META-INF/resources/richfaces-base-component.js"></script>
<script type="text/javascript"
src="../../classes/META-INF/resources/richfaces-event.js"></script>
<script type="text/javascript"
src="richfaces-qunit.js"></script>
<script type="text/javascript"
src="richfaces-event-qunit.js"></script>
<script type="text/javascript"
src="jquery-position-qunit.js"></script>
+ <script type="text/javascript"
src="richfaces-queue-qunit-request.js"></script>
+ <script type="text/javascript"
src="richfaces-queue-qunit-getSize.js"></script>
+ <script type="text/javascript"
src="richfaces-queue-qunit-isEmpty.js"></script>
+ <script type="text/javascript"
src="richfaces-queue-qunit-clear.js"></script>
+ <script type="text/javascript"
src="richfaces-queue-qunit-submitFirst.js"></script>
</head>
<body>
<h1 id="qunit-header">Richfaces Client API Tests</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
- <script type="text/javascript">
- /*
- var p;
- if ((p=location.href.indexOf("?"))!=-1) {
- var script = document.createElement("script");
- script.setAttribute("src", location.href.substr(p+1)+".js");
- script.setAttribute("type", "text/javascript");
- var head =
document.getElementsByTagName("head")[0]||document.documentElement;
- head.appendChild(script);
- }
- */
- </script>
<div id="testDiv" style="margin-top:10px; border:1px solid
#a0a0a0">Main Test Div</div>
</body>
Added:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-jsf-ajax-qunit.js
===================================================================
--- root/framework/trunk/impl/src/test/resources/javascript/richfaces-jsf-ajax-qunit.js
(rev 0)
+++
root/framework/trunk/impl/src/test/resources/javascript/richfaces-jsf-ajax-qunit.js 2010-04-26
14:59:30 UTC (rev 16810)
@@ -0,0 +1,19 @@
+window.jsf = {};
+jsf.ajax = (function() {
+ return {
+ eventHandlers:[],
+ errorHandlers:[],
+ request:function (source, event, options) {
+ for (var i=0; i<jsf.ajax.eventHandlers.length;i++) {
+ jsf.ajax.eventHandlers[i]({type:"event", status:"success"});
+ }
+ },
+ addOnEvent: function (handler) {
+ jsf.ajax.eventHandlers.push(handler);
+ },
+ addOnError: function (handler) {
+ }
+ }
+})();
+
+window.jsf_ajax_request = jsf.ajax.request;
\ No newline at end of file
Added:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-clear.js
===================================================================
---
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-clear.js
(rev 0)
+++
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-clear.js 2010-04-26
14:59:30 UTC (rev 16810)
@@ -0,0 +1,20 @@
+RichFaces.QUnit.run(function(){
+ module("richfaces-queue-clear");
+
+ var element = document.getElementById("testDiv");
+ var event = {type:"testevent"};
+ var options = {requestDelay:1000, param:"value"};
+
+ // queue.clear
+ test("RichFaces.queue.clear", function() {
+ expect(3);
+ ok(RichFaces.queue.isEmpty(), "empty");
+ jsf.ajax.request(element, event, options);
+ jsf.ajax.request(element, event, options);
+ jsf.ajax.request(element, event, options);
+ ok(!RichFaces.queue.isEmpty(), "not empty");
+ RichFaces.queue.clear();
+ ok(RichFaces.queue.isEmpty(), "empty");
+ });
+
+});
\ No newline at end of file
Added:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-getSize.js
===================================================================
---
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-getSize.js
(rev 0)
+++
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-getSize.js 2010-04-26
14:59:30 UTC (rev 16810)
@@ -0,0 +1,17 @@
+RichFaces.QUnit.run(function(){
+ module("richfaces-queue-getSize");
+
+ var element = document.getElementById("testDiv");
+ var event = {type:"testevent"};
+ var options = {requestDelay:1000, param:"value"};
+
+ // queue.getSize
+ test("RichFaces.queue.getSize", function() {
+ expect(2);
+ var size = RichFaces.queue.getSize();
+ equals(size, 0, "empty queue");
+ jsf.ajax.request(element, event, options);
+ size = RichFaces.queue.getSize();
+ equals(size, 1, "not empty");
+ });
+});
\ No newline at end of file
Added:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-isEmpty.js
===================================================================
---
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-isEmpty.js
(rev 0)
+++
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-isEmpty.js 2010-04-26
14:59:30 UTC (rev 16810)
@@ -0,0 +1,17 @@
+RichFaces.QUnit.run(function(){
+ module("richfaces-queue-isEmpty");
+
+ var element = document.getElementById("testDiv");
+ var event = {type:"testevent"};
+ var options = {requestDelay:1000, param:"value"};
+
+ // queue.isEmpty
+ test("RichFaces.queue.isEmpty", function() {
+ expect(2);
+ var size = RichFaces.queue.isEmpty();
+ ok(RichFaces.queue.isEmpty(), "empty queue");
+ jsf.ajax.request(element, event, options);
+ size = RichFaces.queue.isEmpty();
+ ok(!RichFaces.queue.isEmpty(), "not empty");
+ });
+});
\ No newline at end of file
Added:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js
===================================================================
---
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js
(rev 0)
+++
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-request.js 2010-04-26
14:59:30 UTC (rev 16810)
@@ -0,0 +1,19 @@
+RichFaces.QUnit.run(function(){
+ module("richfaces-queue-request");
+
+ var element = document.getElementById("testDiv");
+ var event = {type:"testevent"};
+ var options = {requestDelay:1000, param:"value"};
+
+ // reference to original jsf.ajax.request function
+ test("Reference to origional jsf.ajax.request function", function() {
+ expect(1);
+ equals(RichFaces.ajax.request, jsf_ajax_request);
+ });
+
+ //TODO: add setQueueOptions here
+
+
+ //TODO: add request test here
+
+});
\ No newline at end of file
Added:
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-submitFirst.js
===================================================================
---
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-submitFirst.js
(rev 0)
+++
root/framework/trunk/impl/src/test/resources/javascript/richfaces-queue-qunit-submitFirst.js 2010-04-26
14:59:30 UTC (rev 16810)
@@ -0,0 +1,17 @@
+RichFaces.QUnit.run(function(){
+ module("richfaces-queue-submitFirst");
+
+ var element = document.getElementById("testDiv");
+ var event = {type:"testevent"};
+ var options = {requestDelay: 1000, param:"value"};
+
+ // queue.submitFirst
+ test("RichFaces.queue.submitFirst", function() {
+ expect(2);
+ jsf.ajax.request(element, event, options);
+ equals(RichFaces.queue.getSize(), 1, "one queueEntry is waiting");
+ RichFaces.queue.submitFirst();
+ equals(RichFaces.queue.getSize(), 0, "empty after submitFirst()");
+ });
+
+});
\ No newline at end of file