From 1c5685d68f1b73270fb814fe04cbb490eb90ba5f Mon Sep 17 00:00:00 2001 From: mensonge Date: Fri, 14 Nov 2008 15:39:19 +0000 Subject: Minor fix: Remove DOJO library (60Mo) replaced by link to Google CDN (online DOJO library) git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@159 b3834d28-1941-0410-a4f8-b48e95affb8f --- includes/js/dojox/rpc/tests/JsonReferencing.js | 30 - includes/js/dojox/rpc/tests/Service.js | 702 -------------------- includes/js/dojox/rpc/tests/Yahoo.js | 317 --------- includes/js/dojox/rpc/tests/libraryTests.js | 12 - includes/js/dojox/rpc/tests/module.js | 13 - includes/js/dojox/rpc/tests/resources/JSON.php | 724 --------------------- includes/js/dojox/rpc/tests/resources/bigQuery | 1 - includes/js/dojox/rpc/tests/resources/bigQuery5 | 1 - includes/js/dojox/rpc/tests/resources/echo.php | 7 - includes/js/dojox/rpc/tests/resources/echoJson.php | 8 - .../js/dojox/rpc/tests/resources/fakestore.php | 36 - .../js/dojox/rpc/tests/resources/jsonRpc10.php | 47 -- .../js/dojox/rpc/tests/resources/jsonRpc11.php | 52 -- .../js/dojox/rpc/tests/resources/jsonRpc12.php | 53 -- .../rpc/tests/resources/jsonRpcPostGetEcho.php | 38 -- .../js/dojox/rpc/tests/resources/jsonpEcho.php | 23 - .../js/dojox/rpc/tests/resources/jsonpEcho.phps | 23 - .../dojox/rpc/tests/resources/jsonpJsonRpcEcho.php | 37 -- includes/js/dojox/rpc/tests/resources/obj1 | 1 - .../js/dojox/rpc/tests/resources/obj1testArray | 1 - includes/js/dojox/rpc/tests/resources/obj3 | 1 - includes/js/dojox/rpc/tests/resources/obj4 | 1 - includes/js/dojox/rpc/tests/resources/query | 6 - includes/js/dojox/rpc/tests/resources/rawEcho.php | 5 - includes/js/dojox/rpc/tests/resources/res | 1 - includes/js/dojox/rpc/tests/resources/store.php | 24 - includes/js/dojox/rpc/tests/resources/test.smd | 189 ------ includes/js/dojox/rpc/tests/runLibraryTests.html | 9 - includes/js/dojox/rpc/tests/runTests.html | 9 - .../js/dojox/rpc/tests/stores/JsonRestStore.js | 237 ------- .../rpc/tests/test_dojo_data_model_persevere.html | 146 ----- 31 files changed, 2754 deletions(-) delete mode 100644 includes/js/dojox/rpc/tests/JsonReferencing.js delete mode 100644 includes/js/dojox/rpc/tests/Service.js delete mode 100644 includes/js/dojox/rpc/tests/Yahoo.js delete mode 100644 includes/js/dojox/rpc/tests/libraryTests.js delete mode 100644 includes/js/dojox/rpc/tests/module.js delete mode 100644 includes/js/dojox/rpc/tests/resources/JSON.php delete mode 100644 includes/js/dojox/rpc/tests/resources/bigQuery delete mode 100644 includes/js/dojox/rpc/tests/resources/bigQuery5 delete mode 100644 includes/js/dojox/rpc/tests/resources/echo.php delete mode 100644 includes/js/dojox/rpc/tests/resources/echoJson.php delete mode 100644 includes/js/dojox/rpc/tests/resources/fakestore.php delete mode 100644 includes/js/dojox/rpc/tests/resources/jsonRpc10.php delete mode 100644 includes/js/dojox/rpc/tests/resources/jsonRpc11.php delete mode 100644 includes/js/dojox/rpc/tests/resources/jsonRpc12.php delete mode 100644 includes/js/dojox/rpc/tests/resources/jsonRpcPostGetEcho.php delete mode 100644 includes/js/dojox/rpc/tests/resources/jsonpEcho.php delete mode 100644 includes/js/dojox/rpc/tests/resources/jsonpEcho.phps delete mode 100644 includes/js/dojox/rpc/tests/resources/jsonpJsonRpcEcho.php delete mode 100644 includes/js/dojox/rpc/tests/resources/obj1 delete mode 100644 includes/js/dojox/rpc/tests/resources/obj1testArray delete mode 100644 includes/js/dojox/rpc/tests/resources/obj3 delete mode 100644 includes/js/dojox/rpc/tests/resources/obj4 delete mode 100644 includes/js/dojox/rpc/tests/resources/query delete mode 100644 includes/js/dojox/rpc/tests/resources/rawEcho.php delete mode 100644 includes/js/dojox/rpc/tests/resources/res delete mode 100644 includes/js/dojox/rpc/tests/resources/store.php delete mode 100644 includes/js/dojox/rpc/tests/resources/test.smd delete mode 100644 includes/js/dojox/rpc/tests/runLibraryTests.html delete mode 100644 includes/js/dojox/rpc/tests/runTests.html delete mode 100644 includes/js/dojox/rpc/tests/stores/JsonRestStore.js delete mode 100644 includes/js/dojox/rpc/tests/test_dojo_data_model_persevere.html (limited to 'includes/js/dojox/rpc/tests') diff --git a/includes/js/dojox/rpc/tests/JsonReferencing.js b/includes/js/dojox/rpc/tests/JsonReferencing.js deleted file mode 100644 index 69a6782..0000000 --- a/includes/js/dojox/rpc/tests/JsonReferencing.js +++ /dev/null @@ -1,30 +0,0 @@ -if(!dojo._hasResource["dojox.rpc.tests.JsonReferencing"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. -dojo._hasResource["dojox.rpc.tests.JsonReferencing"] = true; -dojo.provide("dojox.rpc.tests.JsonReferencing"); -dojo.require("dojox.rpc.JsonReferencing"); - - -doh.register("dojox.rpc.tests.JsonReferencing", [ - function fromRefJson(t) { - var testStr = '{a:{$ref:"$"},id:"root",c:{d:"e",f:{$ref:"root.c"}},b:{$ref:"$.c"}}'; - - var mirrorObj = dojox.rpc.fromJson(testStr); - t.assertEqual(mirrorObj, mirrorObj.a); - t.assertEqual(mirrorObj.c, mirrorObj.c.f); - t.assertEqual(mirrorObj.c, mirrorObj.b); - }, - function toAndFromRefJson(t) { - var testObj = {a:{},b:{c:{}}}; - testObj.a.d= testObj; - testObj.b.g=testObj.a; - testObj.b.c.f = testObj.b; - testObj.b.h=testObj.a; - var mirrorObj = dojox.rpc.fromJson(dojox.rpc.toJson(testObj)); - t.assertEqual(mirrorObj.a.d, mirrorObj); - t.assertEqual(mirrorObj.b.g, mirrorObj.a); - t.assertEqual(mirrorObj.b.c.f, mirrorObj.b); - t.assertEqual(mirrorObj.b.h, mirrorObj.a); - } -]); - -} diff --git a/includes/js/dojox/rpc/tests/Service.js b/includes/js/dojox/rpc/tests/Service.js deleted file mode 100644 index 353519e..0000000 --- a/includes/js/dojox/rpc/tests/Service.js +++ /dev/null @@ -1,702 +0,0 @@ -if(!dojo._hasResource["dojox.rpc.tests.Service"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. -dojo._hasResource["dojox.rpc.tests.Service"] = true; -dojo.provide("dojox.rpc.tests.Service"); -dojo.require("dojo.io.script"); -dojo.require("dojox.rpc.Service"); -dojo.require("dojox.rpc.JsonRPC"); -dojo.require("dojox.rpc.Rest"); -//this is a copy of our smd in js form, so we can just share it easily -//dojo.require("dojox.rpc.tests.resources.testSmd"); - - -dojox.rpc.tests.service = new dojox.rpc.Service(dojo.moduleUrl("dojox.rpc.tests.resources", "test.smd")); - -doh.register("dojox.rpc.tests.echo", - [ - { - name: "#1 POST,URL,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - //test when given named params - var td = this.svc.postEcho({message: this.name,foo:2}); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#2 POST,URL,Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postEcho(this.name,2); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#3 GET,URL,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.getEcho({message: this.name}); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - - { - name: "#3.1 REST PUT,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - res = this.name + Math.random(); - //test when given named params - var td = this.svc.restStore.put({location: "res"},res); - td.addCallback(this, function(result){ - var td = this.svc.restStore({location: "res"}); - td.addCallback(this, function(result){ - if (result==res){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - }); - - return d; - } - }, - { - name: "#3.2 REST POST,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - var newRes = this.name + Math.random(); - res += newRes; - //test when given named params - var td = this.svc.restStore.post({location: "res"},newRes); - td.addCallback(this, function(result){ - var td = this.svc.restStore({location: "res"}); - td.addCallback(this, function(result){ - if (result==res){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - }); - - return d; - } - }, - { - name: "#3.3 REST DELETE,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.restStore['delete']({location: "res"}); - td.addCallback(this, function(result){ - var td = this.svc.restStore({location: "res"}); - td.addCallback(this, function(result){ - if (result=="deleted"){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - }); - - return d; - } - }, - { - name: "#3.4 GET,URL,Named Parameters, Returning Json", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.getEchoJson({message:'{"foo":"bar"}'}); - td.addCallback(this, function(result){ - if (result.foo=='bar'){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#3.5 GET,PATH,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.getPathEcho({path: "pathname"}); - td.addCallback(this, function(result){ - if (result=="/path/pathname"){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - - { - name: "#4 GET,URL,Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.getEcho(this.name); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - - { - name: "#5 POST,URL,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonEcho({message: this.name}); - td.addCallback(this, function(res){ - var result = dojo.fromJson(res); - if (result && result.message && result.message==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - - { - name: "#6 POST,JSON,Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonEcho(this.name); - td.addCallback(this, function(res){ - var result = dojo.fromJson(res); - if (result && result.message && result.message==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#7 JSONP,URL,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.jsonpEcho({message: this.name}); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#8 JSONP,URL, Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.jsonpEcho(this.name); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#9 POST,JSON-RPC-1.0,Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonRpc10Echo(this.name); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#10 POST,JSON-RPC-1.0,Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonRpc10EchoNamed(this.name); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#11 POST,JSON-RPC 1.2, Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonRpc12Echo(this.name); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#12 POST,JSON-RPC 1.2, Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonRpc12Echo({message: this.name}); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - } - /* - ,{ - name: "#13 GET,JSON-RPC 1.2, Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.getJsonRpc12Echo(this.name); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - { - name: "#14 GET,JSON-RPC 1.2, Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.getJsonRpc12EchoNamed({message: this.name}); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - }, - ,{ - name: "#15 JSONP,JSON-RPC 1.2, Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.jsonpJsonRpc12Echo(this.name); - td.addCallback(this, function(result){ - if (result==this.name){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - - return d; - } - } - */ - ] -); - -doh.register("dojox.rpc.tests.jsonRpcForcedError", [ - { - name: "POST,JSON-RPC 1.0, Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonRpc10ForcedError(this.name); - - td.addErrback(this, function(error){ - d.callback(true); - }); - - return d; - } - }, - { - name: "POST,JSON-RPC 1.2, Ordered Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonRpc12ForcedError(this.name); - - td.addErrback(this, function(error){ - d.callback(true); - }); - - return d; - } - }, - { - name: "POST,JSON-RPC 1.2, Named Parameters", - timeout: 4000, - setUp: function(){ - //this.svc = new dojox.rpc.Service(dojox.rpc.tests.resources.testSmd); - this.svc = dojox.rpc.tests.service; - }, - runTest: function(){ - var d = new doh.Deferred(); - - if (window.location.protocol=="file:") { - var err= new Error("This Test requires a webserver and will fail intentionally if loaded from file://"); - d.errback(err); - return d; - } - - //test when given named params - var td = this.svc.postJsonRpc12ForcedError({message: this.name}); - - td.addErrback(this, function(error){ - d.callback(true); - }); - - return d; - } - } -]); - -} diff --git a/includes/js/dojox/rpc/tests/Yahoo.js b/includes/js/dojox/rpc/tests/Yahoo.js deleted file mode 100644 index 7e5dbfa..0000000 --- a/includes/js/dojox/rpc/tests/Yahoo.js +++ /dev/null @@ -1,317 +0,0 @@ -if(!dojo._hasResource["dojox.rpc.tests.Yahoo"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. -dojo._hasResource["dojox.rpc.tests.Yahoo"] = true; -dojo.provide("dojox.rpc.tests.Yahoo"); -dojo.require("dojo.io.script"); -dojo.require("dojox.rpc.Service"); - -dojox.rpc.tests.yahooService = new dojox.rpc.Service(dojo.moduleUrl("dojox.rpc.SMDLibrary", "yahoo.smd")); - -dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT = 8000; -dojox.rpc.tests.yahooService.TEST_METHOD_LONG_TIMEOUT = 30000; - -dojox.rpc.tests.yahooService._testMethod = function(method){ - return function(m){ - var d = new doh.Deferred(); - - if (method.name && method.parameters && method.expectedResult) { - var yd = dojox.rpc.tests.yahooService[method.name](method.parameters); - yd.addCallback(this, function(result){ - if (result[method.expectedResult]){ - d.callback(true); - }else{ - d.errback(new Error("Unexpected Return Value: ", result)); - } - }); - } - - return d; - } -}; - -doh.register("dojox.rpc.tests.yahoo", - [ - { - name: "#1, Yahoo Answers::questionSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "questionSearch", - parameters: {query: "dojo toolkit"}, - expectedResult: "all" - }) - }, - { - name: "#2, Yahoo Answers::getByCategory", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "getByCategory", - parameters: {category_name: "Computers+%26+Internet%3ESoftware"}, - expectedResult: "all" - }) - }, - { - name: "#3, Yahoo Answers::getQuestion", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "getQuestion", - parameters: {question_id: "1005120800412"}, - expectedResult: "all" - }) - }, - { - name: "#4, Yahoo Answers::getByUser", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "getByUser", - parameters: {user_id: "AA10001397"}, - expectedResult: "all" - }) - }, - { - name: "#5, Yahoo Audio::artistSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "artistSearch", - parameters: {artist: "The Beatles"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#6, Yahoo Audio::albumSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "albumSearch", - parameters: {artist: "The Beatles", album: "Magical Mystery Tour"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#7, Yahoo Audio::songSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "songSearch", - parameters: {artist: "The Beatles", album: "Magical Mystery Tour", song: "Penny Lane"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#8, Yahoo Audio::songDownloadLocation", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "songDownloadLocation", - parameters: {songid: "XXXXXXT000995691"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#9, Yahoo ContentAnalysis::contextSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "contextSearch", - parameters: { - context: "Welcome to the Book of Dojo. This book covers both versions 0.9 and 1.0, and all 1.0 extensions and changes are clearly marked for your enjoyment. Please use the forums for support questions, but if you see something missing, incomplete, or just plain wrong in this book, please leave a comment.", - query: "dojo" - }, - expectedResult: "ResultSet" - }) - }, - { - name: "#10, Yahoo Image::imageSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "imageSearch", - parameters: {query: "dojo"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#11, Yahoo Local::localSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "localSearch", - parameters: {query: "pizza", zip: "98201"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#12, Yahoo Local::collectionSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_LONG_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "collectionSearch", - parameters: {query: "dojo"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#13, Yahoo Local::getCollection", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_LONG_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - expectedResult: "getCollection", - parameters: {collection_id: "1000031487"}, - expectedResult: "Result" - }) - }, - { - name: "#14, Yahoo Local::trafficData", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_LONG_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "trafficData", - parameters: {street: "1600 Pennsylvania Ave", city: "Washington, DC"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#15, Yahoo MyWebs::urlSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_LONG_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "urlSearch", - parameters: {tag: "javascript"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#16, Yahoo MyWebs::tagSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_LONG_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "tagSearch", - parameters: {url: "dojotoolkit.org"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#17, Yahoo MyWebs::relatedTags", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_LONG_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "relatedTags", - parameters: {tag: "javascript"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#18, Yahoo NewsSearch::newsSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "newsSearch", - parameters: {query: "dojo toolkit"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#19, Yahoo Shopping::catalogListing", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "catalogListing", - parameters: {idtype: "brand,partnum", idvalue: "canon,1079B001", getspec: 1}, - expectedResult: "Catalog" - }) - }, - { - name: "#20, Yahoo Shopping::merchantSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "merchantSearch", - parameters: {merchantid: "1021849"}, - expectedResult: "Merchant" - }) - }, - { - name: "#21, Yahoo Shopping::productSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "productSearch", - parameters: {query: "dojo"}, - expectedResult: "Categories" - }) - }, - { - name: "#22, Yahoo SiteExplorer::inlinkData", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "inlinkData", - parameters: {query: "dojotoolkit.org"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#23, Yahoo SiteExplorer::pageData", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "pageData", - parameters: {query: "dojotoolkit.org"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#24, Yahoo SiteExplorer::ping", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "ping", - parameters: {sitemap: "http://www.yahoo.com"}, - expectedResult: "Success" - }) - }, - { - name: "#25, Yahoo SiteExplorer::updateNotification", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "updateNotification", - parameters: {url: "http://www.yahoo.com"}, - expectedResult: "Success" - }) - }, - { - name: "#26, Yahoo Trip::tripSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "tripSearch", - parameters: {query: "eiffel tower"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#27, Yahoo Trip::getTrip", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "getTrip", - parameters: {id: "546303"}, - expectedResult: "Result" - }) - }, - { - name: "#28, Yahoo Video::videoSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "videoSearch", - parameters: {query: "star wars kid"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#29, Yahoo Web::webSearch", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "webSearch", - parameters: {query: "dojo toolkit"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#30, Yahoo Web::spellingSuggestion", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "spellingSuggestion", - parameters: {query: "beatls"}, - expectedResult: "ResultSet" - }) - }, - { - name: "#31, Yahoo Web::relatedSuggestion", - timeout: dojox.rpc.tests.yahooService.TEST_METHOD_TIMEOUT, - runTest: dojox.rpc.tests.yahooService._testMethod({ - name: "relatedSuggestion", - parameters: {query: "dojo toolkit"}, - expectedResult: "ResultSet" - }) - } -]); - -} diff --git a/includes/js/dojox/rpc/tests/libraryTests.js b/includes/js/dojox/rpc/tests/libraryTests.js deleted file mode 100644 index 7af2ae6..0000000 --- a/includes/js/dojox/rpc/tests/libraryTests.js +++ /dev/null @@ -1,12 +0,0 @@ -if(!dojo._hasResource["dojox.rpc.tests.libraryTests"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. -dojo._hasResource["dojox.rpc.tests.libraryTests"] = true; -dojo.provide("dojox.rpc.tests.libraryTests"); - -try{ - dojo.require("dojox.rpc.tests.Yahoo"); -}catch(e){ - doh.debug(e); -} - - -} diff --git a/includes/js/dojox/rpc/tests/module.js b/includes/js/dojox/rpc/tests/module.js deleted file mode 100644 index 038a9ad..0000000 --- a/includes/js/dojox/rpc/tests/module.js +++ /dev/null @@ -1,13 +0,0 @@ -if(!dojo._hasResource["dojox.rpc.tests.module"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. -dojo._hasResource["dojox.rpc.tests.module"] = true; -dojo.provide("dojox.rpc.tests.module"); - -try{ - dojo.require("dojox.rpc.tests.Service"); - dojo.require("dojox.rpc.tests.JsonReferencing"); -}catch(e){ - doh.debug(e); -} - - -} diff --git a/includes/js/dojox/rpc/tests/resources/JSON.php b/includes/js/dojox/rpc/tests/resources/JSON.php deleted file mode 100644 index 4a21ce7..0000000 --- a/includes/js/dojox/rpc/tests/resources/JSON.php +++ /dev/null @@ -1,724 +0,0 @@ - - * @author Matt Knapp - * @author Brett Stimmerman - * @copyright 2005 Michal Migurski - * @license http://www.opensource.org/licenses/bsd-license.php - * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198 - */ - -/** - * Marker constant for Services_JSON::decode(), used to flag stack state - */ -define('SERVICES_JSON_SLICE', 1); - -/** - * Marker constant for Services_JSON::decode(), used to flag stack state - */ -define('SERVICES_JSON_IN_STR', 2); - -/** - * Marker constant for Services_JSON::decode(), used to flag stack state - */ -define('SERVICES_JSON_IN_ARR', 4); - -/** - * Marker constant for Services_JSON::decode(), used to flag stack state - */ -define('SERVICES_JSON_IN_OBJ', 8); - -/** - * Marker constant for Services_JSON::decode(), used to flag stack state - */ -define('SERVICES_JSON_IN_CMT', 16); - -/** - * Behavior switch for Services_JSON::decode() - */ -define('SERVICES_JSON_LOOSE_TYPE', 10); - -/** - * Behavior switch for Services_JSON::decode() - */ -define('SERVICES_JSON_STRICT_TYPE', 11); - -/** - * Converts to and from JSON format. - * - * Brief example of use: - * - * - * // create a new instance of Services_JSON - * $json = new Services_JSON(); - * - * // convert a complexe value to JSON notation, and send it to the browser - * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4))); - * $output = $json->encode($value); - * - * print($output); - * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]] - * - * // accept incoming POST data, assumed to be in JSON notation - * $input = file_get_contents('php://input', 1000000); - * $value = $json->decode($input); - * - */ -class Services_JSON -{ - /** - * constructs a new JSON instance - * - * @param int $use object behavior: when encoding or decoding, - * be loose or strict about object/array usage - * - * possible values: - * - SERVICES_JSON_STRICT_TYPE: strict typing, default. - * "{...}" syntax creates objects in decode(). - * - SERVICES_JSON_LOOSE_TYPE: loose typing. - * "{...}" syntax creates associative arrays in decode(). - */ - function Services_JSON($use = SERVICES_JSON_STRICT_TYPE) - { - $this->use = $use; - } - - /** - * convert a string from one UTF-16 char to one UTF-8 char - * - * Normally should be handled by mb_convert_encoding, but - * provides a slower PHP-only method for installations - * that lack the multibye string extension. - * - * @param string $utf16 UTF-16 character - * @return string UTF-8 character - * @access private - */ - function utf162utf8($utf16) - { - // oh please oh please oh please oh please oh please - if(function_exists('mb_convert_encoding')) - return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16'); - - $bytes = (ord($utf16{0}) << 8) | ord($utf16{1}); - - switch(true) { - case ((0x7F & $bytes) == $bytes): - // this case should never be reached, because we are in ASCII range - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0x7F & $bytes); - - case (0x07FF & $bytes) == $bytes: - // return a 2-byte UTF-8 character - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0xC0 | (($bytes >> 6) & 0x1F)) - . chr(0x80 | ($bytes & 0x3F)); - - case (0xFFFF & $bytes) == $bytes: - // return a 3-byte UTF-8 character - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0xE0 | (($bytes >> 12) & 0x0F)) - . chr(0x80 | (($bytes >> 6) & 0x3F)) - . chr(0x80 | ($bytes & 0x3F)); - } - - // ignoring UTF-32 for now, sorry - return ''; - } - - /** - * convert a string from one UTF-8 char to one UTF-16 char - * - * Normally should be handled by mb_convert_encoding, but - * provides a slower PHP-only method for installations - * that lack the multibye string extension. - * - * @param string $utf8 UTF-8 character - * @return string UTF-16 character - * @access private - */ - function utf82utf16($utf8) - { - // oh please oh please oh please oh please oh please - if(function_exists('mb_convert_encoding')) - return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); - - switch(strlen($utf8)) { - case 1: - // this case should never be reached, because we are in ASCII range - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return $ut8; - - case 2: - // return a UTF-16 character from a 2-byte UTF-8 char - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0x07 & (ord($utf8{0}) >> 2)) - . chr((0xC0 & (ord($utf8{0}) << 6)) - | (0x3F & ord($utf8{1}))); - - case 3: - // return a UTF-16 character from a 3-byte UTF-8 char - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr((0xF0 & (ord($utf8{0}) << 4)) - | (0x0F & (ord($utf8{1}) >> 2))) - . chr((0xC0 & (ord($utf8{1}) << 6)) - | (0x7F & ord($utf8{2}))); - } - - // ignoring UTF-32 for now, sorry - return ''; - } - - /** - * encodes an arbitrary variable into JSON format - * - * @param mixed $var any number, boolean, string, array, or object to be encoded. - * see argument 1 to Services_JSON() above for array-parsing behavior. - * if var is a strng, note that encode() always expects it - * to be in ASCII or UTF-8 format! - * - * @return string JSON string representation of input var - * @access public - */ - function encode($var) - { - switch (gettype($var)) { - case 'boolean': - return $var ? 'true' : 'false'; - - case 'NULL': - return 'null'; - - case 'integer': - return (int) $var; - - case 'double': - case 'float': - return (float) $var; - - case 'string': - // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT - $ascii = ''; - $strlen_var = strlen($var); - - /* - * Iterate over every character in the string, - * escaping with a slash or encoding to UTF-8 where necessary - */ - for ($c = 0; $c < $strlen_var; ++$c) { - - $ord_var_c = ord($var{$c}); - - switch (true) { - case $ord_var_c == 0x08: - $ascii .= '\b'; - break; - case $ord_var_c == 0x09: - $ascii .= '\t'; - break; - case $ord_var_c == 0x0A: - $ascii .= '\n'; - break; - case $ord_var_c == 0x0C: - $ascii .= '\f'; - break; - case $ord_var_c == 0x0D: - $ascii .= '\r'; - break; - - case $ord_var_c == 0x22: - case $ord_var_c == 0x2F: - case $ord_var_c == 0x5C: - // double quote, slash, slosh - $ascii .= '\\'.$var{$c}; - break; - - case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): - // characters U-00000000 - U-0000007F (same as ASCII) - $ascii .= $var{$c}; - break; - - case (($ord_var_c & 0xE0) == 0xC0): - // characters U-00000080 - U-000007FF, mask 110XXXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, ord($var{$c + 1})); - $c += 1; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xF0) == 0xE0): - // characters U-00000800 - U-0000FFFF, mask 1110XXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2})); - $c += 2; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xF8) == 0xF0): - // characters U-00010000 - U-001FFFFF, mask 11110XXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3})); - $c += 3; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xFC) == 0xF8): - // characters U-00200000 - U-03FFFFFF, mask 111110XX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4})); - $c += 4; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xFE) == 0xFC): - // characters U-04000000 - U-7FFFFFFF, mask 1111110X - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4}), - ord($var{$c + 5})); - $c += 5; - $utf16 = $this->utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - } - } - - return '"'.$ascii.'"'; - - case 'array': - /* - * As per JSON spec if any array key is not an integer - * we must treat the the whole array as an object. We - * also try to catch a sparsely populated associative - * array with numeric keys here because some JS engines - * will create an array with empty indexes up to - * max_index which can cause memory issues and because - * the keys, which may be relevant, will be remapped - * otherwise. - * - * As per the ECMA and JSON specification an object may - * have any string as a property. Unfortunately due to - * a hole in the ECMA specification if the key is a - * ECMA reserved word or starts with a digit the - * parameter is only accessible using ECMAScript's - * bracket notation. - */ - - // treat as a JSON object - if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { - return '{' . - join(',', array_map(array($this, 'name_value'), - array_keys($var), - array_values($var))) - . '}'; - } - - // treat it like a regular array - return '[' . join(',', array_map(array($this, 'encode'), $var)) . ']'; - - case 'object': - $vars = get_object_vars($var); - return '{' . - join(',', array_map(array($this, 'name_value'), - array_keys($vars), - array_values($vars))) - . '}'; - - default: - return ''; - } - } - - /** - * array-walking function for use in generating JSON-formatted name-value pairs - * - * @param string $name name of key to use - * @param mixed $value reference to an array element to be encoded - * - * @return string JSON-formatted name-value pair, like '"name":value' - * @access private - */ - function name_value($name, $value) - { - return $this->encode(strval($name)) . ':' . $this->encode($value); - } - - /** - * reduce a string by removing leading and trailing comments and whitespace - * - * @param $str string string value to strip of comments and whitespace - * - * @return string string value stripped of comments and whitespace - * @access private - */ - function reduce_string($str) - { - $str = preg_replace(array( - - // eliminate single line comments in '// ...' form - '#^\s*//(.+)$#m', - - // eliminate multi-line comments in '/* ... */' form, at start of string - '#^\s*/\*(.+)\*/#Us', - - // eliminate multi-line comments in '/* ... */' form, at end of string - '#/\*(.+)\*/\s*$#Us' - - ), '', $str); - - // eliminate extraneous space - return trim($str); - } - - /** - * decodes a JSON string into appropriate variable - * - * @param string $str JSON-formatted string - * - * @return mixed number, boolean, string, array, or object - * corresponding to given JSON input string. - * See argument 1 to Services_JSON() above for object-output behavior. - * Note that decode() always returns strings - * in ASCII or UTF-8 format! - * @access public - */ - function decode($str) - { - $str = $this->reduce_string($str); - - switch (strtolower($str)) { - case 'true': - return true; - - case 'false': - return false; - - case 'null': - return null; - - default: - if (is_numeric($str)) { - // Lookie-loo, it's a number - - // This would work on its own, but I'm trying to be - // good about returning integers where appropriate: - // return (float)$str; - - // Return float or int, as appropriate - return ((float)$str == (integer)$str) - ? (integer)$str - : (float)$str; - - } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) { - // STRINGS RETURNED IN UTF-8 FORMAT - $delim = substr($str, 0, 1); - $chrs = substr($str, 1, -1); - $utf8 = ''; - $strlen_chrs = strlen($chrs); - - for ($c = 0; $c < $strlen_chrs; ++$c) { - - $substr_chrs_c_2 = substr($chrs, $c, 2); - $ord_chrs_c = ord($chrs{$c}); - - switch (true) { - case $substr_chrs_c_2 == '\b': - $utf8 .= chr(0x08); - ++$c; - break; - case $substr_chrs_c_2 == '\t': - $utf8 .= chr(0x09); - ++$c; - break; - case $substr_chrs_c_2 == '\n': - $utf8 .= chr(0x0A); - ++$c; - break; - case $substr_chrs_c_2 == '\f': - $utf8 .= chr(0x0C); - ++$c; - break; - case $substr_chrs_c_2 == '\r': - $utf8 .= chr(0x0D); - ++$c; - break; - - case $substr_chrs_c_2 == '\\"': - case $substr_chrs_c_2 == '\\\'': - case $substr_chrs_c_2 == '\\\\': - case $substr_chrs_c_2 == '\\/': - if (($delim == '"' && $substr_chrs_c_2 != '\\\'') || - ($delim == "'" && $substr_chrs_c_2 != '\\"')) { - $utf8 .= $chrs{++$c}; - } - break; - - case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)): - // single, escaped unicode character - $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2))) - . chr(hexdec(substr($chrs, ($c + 4), 2))); - $utf8 .= $this->utf162utf8($utf16); - $c += 5; - break; - - case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F): - $utf8 .= $chrs{$c}; - break; - - case ($ord_chrs_c & 0xE0) == 0xC0: - // characters U-00000080 - U-000007FF, mask 110XXXXX - //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 2); - ++$c; - break; - - case ($ord_chrs_c & 0xF0) == 0xE0: - // characters U-00000800 - U-0000FFFF, mask 1110XXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 3); - $c += 2; - break; - - case ($ord_chrs_c & 0xF8) == 0xF0: - // characters U-00010000 - U-001FFFFF, mask 11110XXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 4); - $c += 3; - break; - - case ($ord_chrs_c & 0xFC) == 0xF8: - // characters U-00200000 - U-03FFFFFF, mask 111110XX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 5); - $c += 4; - break; - - case ($ord_chrs_c & 0xFE) == 0xFC: - // characters U-04000000 - U-7FFFFFFF, mask 1111110X - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $utf8 .= substr($chrs, $c, 6); - $c += 5; - break; - - } - - } - - return $utf8; - - } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) { - // array, or object notation - - if ($str{0} == '[') { - $stk = array(SERVICES_JSON_IN_ARR); - $arr = array(); - } else { - if ($this->use == SERVICES_JSON_LOOSE_TYPE) { - $stk = array(SERVICES_JSON_IN_OBJ); - $obj = array(); - } else { - $stk = array(SERVICES_JSON_IN_OBJ); - $obj = new stdClass(); - } - } - - array_push($stk, array('what' => SERVICES_JSON_SLICE, - 'where' => 0, - 'delim' => false)); - - $chrs = substr($str, 1, -1); - $chrs = $this->reduce_string($chrs); - - if ($chrs == '') { - if (reset($stk) == SERVICES_JSON_IN_ARR) { - return $arr; - - } else { - return $obj; - - } - } - - //print("\nparsing {$chrs}\n"); - - $strlen_chrs = strlen($chrs); - - for ($c = 0; $c <= $strlen_chrs; ++$c) { - - $top = end($stk); - $substr_chrs_c_2 = substr($chrs, $c, 2); - - if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) { - // found a comma that is not inside a string, array, etc., - // OR we've reached the end of the character list - $slice = substr($chrs, $top['where'], ($c - $top['where'])); - array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false)); - //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - if (reset($stk) == SERVICES_JSON_IN_ARR) { - // we are in an array, so just push an element onto the stack - array_push($arr, $this->decode($slice)); - - } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) { - // we are in an object, so figure - // out the property name and set an - // element in an associative array, - // for now - if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) { - // "name":value pair - $key = $this->decode($parts[1]); - $val = $this->decode($parts[2]); - - if ($this->use == SERVICES_JSON_LOOSE_TYPE) { - $obj[$key] = $val; - } else { - $obj->$key = $val; - } - } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) { - // name:value pair, where name is unquoted - $key = $parts[1]; - $val = $this->decode($parts[2]); - - if ($this->use == SERVICES_JSON_LOOSE_TYPE) { - $obj[$key] = $val; - } else { - $obj->$key = $val; - } - } - - } - - } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) { - // found a quote, and we are not inside a string - array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c})); - //print("Found start of string at {$c}\n"); - - } elseif (($chrs{$c} == $top['delim']) && - ($top['what'] == SERVICES_JSON_IN_STR) && - (($chrs{$c - 1} != '\\') || - ($chrs{$c - 1} == '\\' && $chrs{$c - 2} == '\\'))) { - // found a quote, we're in a string, and it's not escaped - array_pop($stk); - //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n"); - - } elseif (($chrs{$c} == '[') && - in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { - // found a left-bracket, and we are in an array, object, or slice - array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false)); - //print("Found start of array at {$c}\n"); - - } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) { - // found a right-bracket, and we're in an array - array_pop($stk); - //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - } elseif (($chrs{$c} == '{') && - in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { - // found a left-brace, and we are in an array, object, or slice - array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false)); - //print("Found start of object at {$c}\n"); - - } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) { - // found a right-brace, and we're in an object - array_pop($stk); - //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - } elseif (($substr_chrs_c_2 == '/*') && - in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { - // found a comment start, and we are in an array, object, or slice - array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false)); - $c++; - //print("Found start of comment at {$c}\n"); - - } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) { - // found a comment end, and we're in one now - array_pop($stk); - $c++; - - for ($i = $top['where']; $i <= $c; ++$i) - $chrs = substr_replace($chrs, ' ', $i, 1); - - //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); - - } - - } - - if (reset($stk) == SERVICES_JSON_IN_ARR) { - return $arr; - - } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) { - return $obj; - - } - - } - } - } - -} - -?> \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/bigQuery b/includes/js/dojox/rpc/tests/resources/bigQuery deleted file mode 100644 index e8f9429..0000000 --- a/includes/js/dojox/rpc/tests/resources/bigQuery +++ /dev/null @@ -1 +0,0 @@ -[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20] \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/bigQuery5 b/includes/js/dojox/rpc/tests/resources/bigQuery5 deleted file mode 100644 index e77ca8d..0000000 --- a/includes/js/dojox/rpc/tests/resources/bigQuery5 +++ /dev/null @@ -1 +0,0 @@ -[1,2,3,4,5] \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/echo.php b/includes/js/dojox/rpc/tests/resources/echo.php deleted file mode 100644 index b38a3ee..0000000 --- a/includes/js/dojox/rpc/tests/resources/echo.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/includes/js/dojox/rpc/tests/resources/echoJson.php b/includes/js/dojox/rpc/tests/resources/echoJson.php deleted file mode 100644 index 52b5d03..0000000 --- a/includes/js/dojox/rpc/tests/resources/echoJson.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/includes/js/dojox/rpc/tests/resources/fakestore.php b/includes/js/dojox/rpc/tests/resources/fakestore.php deleted file mode 100644 index 075926a..0000000 --- a/includes/js/dojox/rpc/tests/resources/fakestore.php +++ /dev/null @@ -1,36 +0,0 @@ - diff --git a/includes/js/dojox/rpc/tests/resources/jsonRpc10.php b/includes/js/dojox/rpc/tests/resources/jsonRpc10.php deleted file mode 100644 index fc99b75..0000000 --- a/includes/js/dojox/rpc/tests/resources/jsonRpc10.php +++ /dev/null @@ -1,47 +0,0 @@ - sudo pear install File - // Your server will also need the Pear library directory included in PHP's - // include_path configuration directive - // require_once('File.php'); - - // ensure that we don't try to send "html" down to the client - header("Content-Type: text/plain"); - - $json = new Services_JSON; - //$fp = new File(); - - $results = array(); - $results['error'] = null; - - $jsonRequest = file_get_contents('php://input'); - //$jsonRequest = '{"params":["Blah"],"method":"myecho","id":86}'; - - $req = $json->decode($jsonRequest); - - $method = $req->method; - $params = $req->params; - - switch($method) { - case "postJsonRpc10EchoNamed": - case "postJsonRpc10Echo": - $results['result']=$params[0]; - break; - default: - $results['result']=""; - $results['error']="JSON-RPC 1.0 METHOD NOT FOUND"; - break; - } - - $results['id'] = $req->id; - - $encoded = $json->encode($results); - - print $encoded; -?> diff --git a/includes/js/dojox/rpc/tests/resources/jsonRpc11.php b/includes/js/dojox/rpc/tests/resources/jsonRpc11.php deleted file mode 100644 index 1c91e51..0000000 --- a/includes/js/dojox/rpc/tests/resources/jsonRpc11.php +++ /dev/null @@ -1,52 +0,0 @@ - sudo pear install File - // Your server will also need the Pear library directory included in PHP's - // include_path configuration directive - // require_once('File.php'); - - // ensure that we don't try to send "html" down to the client - header("Content-Type: text/plain"); - - $json = new Services_JSON; - //$fp = new File(); - - $results = array(); - $results['error'] = null; - - $jsonRequest = file_get_contents('php://input'); - //$jsonRequest = '{"params":["Blah"],"method":"myecho","id":86}'; - - $req = $json->decode($jsonRequest); - - $method = $req->method; - $params = $req->params; - - switch($method) { - case "rawPostJsonRpc11Echo": - if (is_array($params)){ - $results['result']=$params; - }else{ - $results['result']=$params->message; - } - break; - default: - $results['result']=""; - $results['error']=array(); - $results['error']['code']=-32601; - $results['error']["message"]="The requested remote-procedure does not exist / is not available."; - break; - } - - $results['id'] = $req->id; - - $encoded = $json->encode($results); - - print $encoded; -?> diff --git a/includes/js/dojox/rpc/tests/resources/jsonRpc12.php b/includes/js/dojox/rpc/tests/resources/jsonRpc12.php deleted file mode 100644 index 8fad2e5..0000000 --- a/includes/js/dojox/rpc/tests/resources/jsonRpc12.php +++ /dev/null @@ -1,53 +0,0 @@ - sudo pear install File - // Your server will also need the Pear library directory included in PHP's - // include_path configuration directive - // require_once('File.php'); - - // ensure that we don't try to send "html" down to the client - header("Content-Type: text/plain"); - - $json = new Services_JSON; - //$fp = new File(); - - $results = array(); - $results['error'] = null; - - $jsonRequest = file_get_contents('php://input'); - //$jsonRequest = '{"params":["Blah"],"method":"myecho","id":86}'; - - $req = $json->decode($jsonRequest); - - $method = $req->method; - $params = $req->params; - - switch($method) { - case "postJsonRpc12Echo": - case "postJsonRpc12EchoNamed": - if (is_array($params)){ - $results['result']=$params; - }else{ - $results['result']=$params->message; - } - break; - default: - $results['result']=""; - $results['error']=array(); - $results['error']['code']=-32601; - $results['error']["message"]="The requested remote-procedure does not exist / is not available."; - break; - } - - $results['id'] = $req->id; - - $encoded = $json->encode($results); - - print $encoded; -?> diff --git a/includes/js/dojox/rpc/tests/resources/jsonRpcPostGetEcho.php b/includes/js/dojox/rpc/tests/resources/jsonRpcPostGetEcho.php deleted file mode 100644 index 7db9153..0000000 --- a/includes/js/dojox/rpc/tests/resources/jsonRpcPostGetEcho.php +++ /dev/null @@ -1,38 +0,0 @@ -decode($params); - $result = "{id:" . $id . ", 'result':'" . $p[0]. "', error:''}"; - break; - case "postJsonRpc12Echo": - case "getJsonRpc12Echo": - case "postJsonRpc12EchoNamed": - case "getJsonRpc12EchoNamed": - $p = $json->decode($params); - - if ($p->message){ - $d = $p->message; - }else{ - $d=$p[0]; - } - $result = "{id:" . $id . ", 'result':'" . $d . "'}"; - break; - default: - $result = "{id:'1','error':'Unknown Method', 'result':'this result only here for this test, shouldnt be here in real code'}"; - break; - } - - print $result; - -?> diff --git a/includes/js/dojox/rpc/tests/resources/jsonpEcho.php b/includes/js/dojox/rpc/tests/resources/jsonpEcho.php deleted file mode 100644 index 15d9aaa..0000000 --- a/includes/js/dojox/rpc/tests/resources/jsonpEcho.php +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/includes/js/dojox/rpc/tests/resources/jsonpEcho.phps b/includes/js/dojox/rpc/tests/resources/jsonpEcho.phps deleted file mode 100644 index 15d9aaa..0000000 --- a/includes/js/dojox/rpc/tests/resources/jsonpEcho.phps +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/includes/js/dojox/rpc/tests/resources/jsonpJsonRpcEcho.php b/includes/js/dojox/rpc/tests/resources/jsonpJsonRpcEcho.php deleted file mode 100644 index 251f38e..0000000 --- a/includes/js/dojox/rpc/tests/resources/jsonpJsonRpcEcho.php +++ /dev/null @@ -1,37 +0,0 @@ -decode($_REQUEST['params']); - $callback = $_REQUEST["callback"]; - - switch($method){ - case "jsonpJsonRpc10EchoNamed": - case "jsonpJsonRpc11Echo": - case "jsonpJsonRpc11EchoNamed": - case "jsonpJsonRpc10Echo": - if ( ($method=="jsonpJsonRpc10EchoNamed")||($method=="jsonpJsonRpc11EchoNamed")){ - $message = $params->message; - }else{ - $message = $params[0]; - } - if ($message){ - switch($method){ - case "jsonpJsonRpc11Echo": - case "jsonpJsonRpc11EchoNamed": - $res = "{'id': '$id', result: '$message'}"; - break; - default: - $res = "{'id': '$id', result: '$message', 'error':''}"; - break; - } - }else{ - $res = "{'id': '$id', error: {'code': 100, 'message':'no message provided'}}"; - } - } - - print "$callback($res)"; - -?> diff --git a/includes/js/dojox/rpc/tests/resources/obj1 b/includes/js/dojox/rpc/tests/resources/obj1 deleted file mode 100644 index ff02ba8..0000000 --- a/includes/js/dojox/rpc/tests/resources/obj1 +++ /dev/null @@ -1 +0,0 @@ -{"id":"obj1","name":"Object 1","updated":1202755814406,"obj":{"foo":"bar"},"obj dup":{"$ref":"obj1.obj"},"testArray":[1,2,3,4]} \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/obj1testArray b/includes/js/dojox/rpc/tests/resources/obj1testArray deleted file mode 100644 index 0c624c1..0000000 --- a/includes/js/dojox/rpc/tests/resources/obj1testArray +++ /dev/null @@ -1 +0,0 @@ -[1,2,3,undefined,4] \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/obj3 b/includes/js/dojox/rpc/tests/resources/obj3 deleted file mode 100644 index 21cb328..0000000 --- a/includes/js/dojox/rpc/tests/resources/obj3 +++ /dev/null @@ -1 +0,0 @@ -{"id":"obj3","name":"Object 3"} \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/obj4 b/includes/js/dojox/rpc/tests/resources/obj4 deleted file mode 100644 index a429ecf..0000000 --- a/includes/js/dojox/rpc/tests/resources/obj4 +++ /dev/null @@ -1 +0,0 @@ -{"id":"obj4","name":"Object 4"} \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/query b/includes/js/dojox/rpc/tests/resources/query deleted file mode 100644 index cd18d6e..0000000 --- a/includes/js/dojox/rpc/tests/resources/query +++ /dev/null @@ -1,6 +0,0 @@ -[ - {id:"obj1",name:"Object 1"}, - {id:"obj2",name:"Object 2"}, - {$ref:"obj3"}, - {$ref:"obj4"} -] \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/rawEcho.php b/includes/js/dojox/rpc/tests/resources/rawEcho.php deleted file mode 100644 index e0c15c0..0000000 --- a/includes/js/dojox/rpc/tests/resources/rawEcho.php +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/includes/js/dojox/rpc/tests/resources/res b/includes/js/dojox/rpc/tests/resources/res deleted file mode 100644 index 3c22137..0000000 --- a/includes/js/dojox/rpc/tests/resources/res +++ /dev/null @@ -1 +0,0 @@ -deleted \ No newline at end of file diff --git a/includes/js/dojox/rpc/tests/resources/store.php b/includes/js/dojox/rpc/tests/resources/store.php deleted file mode 100644 index 941e113..0000000 --- a/includes/js/dojox/rpc/tests/resources/store.php +++ /dev/null @@ -1,24 +0,0 @@ - diff --git a/includes/js/dojox/rpc/tests/resources/test.smd b/includes/js/dojox/rpc/tests/resources/test.smd deleted file mode 100644 index 6ad56be..0000000 --- a/includes/js/dojox/rpc/tests/resources/test.smd +++ /dev/null @@ -1,189 +0,0 @@ -{ - transport: "POST", - envelope: "URL", - strictParameters: false, - parameters: { - appId: {}, - outputType: { - default: "json" - }, - - ignoreErrors: { - optional: true - } - }, - - services: { - postEcho: { - target: "echo.php", - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - - getEcho: { - transport: "GET", - target: "echo.php", - - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - getEchoJson: { - transport: "GET", - target: "echoJson.php", - contentType:"application/json", - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - getPathEcho: { - transport: "GET", - envelope: "PATH", - target: "echo.php?message=", - - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - restStore: { - transport: "REST", - contentType:"text/plain", - target: "fakestore.php", - parameters: [ - {name: "location", type: "string", optional: true} - ] - }, - jsonRestStore: { - transport: "REST", - target: "fakestore.php", - contentType:"application/json", - parameters: [ - {name: "location", type: "string", optional: true} - ] - }, - - - - postJsonEcho: { - transport: "POST", - envelope: "JSON", - target: "rawEcho.php", - - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - - jsonpEcho: { - transport: "JSONP", - target: "jsonpEcho.php", - callbackParamName: "testCallbackParam", - - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - - postJsonRpc10Echo: { - transport: "POST", - envelope: "JSON-RPC-1.0", - target: "jsonRpc10.php", - - parameters: [ - {type: "string", optional: true} - ] - }, - - postJsonRpc10EchoNamed: { - transport: "POST", - envelope: "JSON-RPC-1.0", - target: "jsonRpc10.php", - - parameters: [ - {type: "string", optional: true} - ] - }, - - jsonpJsonRpc12Echo: { - transport: "JSONP", - envelope: "JSON-RPC-2.0", - target: "jsonpJsonRpcEcho.php", - - parameters: [ - {type: "string", optional: true} - ] - }, - - jsonpJsonRpc12EchoNamed: { - transport: "JSONP", - envelope: "JSON-RPC-2.0", - target: "jsonpJsonRpcEcho.php", - - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - - postJsonRpc10ForcedError: { - envelope: "JSON-RPC-1.0", - transport: "POST", - target: "jsonRpc10.php", - - parameters: [ - {type: "string", optional: true} - ] - }, - - postJsonRpc12Echo: { - transport: "POST", - envelope: "JSON-RPC-2.0", - target: "jsonRpc12.php", - - parameters: [ - {name: "message", type: "string", optional: true} - ] - }, - - getJsonRpc12Echo: { - transport: "GET", - envelope: "JSON-RPC-2.0", - target: "jsonRpcPostGetEcho.php", - - parameters: [ - {type: "string", optional: true} - ] - }, - - postJsonRpc12EchoNamed: { - transport: "POST", - envelope: "JSON-RPC-2.0", - target: "jsonRpcPostGetEcho.php", - - parameters: [ - {type: "string", optional: true} - ] - }, - - getJsonRpc12EchoNamed: { - transport: "GET", - envelope: "JSON-RPC-2.0", - target: "jsonRpcPostGetEcho.php", - - parameters: [ - {type: "string", optional: true} - ] - }, - - - postJsonRpc12ForcedError: { - envelope: "JSON-RPC-2.0", - transport: "POST", - target: "jsonRpc12.php", - - parameters: [ - {type: "string", optional: true} - ] - } - } -} diff --git a/includes/js/dojox/rpc/tests/runLibraryTests.html b/includes/js/dojox/rpc/tests/runLibraryTests.html deleted file mode 100644 index 25c88a7..0000000 --- a/includes/js/dojox/rpc/tests/runLibraryTests.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - Dojox Unit Test Runner - - - Redirecting to D.O.H runner. - - diff --git a/includes/js/dojox/rpc/tests/runTests.html b/includes/js/dojox/rpc/tests/runTests.html deleted file mode 100644 index bb937c6..0000000 --- a/includes/js/dojox/rpc/tests/runTests.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - Dojox Unit Test Runner - - - Redirecting to D.O.H runner. - - diff --git a/includes/js/dojox/rpc/tests/stores/JsonRestStore.js b/includes/js/dojox/rpc/tests/stores/JsonRestStore.js deleted file mode 100644 index 25e0fc7..0000000 --- a/includes/js/dojox/rpc/tests/stores/JsonRestStore.js +++ /dev/null @@ -1,237 +0,0 @@ -if(!dojo._hasResource["dojox.data.tests.stores.JsonRestStore"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. -dojo._hasResource["dojox.data.tests.stores.JsonRestStore"] = true; -dojo.provide("dojox.data.tests.stores.JsonRestStore"); -dojo.require("dojox.data.JsonRestStore"); -dojo.require("dojo.data.api.Read"); -dojo.require("dojox.rpc.Service"); - -dojox.data.tests.stores.JsonRestStore.error = function(t, d, errData){ - // summary: - // The error callback function to be used for all of the tests. - d.errback(errData); -} -var testServices = new dojox.rpc.Service(dojo.moduleUrl("dojox.rpc.tests.resources", "test.smd")); -var jsonStore = new dojox.data.JsonRestStore({service:testServices.jsonRestStore}); - -doh.register("dojox.data.tests.stores.JsonRestStore", - [ - { - name: "Fetch some items", - timeout: 10000, //10 seconds. - runTest: function(t) { - // summary: - // Simple test of a basic fetch on JsonRestStore of a simple query. - var d = new doh.Deferred(); - jsonStore.fetch({query:"query", - onComplete: function(items, request){ - t.is(4, items.length); - d.callback(true); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - return d; //Object - } - }, - { - name: "fetch by id", - timeout: 10000, //10 seconds. - runTest: function(t) { - // summary: - // Simple test of a basic fetch on JsonRestStore of a single item. - var d = new doh.Deferred(); - jsonStore.fetch({query:"obj1", - onComplete: function(item, request){ - t.is("Object 1", item.name); - t.t(jsonStore.hasAttribute(item,"name")); - t.is(jsonStore.getValues(item,"name").length,1); - t.t(jsonStore.isItem(item)); - d.callback(true); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - return d; //Object - } - }, - { - name: "Modify,save, check by id", - timeout: 10000, //10 seconds. - runTest: function(t) { - // summary: - // Fetch an item from a query, modify and save it, and check to see if it was modified correctly - var d = new doh.Deferred(); - jsonStore.fetch({query:"query", - onComplete: function(items, request){ - var now = new Date().getTime(); - jsonStore.setValue(items[0],"updated",now); - jsonStore.setValue(items[0],"obj",{foo:'bar'}); - jsonStore.setValue(items[0],"obj dup",items[0].obj); - jsonStore.setValue(items[0],"testArray",[1,2,3,4]); - jsonStore.save(); - jsonStore.fetch({query:"obj1", - onComplete: function(item, request){ - t.is("Object 1", item.name); - t.is(now, item.updated); - t.is("bar", item.obj.foo); - t.is(item.obj, item['obj dup']); - d.callback(true); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - return d; //Object - } - }, - { - name: "Post, delete, and put", - timeout: 10000, //10 seconds. - runTest: function(t) { - // summary: - // append/post an item, delete it, sort the lists, resort the list, saving each time. - var d = new doh.Deferred(); - jsonStore.fetch({query:"obj1", - onComplete: function(item, request){ - var now = new Date().getTime(); - var testArray = item.testArray; - var newObject = {"name":"new object"}; - testArray.push(newObject); - jsonStore.save(); - jsonStore.deleteItem(newObject,{parent:testArray}); - jsonStore.save(); - testArray.sort(function(obj1,obj2) { return obj1 < obj2; }); - jsonStore.save(); - testArray.sort(function(obj1,obj2) { return obj1 > obj2; }); - jsonStore.save(); - d.callback(true); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - return d; //Object - } - }, - { - name: "Revert", - timeout: 10000, //10 seconds. - runTest: function(t) { - // summary: - // append/post an item, delete it, sort the lists, resort the list, saving each time. - var d = new doh.Deferred(); - jsonStore.fetch({query:"obj1", - onComplete: function(item, request){ - jsonStore.setValue(item,"name","new name"); - jsonStore.setValue(item,"newProp","new value"); - jsonStore.unsetAttribute(item,"updated"); - t.is(jsonStore.getValue(item,"name"),"new name"); - t.is(jsonStore.getValue(item,"newProp"),"new value"); - t.is(jsonStore.getValue(item,"updated"),undefined); - jsonStore.revert(); - t.is(jsonStore.getValue(item,"name"),"Object 1"); - t.is(jsonStore.getValue(item,"newProp"),undefined); - t.t(typeof jsonStore.getValue(item,"updated") == 'number'); - d.callback(true); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - return d; //Object - } - }, - { - name: "Lazy loading", - timeout: 10000, //10 seconds. - runTest: function(t) { - // summary: - // test lazy loading - var d = new doh.Deferred(); - jsonStore.fetch({query:"query", - onComplete: function(items, request){ - /*var item = jsonStore.getValue(items,2); // sync lazy loading - t.is(item.name == 'Object 3');*/ - jsonStore.getValue(items,3,function(item) { // async lazy loading - t.is(item.name,'Object 4'); - d.callback(true); - }); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - return d; //Object - } - }, - { - name: "Array manipulation", - timeout: 10000, //10 seconds. - runTest: function(t) { - // summary: - // test array manipulation - var d = new doh.Deferred(); - jsonStore.fetch({query:"obj1", - onComplete: function(item, request){ - var testArray = item.testArray; - testArray.reverse(); - testArray.unshift(testArray.pop()); - jsonStore.onSave = function(data) { - t.is(data.length,1); - d.callback(true); - jsonStore.onSave = function(){}; - }; - jsonStore.save(); - }, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, doh, d)}); - return d; //Object - } - }, - - { - name: "ReadAPI: Fetch_20_Streaming", - timeout: 10000, //10 seconds. Json can sometimes be slow. - runTest: function(t) { - // summary: - // fetching with paging - - var d = new doh.Deferred(); - var count = 0; - - function onItem(item, requestObj){ - t.assertTrue(typeof item == 'number'); - count++; - } - function onComplete(items, request){ - t.is(5, count); - - t.is(null, items); - d.callback(true); - } - //Get everything... - jsonStore.fetch({ - query: "bigQuery", - onBegin: null, - count: 5, - onItem: onItem, - onComplete: onComplete, - onError: dojo.partial(dojox.data.tests.stores.JsonRestStore.error, t, d) - }); - return d; //Object - } - }, - function testReadAPI_functionConformance(t){ - // summary: - // Simple test read API conformance. Checks to see all declared functions are actual functions on the instances. - // description: - // Simple test read API conformance. Checks to see all declared functions are actual functions on the instances. - - var readApi = new dojo.data.api.Read(); - var passed = true; - - for(i in readApi){ - if(i.toString().charAt(0) !== '_') - { - var member = readApi[i]; - //Check that all the 'Read' defined functions exist on the test store. - if(typeof member === "function"){ - var testStoreMember = jsonStore [i]; - if(!(typeof testStoreMember === "function")){ - passed = false; - break; - } - } - } - } - } - ] -); - - -} diff --git a/includes/js/dojox/rpc/tests/test_dojo_data_model_persevere.html b/includes/js/dojox/rpc/tests/test_dojo_data_model_persevere.html deleted file mode 100644 index 063dc9b..0000000 --- a/includes/js/dojox/rpc/tests/test_dojo_data_model_persevere.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - dojox.Grid with Dojo.Data via binding - - - - - - - -
dojox.Grid using interactive PersevereRestStore
-
- - -     - -     - - - -
- -
-
- - -- cgit v1.2.3