You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2011/06/18 01:43:51 UTC

svn commit: r1137082 [1/3] - in /shindig/trunk: content/container/ content/gadgets/compliance/javascript-tests/1.1/ content/gadgets/compliance/javascript-tests/1.1/activities/ content/gadgets/compliance/javascript-tests/1.1/appdata/ content/gadgets/com...

Author: lindner
Date: Fri Jun 17 23:43:46 2011
New Revision: 1137082

URL: http://svn.apache.org/viewvc?rev=1137082&view=rev
Log:
clean up our mime-types and ignores

Modified:
    shindig/trunk/content/container/datauri_proxy.html   (props changed)
    shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js   (contents, props changed)
    shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml   (contents, props changed)
    shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js   (contents, props changed)
    shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml   (contents, props changed)
    shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/people/peoplesuite.js   (contents, props changed)
    shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/people/suite.xml   (contents, props changed)
    shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/suite.xml   (contents, props changed)
    shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js   (props changed)
    shindig/trunk/content/samplecontainer/examples/commoncontainer/sample-views.xml   (props changed)
    shindig/trunk/content/samplecontainer/examples/commoncontainer/viewController.js   (props changed)
    shindig/trunk/etc/eclipse/shindig-eclipse-cleanup.xml   (props changed)
    shindig/trunk/etc/eclipse/shindig-eclipse-javascript-cleanup.xml   (props changed)
    shindig/trunk/etc/eclipse/shindig-eclipse-javascript-codestyle.xml   (props changed)
    shindig/trunk/etc/eclipse/shindig-eclipse-javascript-codetemplate.xml   (props changed)
    shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/inline.js   (props changed)
    shindig/trunk/extras/src/main/php/extras/GadgetUrlAuthRenderer.php   (props changed)
    shindig/trunk/features/src/main/javascript/features/caja-guest-frame/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/caja-taming-frame/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/cloo/cloo.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/cloo/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.gadget/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.gadget/gadget_holder.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.gadget/gadget_site.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.url/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.url/url_holder.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.url/url_site.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.util/constant.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.util/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/container.util/util.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.config.base/config.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.config.base/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.config/validators.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.json/json-flatten.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.json/json-native.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.base/base.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.base/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.dom/dom.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.dom/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.event/event.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.event/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.onload/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.string/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.string/string.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.string/taming.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.urlparams/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.urlparams/taming.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/core.util.urlparams/urlparams.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/dynamic-height.height/dynamic-height-height.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/dynamic-height.height/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/dynamic-height.height/taming.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/dynamic-height.util/taming.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/exportjs/exportjs.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/exportjs/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/json-xmltojson.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/taming.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/opensocial-base/taming.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/osapi.base/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/osapi.base/taming.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/rpc/flash.transport.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/rpc/noop.transport.js   (props changed)
    shindig/trunk/features/src/main/javascript/features/shindig.sha1/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/taming/feature.xml   (props changed)
    shindig/trunk/features/src/main/javascript/features/taming/taming.js   (props changed)
    shindig/trunk/features/src/test/javascript/features/container.url/container_url_test.js   (props changed)
    shindig/trunk/features/src/test/javascript/features/container.url/url_holder_test.js   (props changed)
    shindig/trunk/features/src/test/javascript/features/container.url/url_site_test.js   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/Authority.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthority.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/BasicAuthorityProvider.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HostFilter.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/ServletRequestContext.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBean.java   (props changed)
    shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/ExtendableBeanImpl.java   (props changed)
    shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties   (props changed)
    shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties   (props changed)
    shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthenticationServletFilterTest.java   (props changed)
    shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/UrlParameterAuthenticationHandlerTest.java   (props changed)
    shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java   (props changed)
    shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/BasicAuthorityProviderTest.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsCompileMode.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFile.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureFileSystem.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/DefaultFeatureRegistryProvider.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFile.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureFileSystem.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistryProvider.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/CompilationProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistry.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/GetJsContentProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsGadgetContext.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipelineModule.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/JsCompiler.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETagFilter.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCache.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/Test.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/js/JsCompilerModule.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/Test.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/js/JsCompilerModule.java   (props changed)
    shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsCompileModeTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/config/DefaultConfigProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AnonFuncWrappingProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CajaJsSubtractingProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/CompilationProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsServingPipelineTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ExportJsProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsRequestBuilderTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsResponseBuilderTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessorTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETagFilterTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ModuleCacheTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java   (props changed)
    shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage420.jpg   (props changed)
    shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImage444.jpg   (props changed)
    shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/image/testImageNotHuffmanOptimized.jpg   (props changed)
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/commoncontainer/auth/CommonContainerAuthGuiceModule.java   (props changed)
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/commoncontainer/auth/CommonContainerSecurityTokenCodec.java   (props changed)
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/commoncontainer/auth/TestSecurityTokenCodec.java   (props changed)
    shindig/trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml   (props changed)
    shindig/trunk/java/server/src/test/resources/endtoend/viewMessages.xml   (props changed)
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EmbeddedExperienceImpl.java   (props changed)
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthValidatorProvider.java   (props changed)
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmbeddedExperience.java   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomId.xml   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryAtomIds.xml   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlId.xml   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryXmlIds.xml   (props changed)
    shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java   (props changed)
    shindig/trunk/java/uber/   (props changed)
    shindig/trunk/java/uber/pom.xml   (props changed)
    shindig/trunk/php/test/gadgets/GadgetFactoryTest.php   (props changed)
    shindig/trunk/php/test/gadgets/GadgetRenderingServletTest.php   (props changed)
    shindig/trunk/php/test/gadgets/TemplateParserTest.php   (props changed)
    shindig/trunk/php/test/social/JsonRpcServletTest.php   (props changed)

Propchange: shindig/trunk/content/container/datauri_proxy.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/content/container/datauri_proxy.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js
URL: http://svn.apache.org/viewvc/shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js?rev=1137082&r1=1137081&r2=1137082&view=diff
==============================================================================
--- shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js (original)
+++ shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js Fri Jun 17 23:43:46 2011
@@ -1,150 +1,150 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-function runActivitiesSuite(){
-	
-	module("OpenSocial JavaScript Activities Tests 1.1");
-	
-	asyncTest("osapi.activities.get defaults", function(){
-		ok(osapi.activities.get, "osapi.activities.get exists");
-		var req = osapi.activities.get();
-		ok(req != null,"Req not null");
-		setTimeout(function(){
-			req.execute(function(response){
-				ok(!response.error, "No error in get response");
-				ok(response.totalResults == 1,"total results = " + response.totalResults + ", expected 1");
-				var count = 0;
-				for(var i in response.list){
-					ok(response.list[i], "Activity " + i);
-					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
-					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
-					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
-					count ++;
-				}
-				ok(count == response.totalResults,"Number of activities in list should match totalResults");
-				start();
-			});			
-		},1000);
-
-	});
-	
-	asyncTest("osapi.activities.get viewer", function(){
-		ok(osapi.activities.get, "osapi.activities.get exists");
-		var req = osapi.activities.get({userId: "@viewer"});
-		ok(req != null,"Req not null");
-		setTimeout(function(){
-			req.execute(function(response){
-				ok(!response.error, "No error in get response");
-				ok(response.totalResults == 1,"total results = " + response.totalResults + ", expected 1");
-				var count = 0;
-				for(var i in response.list){
-					ok(response.list[i], "Activity " + i);
-					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
-					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
-					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
-					count ++;
-				}
-				ok(count == response.totalResults,"Number of activities in list should match totalResults");
-				start();
-			});			
-		},1000);
-
-	});
-	
-	asyncTest("osapi.activities.get owner", function(){
-		ok(osapi.activities.get, "osapi.activities.get exists");
-		var req = osapi.activities.get({userId: "@owner"});
-		ok(req != null,"Req not null");
-		setTimeout(function(){
-			req.execute(function(response){
-				ok(!response.error, "No error in get response");
-				ok(response.totalResults == 1,"total results = " + response.totalResults + ", expected 1");
-				var count = 0;
-				for(var i in response.list){
-					ok(response.list[i], "Activity " + i);
-					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
-					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
-					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
-					count ++;
-				}
-				ok(count == response.totalResults,"Number of activities in list should match totalResults");
-				start();
-			});			
-		},1000);
-
-	});
-	
-	asyncTest("osapi.activities.get viewer friends",function(){
-		ok(osapi.activities.get, "osapi.activities.get exists");
-		var req = osapi.activities.get({userId : "@viewer", groupId : "@friends"});
-		ok(req != null,"Req not null");
-		setTimeout(function(){
-			req.execute(function(response){
-				ok(!response.error, "No error in get response");
-				ok(response.totalResults == 2,"total results = " + response.totalResults + ", expected 2");
-				var count = 0;
-				for(var i in response.list){
-					ok(response.list[i], "Activity " + i);
-					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
-					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
-					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
-					count ++;
-				}
-				ok(count == response.totalResults,"Number of activities in list should match totalResults");
-				start();
-			});			
-		},1000);
-
-	});
-	
-	asyncTest("osapi.activities.get owner friends",function(){
-		ok(osapi.activities.get, "osapi.activities.get exists");
-		var req = osapi.activities.get({userId : "@owner", groupId : "@friends"});
-		ok(req != null,"Req not null");
-		setTimeout(function(){
-			req.execute(function(response){
-				ok(!response.error, "No error in get response");
-				ok(response.totalResults == 2,"total results = " + response.totalResults + ", expected 2");
-				var count = 0;
-				for(var i in response.list){
-					ok(response.list[i], "Activity " + i);
-					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
-					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
-					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
-					count ++;
-				}
-				ok(count == response.totalResults,"Number of activities in list should match totalResults");
-				start();
-			});			
-		},1000);
-
-	});
-	
-	asyncTest("osapi.activities.get with non-existant ID",function(){
-		ok(osapi.activities.get, "osapi.activities.get exists");
-		var req = osapi.activities.get({userId : "DOES_NOT_EXIST"});
-		ok(req != null,"Req not null");
-		setTimeout(function(){
-			req.execute(function(response){
-				ok(!response.error, "No error in get response");
-				console.log(response);
-				ok(response.totalResults == 0);
-				start();
-			});			
-		},1000);
-
-	});
-	
-	
-}
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function runActivitiesSuite(){
+	
+	module("OpenSocial JavaScript Activities Tests 1.1");
+	
+	asyncTest("osapi.activities.get defaults", function(){
+		ok(osapi.activities.get, "osapi.activities.get exists");
+		var req = osapi.activities.get();
+		ok(req != null,"Req not null");
+		setTimeout(function(){
+			req.execute(function(response){
+				ok(!response.error, "No error in get response");
+				ok(response.totalResults == 1,"total results = " + response.totalResults + ", expected 1");
+				var count = 0;
+				for(var i in response.list){
+					ok(response.list[i], "Activity " + i);
+					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
+					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
+					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
+					count ++;
+				}
+				ok(count == response.totalResults,"Number of activities in list should match totalResults");
+				start();
+			});			
+		},1000);
+
+	});
+	
+	asyncTest("osapi.activities.get viewer", function(){
+		ok(osapi.activities.get, "osapi.activities.get exists");
+		var req = osapi.activities.get({userId: "@viewer"});
+		ok(req != null,"Req not null");
+		setTimeout(function(){
+			req.execute(function(response){
+				ok(!response.error, "No error in get response");
+				ok(response.totalResults == 1,"total results = " + response.totalResults + ", expected 1");
+				var count = 0;
+				for(var i in response.list){
+					ok(response.list[i], "Activity " + i);
+					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
+					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
+					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
+					count ++;
+				}
+				ok(count == response.totalResults,"Number of activities in list should match totalResults");
+				start();
+			});			
+		},1000);
+
+	});
+	
+	asyncTest("osapi.activities.get owner", function(){
+		ok(osapi.activities.get, "osapi.activities.get exists");
+		var req = osapi.activities.get({userId: "@owner"});
+		ok(req != null,"Req not null");
+		setTimeout(function(){
+			req.execute(function(response){
+				ok(!response.error, "No error in get response");
+				ok(response.totalResults == 1,"total results = " + response.totalResults + ", expected 1");
+				var count = 0;
+				for(var i in response.list){
+					ok(response.list[i], "Activity " + i);
+					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
+					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
+					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
+					count ++;
+				}
+				ok(count == response.totalResults,"Number of activities in list should match totalResults");
+				start();
+			});			
+		},1000);
+
+	});
+	
+	asyncTest("osapi.activities.get viewer friends",function(){
+		ok(osapi.activities.get, "osapi.activities.get exists");
+		var req = osapi.activities.get({userId : "@viewer", groupId : "@friends"});
+		ok(req != null,"Req not null");
+		setTimeout(function(){
+			req.execute(function(response){
+				ok(!response.error, "No error in get response");
+				ok(response.totalResults == 2,"total results = " + response.totalResults + ", expected 2");
+				var count = 0;
+				for(var i in response.list){
+					ok(response.list[i], "Activity " + i);
+					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
+					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
+					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
+					count ++;
+				}
+				ok(count == response.totalResults,"Number of activities in list should match totalResults");
+				start();
+			});			
+		},1000);
+
+	});
+	
+	asyncTest("osapi.activities.get owner friends",function(){
+		ok(osapi.activities.get, "osapi.activities.get exists");
+		var req = osapi.activities.get({userId : "@owner", groupId : "@friends"});
+		ok(req != null,"Req not null");
+		setTimeout(function(){
+			req.execute(function(response){
+				ok(!response.error, "No error in get response");
+				ok(response.totalResults == 2,"total results = " + response.totalResults + ", expected 2");
+				var count = 0;
+				for(var i in response.list){
+					ok(response.list[i], "Activity " + i);
+					ok(response.list[i].id, "Activity " + i + " id: " + response.list[i].id);
+					ok(response.list[i].title, "Activity " + i + " title: " + response.list[i].title);
+					ok(response.list[i].userId, "Activity " + i + " userId: " + response.list[i].userId);
+					count ++;
+				}
+				ok(count == response.totalResults,"Number of activities in list should match totalResults");
+				start();
+			});			
+		},1000);
+
+	});
+	
+	asyncTest("osapi.activities.get with non-existant ID",function(){
+		ok(osapi.activities.get, "osapi.activities.get exists");
+		var req = osapi.activities.get({userId : "DOES_NOT_EXIST"});
+		ok(req != null,"Req not null");
+		setTimeout(function(){
+			req.execute(function(response){
+				ok(!response.error, "No error in get response");
+				console.log(response);
+				ok(response.totalResults == 0);
+				start();
+			});			
+		},1000);
+
+	});
+	
+	
+}

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/activitiessuite.js
------------------------------------------------------------------------------
    svn:mime-type = text/javascript

Modified: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml?rev=1137082&r1=1137081&r2=1137082&view=diff
==============================================================================
--- shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml (original)
+++ shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml Fri Jun 17 23:43:46 2011
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<Module specificationVersion="1.1">
-  <ModulePrefs title="Activities Tests 1.1" author="OpenSocial_QA"
-               description="Activities Requests Tests 1.1">
-    <Require feature="dynamic-height"/>
-    <Require feature="osapi"/>
-    <Require feature="opensocial-data"/>
-    <Require feature="opensocial"/>
-  </ModulePrefs>
-  <Content type="html" scrolling="true">
-    <![CDATA[
-<html>
-  <head>
-  <link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen" />
-  <script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
-  <script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js"></script>
-  <script type="text/javascript" src="activitiessuite.js"></script>
-  
-  <script>
-  
-      gadgets.util.registerOnLoadHandler(runActivitiesSuite);
-      gadgets.util.registerOnLoadHandler(function(){
-            gadgets.window.adjustHeight(2000);
-      });
-
-  </script>
-  </head>
-  
-  <body>
-    <h1 id="qunit-header">OpenSocial JavaScript 1.1 Activities</h1>
-    <h2 id="qunit-banner"></h2>
-    <div id="qunit-testrunner-toolbar"></div>
-    <h2 id="qunit-userAgent"></h2>
-    <ol id="qunit-tests"></ol>
-    <div id="qunit-fixture">test markup, will be hidden</div>
-  </body>
-</html>
-  
-  
-]]>
-  </Content>
-</Module>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<Module specificationVersion="1.1">
+  <ModulePrefs title="Activities Tests 1.1" author="OpenSocial_QA"
+               description="Activities Requests Tests 1.1">
+    <Require feature="dynamic-height"/>
+    <Require feature="osapi"/>
+    <Require feature="opensocial-data"/>
+    <Require feature="opensocial"/>
+  </ModulePrefs>
+  <Content type="html" scrolling="true">
+    <![CDATA[
+<html>
+  <head>
+  <link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
+  <script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js"></script>
+  <script type="text/javascript" src="activitiessuite.js"></script>
+  
+  <script>
+  
+      gadgets.util.registerOnLoadHandler(runActivitiesSuite);
+      gadgets.util.registerOnLoadHandler(function(){
+            gadgets.window.adjustHeight(2000);
+      });
+
+  </script>
+  </head>
+  
+  <body>
+    <h1 id="qunit-header">OpenSocial JavaScript 1.1 Activities</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    <div id="qunit-fixture">test markup, will be hidden</div>
+  </body>
+</html>
+  
+  
+]]>
+  </Content>
+</Module>

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/activities/suite.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js
URL: http://svn.apache.org/viewvc/shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js?rev=1137082&r1=1137081&r2=1137082&view=diff
==============================================================================
--- shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js (original)
+++ shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js Fri Jun 17 23:43:46 2011
@@ -1,411 +1,411 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var appDataPersonalValue2 = 'personalValue2 ' + new Date().getTime();
-var appDataPersonalValue1 = 'personalValue1 ' + new Date().getTime();
-function runAppDataSuite(){
-	
-	module("OpenSocial JavaScript AppData Tests 1.1");
-	
-	asyncTest("osapi.appdata.(update, get) defaults" , function(){
-
-		ok(osapi.appdata.update, "osapi.appdata.update exists");
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var pairs = {"testKey1" : appDataPersonalValue1};
-        ok(pairs,"Setting testKey1 to " + appDataPersonalValue1);
-        var params = {data : pairs};
-        var req = osapi.appdata.update(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-
-                var params = {keys : ["testKey1"]};
-                var req2 = osapi.appdata.get(params);
-                ok(req2 != null, "Req not null");
-                req2.execute(function(response){
-                		ok(!response.error,"No error in response");
-                		for(var person in response){
-                			ok(response[person]["testKey1"],"Response contains personalValue1");
-                			ok(response[person]["testKey1"] == appDataPersonalValue1, "personalValue1 matches expected value");
-                		}
-                		start();
-                	});
-        	});
-        }, 1000);
-      
-	});
-	
-	asyncTest("osapi.appdata.(update, get) @me" , function(){
-
-		ok(osapi.appdata.update, "osapi.appdata.update exists");
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var pairs = {"testKey2" : appDataPersonalValue2};
-        ok(pairs,"Setting personalValue to " + appDataPersonalValue2);
-        var params = {userId : "@me", data : pairs};
-        var req = osapi.appdata.update(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-                var params = {userId : "@me" , keys : ["testKey2"]};
-                var req2 = osapi.appdata.get(params);
-                ok(req2 != null, "Req not null");
-                req2.execute(function(response){
-                		ok(!response.error,"No error in response");
-                		var i = 0;
-                		for(var person in response){
-                			i++;
-                			ok(response[person]["testKey2"] == appDataPersonalValue2, 
-                					appDataPersonalValue2 + " matches retreived value "+ response[person]["testKey2"]);
-                		}
-                		ok(i == 1, "Expect 1 Person in response, found " + i);
-                		start();
-                	});
-        	});
-        }, 1000);
-      
-	});
-	
-	asyncTest("osapi.appdata.get w/ wildcard", function(){
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var params = {keys : ["*"]};
-        var req = osapi.appdata.get(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-//        		for(var person in response){
-//TODO VALIDATE RESPONSE
-//        		}
-        		start();
-        	});
-        }, 1000);
-	});
-	
-	//TODO fully validate response against compliance db
-	asyncTest("osapi.appdata.get @viewer", function(){
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var params = {userId : "@viewer"};
-        var req = osapi.appdata.get(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-        		var count = 0;
-        		for(var person in response){
-        			ok(person, person + " in response");
-        			count ++;
-        		}
-        		ok(count == 1, "Expected 1 person in response");
-        		start();
-        	});
-        }, 1000);
-	});
-	
-	
-	//TODO fully validate response against compliance db
-	asyncTest("osapi.appdata.get @owner", function(){
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var params = {userId : "@owner"};
-        var req = osapi.appdata.get(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-        		var count = 0;
-        		for(var person in response){
-        			ok(person, person + " in response");
-        			count ++;
-        		}
-        		ok(count == 1, "Expected 1 person in response");
-        		start();
-        	});
-        }, 1000);
-	});
-	
-	asyncTest("osapi.appdata.get w/ DOES_NOT_EXIST property", function(){
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var params = {keys : ["DOES_NOT_EXIST"]};
-        var req = osapi.appdata.get(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error, "No error in response");
-        		for(var person in response){
-        			ok(person, person +" in response");
-        			for(var data in response[person]){
-        				ok(false,person+" response should not contain data, but found \'" + data+"\'");
-        			}
-        		}
-        		start();
-        	});
-        }, 1000);
-	});
-	
-    
-	asyncTest("osapi.appdata.UPDATE without data property (Expect Error)", function(){
-		ok(osapi.appdata.update, "osapi.appdata.update exists");
-        var params = {};
-        var req = osapi.appdata.update(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(response.error,"Expecting error in UPDATE response");
-        		start();
-        	});
-        }, 1000);
-      
-	});
-	
-	asyncTest("osapi.appdata.DELETE without keys property (Expect Error)", function(){
-		ok(osapi.appdata.delete, "osapi.appdata.delete exists");
-        var params = {};
-        var req = osapi.appdata.delete(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(response.error,"Expecting error in DELETE response");
-        		start();
-        	});
-        }, 1000);
-      
-	});
-        
-	asyncTest("osapi.appdata.GET without keys property (Expect Error)", function(){
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var params = {};
-        var req = osapi.appdata.get(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(response.error,"Expecting error in GET response");
-        		start();
-        	});
-        }, 1000);
-      
-	});
-	
-	asyncTest("osapi.appdata.(update, get) @viewer  w/ key array" , function(){
-
-		ok(osapi.appdata.update, "osapi.appdata.update exists");
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var pairs = {"testKey2" : appDataPersonalValue2, "testKey1" : appDataPersonalValue1};
-        var params = {userId : "@viewer", data : pairs};
-        var req = osapi.appdata.update(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-
-                var params = {userId : "@viewer" , keys : ["testKey2", "testKey1"]};
-                var req2 = osapi.appdata.get(params);
-                ok(req2 != null, "Req not null");
-                req2.execute(function(response){
-                		ok(!response.error,"No error in response");
-                		var i = 0;
-                		for(var person in response){
-                			i++;
-                			var j = 0;
-                			for(var data in response[person]){
-                				j++;
-                				if(data == "testKey1"){
-                        			ok(response[person]["testKey1"] == appDataPersonalValue1, 
-                        					"testKey1 value = " + response[person]["testKey1"] + ", expected " + appDataPersonalValue1);
-                				} else if(data == "testKey2"){
-                        			ok(response[person]["testKey2"] == appDataPersonalValue2, 
-                        					"testKey2 value = " + response[person]["testKey2"] + ", expected " + appDataPersonalValue2);
-                				} else {
-                					ok(false, "Found unexpected key \'" + data + "\', value = " + response[person][data]);
-                				}
-                			}
-                		}
-                		ok(i == 1, "Expect 1 Person in response, found " + i);
-                		start();
-                	});
-        	});
-        }, 1000);
-      
-	});
-	
-	
-	//Assumes that one of the @viewer's friends is jane.doe
-	asyncTest("osapi.appdata.(update, get) Viewer Friends" , function(){
-		ok(osapi.appdata.update, "osapi.appdata.update exists");
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var pairs = {"testKey1" : "friendDataZZ"};
-        ok(pairs,"Setting \'jane.doe\' testKey1 to \'friendDataZZ\'");
-        var params = {userId : "jane.doe", groupId : "@self", data : pairs};
-        var req = osapi.appdata.update(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-                var params = {userId : "@viewer", groupId : "@friends", keys : ["testKey1"]};
-                var req2 = osapi.appdata.get(params);
-                ok(req2 != null, "Req not null");
-                req2.execute(function(response){
-                		ok(!response.error,"No error in response");
-                		for(var person in response){
-                			ok(person != "john.doe", person + " is not john.doe");
-                			if(person == "jane.doe"){
-                    			ok(response[person]["testKey1"], person + " appdata contains contains testKey1");
-                    			ok(response[person]["testKey1"] == "friendDataZZ",
-                    					person + " testKey1 value = " + response[person]["testKey1"] + ", expected = friendDataZZ");
-                			}
-                		}
-                		start();
-                	});
-        	});
-        }, 1000);
-      
-	});
-	
-	//Assumes that one of the @owner's friends is jane.doe
-	asyncTest("osapi.appdata.(update, get) Owner Friends" , function(){
-		ok(osapi.appdata.update, "osapi.appdata.update exists");
-		ok(osapi.appdata.get, "osapi.appdata.get exists");
-        var pairs = {"testKey1" : "friendDataZZ"};
-        ok(pairs,"Setting \'jane.doe\' testKey1 to \'friendDataZZ\'");
-        var params = {userId : "jane.doe", groupId : "@self", data : pairs};
-        var req = osapi.appdata.update(params);
-        ok(req != null, "Req not null");
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"No error in response");
-                var params = {userId : "@owner", groupId : "@friends", keys : ["testKey1"]};
-                var req2 = osapi.appdata.get(params);
-                ok(req2 != null, "Req not null");
-                req2.execute(function(response){
-                		ok(!response.error,"No error in response");
-                		for(var person in response){
-                			ok(person != "john.doe", person + " is not john.doe");
-                			if(person == "jane.doe"){
-                    			ok(response[person]["testKey1"], person + " appdata contains contains testKey1");
-                    			ok(response[person]["testKey1"] == "friendDataZZ",
-                    					person + " testKey1 value = " + response[person]["testKey1"] + ", expected = friendDataZZ");
-                			}
-                		}
-                		start();
-                	});
-        	});
-        }, 1000);
-      
-	});
-	
-	asyncTest("osapi.appdata.(update, delete) Create TO_DELETE appdata then delete it" , function(){
-		ok(osapi.appdata.update, "osapi.appdata.update exists");
-		ok(osapi.appdata.delete, "osapi.appdata.delete exists");
-        var pairs = {"TO_DELETE" : "value"};
-        ok(pairs,"Setting TO_DELETE");
-        var params = {data : pairs};
-        var req = osapi.appdata.update(params);
-        setTimeout(function(){
-        	req.execute(function(response){
-        		ok(!response.error,"TO_DELETE set successfully");
-                var params = {keys : ["TO_DELETE"]};
-                var req2 = osapi.appdata.delete(params);
-                ok(req2 != null, "Delete request not null");
-                req2.execute(function(response){
-            		ok(!response.error,"No error in DELETE response");
-                    var params = {keys : ["*"]};
-                    var req2 = osapi.appdata.get(params);
-                    req2.execute(function(response){
-                		ok(!response.error,"No error in GET response");
-                		for(var person in response){
-                			ok(!response[person]["TO_DELETE"], person + " does not have TO_DELETE appdata");
-                		}
-                		start();
-                	});
-            	});
-        	});
-        }, 1500);
-      
-	});
-	
-	
-	//Assumes the existence of john.doe and jane.doe
-	asyncTest("osapi.batch appdata requests (multi-user multi-key)", function(){
-		ok(osapi.newBatch,"osapi.newBatch exists");
-		var time = new Date().getTime();
-		var johnvalue1 = "john.doe value1 " + time;
-		var johnvalue2 = "john.doe value2 " + time;
-		var janevalue1 = "jane.doe value1 " + time;
-		var janevalue2 = "jane.doe value2 " + time;
-        var batchUpdate = osapi.newBatch().add("john.doe", osapi.appdata.update({userId : "john.doe", 
-		        	data : {
-		        		"batchKey1" : johnvalue1, 
-		        		"batchKey2" : johnvalue2}
-        		})).add("jane.doe", osapi.appdata.update({userId: "jane.doe", 
-	        		data : {
-	        			"batchKey1" : janevalue1,
-	        			"batchKey2" : janevalue2}}));
-        		
-        
-        var batchGet = osapi.newBatch().add("john.doe", osapi.appdata.get({userId : "john.doe", "keys" : ["batchKey1", "batchKey2"]}))
-				.add("jane.doe", osapi.appdata.get({userId: "jane.doe", "keys" : ["batchKey1", "batchKey2"]}));
-        
-        setTimeout(function(){
-    	    batchUpdate.execute(function(result) {
-    	    	ok(!result["john.doe"].error,"No error in john.doe update response");
-    	    	ok(!result["jane.doe"].error,"No error in jane.doe update response");
-    	    	if (!result["jane.doe"].error && !result["jane.doe"].error) {
-    	    	    batchGet.execute(function(result) {
-    	    	    	ok(!result["john.doe"].error,"No error in john.doe get response");
-    	    	    	ok(!result["jane.doe"].error,"No error in jane.doe get response");
-    	    	    	if (!result["jane.doe"].error && !result["jane.doe"].error) {
-    	    	    		ok(result["john.doe"]["john.doe"]["batchKey1"] == johnvalue1,"john.doe key1 = " + johnvalue1 + " (expected "+johnvalue1+")");
-    	    	    		ok(result["jane.doe"]["jane.doe"]["batchKey1"] == janevalue1,"jane.doe key1 = " + janevalue1 + " (expected "+janevalue1+")");
-    	    	    		ok(result["john.doe"]["john.doe"]["batchKey2"] == johnvalue2,"john.doe key2 = " + johnvalue2 + " (expected "+johnvalue2+")");
-    	    	    		ok(result["jane.doe"]["jane.doe"]["batchKey2"] == janevalue2,"jane.doe key2 = " + janevalue2 + " (expected "+janevalue2+")");
-    	    	    	}
-    	    	    	start();
-    	    	     });
-    	    	}
-    	     });
-        }, 1000);
-		
-	});
-	
-	asyncTest("osapi.batch mixed appdata & people requests", function(){
-		var batch = osapi.newBatch().
-		    add("viewer", osapi.people.getViewer()).
-		    add("appdata", osapi.appdata.get({ userId : '@viewer', groupId : '@self', "keys" : ["*"]}));
-		setTimeout(function(){
-			batch.execute(function(result) {
-				    ok(!result.viewer.error, "osapi.people.getViewer() succeeded");
-				    if(result.viewer.error){
-				    	ok(false, result.viewer.error.message);
-				    }
-				    ok(!result.appdata.error, "osapi.appdata.get() succeeded");
-				    if(result.appdata.error){
-				    	ok(false, result.appdata.error.message);
-				    }
-					ok(result.viewer.id,"Got viewer "+result.viewer.id);
-					//TODO validate that appdata values match expected
-					for(var person in result.appdata){
-						for(var data in result.appdata[person]){
-							ok(result.appdata[person][data], person + " - key: " + data + ", value: " + result.appdata[person][data]);
-						}
-					}
-				    start();
-				});
-		}, 1000);
-
-
-		
-	});
-	
-
-	
-}
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var appDataPersonalValue2 = 'personalValue2 ' + new Date().getTime();
+var appDataPersonalValue1 = 'personalValue1 ' + new Date().getTime();
+function runAppDataSuite(){
+	
+	module("OpenSocial JavaScript AppData Tests 1.1");
+	
+	asyncTest("osapi.appdata.(update, get) defaults" , function(){
+
+		ok(osapi.appdata.update, "osapi.appdata.update exists");
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var pairs = {"testKey1" : appDataPersonalValue1};
+        ok(pairs,"Setting testKey1 to " + appDataPersonalValue1);
+        var params = {data : pairs};
+        var req = osapi.appdata.update(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+
+                var params = {keys : ["testKey1"]};
+                var req2 = osapi.appdata.get(params);
+                ok(req2 != null, "Req not null");
+                req2.execute(function(response){
+                		ok(!response.error,"No error in response");
+                		for(var person in response){
+                			ok(response[person]["testKey1"],"Response contains personalValue1");
+                			ok(response[person]["testKey1"] == appDataPersonalValue1, "personalValue1 matches expected value");
+                		}
+                		start();
+                	});
+        	});
+        }, 1000);
+      
+	});
+	
+	asyncTest("osapi.appdata.(update, get) @me" , function(){
+
+		ok(osapi.appdata.update, "osapi.appdata.update exists");
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var pairs = {"testKey2" : appDataPersonalValue2};
+        ok(pairs,"Setting personalValue to " + appDataPersonalValue2);
+        var params = {userId : "@me", data : pairs};
+        var req = osapi.appdata.update(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+                var params = {userId : "@me" , keys : ["testKey2"]};
+                var req2 = osapi.appdata.get(params);
+                ok(req2 != null, "Req not null");
+                req2.execute(function(response){
+                		ok(!response.error,"No error in response");
+                		var i = 0;
+                		for(var person in response){
+                			i++;
+                			ok(response[person]["testKey2"] == appDataPersonalValue2, 
+                					appDataPersonalValue2 + " matches retreived value "+ response[person]["testKey2"]);
+                		}
+                		ok(i == 1, "Expect 1 Person in response, found " + i);
+                		start();
+                	});
+        	});
+        }, 1000);
+      
+	});
+	
+	asyncTest("osapi.appdata.get w/ wildcard", function(){
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var params = {keys : ["*"]};
+        var req = osapi.appdata.get(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+//        		for(var person in response){
+//TODO VALIDATE RESPONSE
+//        		}
+        		start();
+        	});
+        }, 1000);
+	});
+	
+	//TODO fully validate response against compliance db
+	asyncTest("osapi.appdata.get @viewer", function(){
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var params = {userId : "@viewer"};
+        var req = osapi.appdata.get(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+        		var count = 0;
+        		for(var person in response){
+        			ok(person, person + " in response");
+        			count ++;
+        		}
+        		ok(count == 1, "Expected 1 person in response");
+        		start();
+        	});
+        }, 1000);
+	});
+	
+	
+	//TODO fully validate response against compliance db
+	asyncTest("osapi.appdata.get @owner", function(){
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var params = {userId : "@owner"};
+        var req = osapi.appdata.get(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+        		var count = 0;
+        		for(var person in response){
+        			ok(person, person + " in response");
+        			count ++;
+        		}
+        		ok(count == 1, "Expected 1 person in response");
+        		start();
+        	});
+        }, 1000);
+	});
+	
+	asyncTest("osapi.appdata.get w/ DOES_NOT_EXIST property", function(){
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var params = {keys : ["DOES_NOT_EXIST"]};
+        var req = osapi.appdata.get(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error, "No error in response");
+        		for(var person in response){
+        			ok(person, person +" in response");
+        			for(var data in response[person]){
+        				ok(false,person+" response should not contain data, but found \'" + data+"\'");
+        			}
+        		}
+        		start();
+        	});
+        }, 1000);
+	});
+	
+    
+	asyncTest("osapi.appdata.UPDATE without data property (Expect Error)", function(){
+		ok(osapi.appdata.update, "osapi.appdata.update exists");
+        var params = {};
+        var req = osapi.appdata.update(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(response.error,"Expecting error in UPDATE response");
+        		start();
+        	});
+        }, 1000);
+      
+	});
+	
+	asyncTest("osapi.appdata.DELETE without keys property (Expect Error)", function(){
+		ok(osapi.appdata.delete, "osapi.appdata.delete exists");
+        var params = {};
+        var req = osapi.appdata.delete(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(response.error,"Expecting error in DELETE response");
+        		start();
+        	});
+        }, 1000);
+      
+	});
+        
+	asyncTest("osapi.appdata.GET without keys property (Expect Error)", function(){
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var params = {};
+        var req = osapi.appdata.get(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(response.error,"Expecting error in GET response");
+        		start();
+        	});
+        }, 1000);
+      
+	});
+	
+	asyncTest("osapi.appdata.(update, get) @viewer  w/ key array" , function(){
+
+		ok(osapi.appdata.update, "osapi.appdata.update exists");
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var pairs = {"testKey2" : appDataPersonalValue2, "testKey1" : appDataPersonalValue1};
+        var params = {userId : "@viewer", data : pairs};
+        var req = osapi.appdata.update(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+
+                var params = {userId : "@viewer" , keys : ["testKey2", "testKey1"]};
+                var req2 = osapi.appdata.get(params);
+                ok(req2 != null, "Req not null");
+                req2.execute(function(response){
+                		ok(!response.error,"No error in response");
+                		var i = 0;
+                		for(var person in response){
+                			i++;
+                			var j = 0;
+                			for(var data in response[person]){
+                				j++;
+                				if(data == "testKey1"){
+                        			ok(response[person]["testKey1"] == appDataPersonalValue1, 
+                        					"testKey1 value = " + response[person]["testKey1"] + ", expected " + appDataPersonalValue1);
+                				} else if(data == "testKey2"){
+                        			ok(response[person]["testKey2"] == appDataPersonalValue2, 
+                        					"testKey2 value = " + response[person]["testKey2"] + ", expected " + appDataPersonalValue2);
+                				} else {
+                					ok(false, "Found unexpected key \'" + data + "\', value = " + response[person][data]);
+                				}
+                			}
+                		}
+                		ok(i == 1, "Expect 1 Person in response, found " + i);
+                		start();
+                	});
+        	});
+        }, 1000);
+      
+	});
+	
+	
+	//Assumes that one of the @viewer's friends is jane.doe
+	asyncTest("osapi.appdata.(update, get) Viewer Friends" , function(){
+		ok(osapi.appdata.update, "osapi.appdata.update exists");
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var pairs = {"testKey1" : "friendDataZZ"};
+        ok(pairs,"Setting \'jane.doe\' testKey1 to \'friendDataZZ\'");
+        var params = {userId : "jane.doe", groupId : "@self", data : pairs};
+        var req = osapi.appdata.update(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+                var params = {userId : "@viewer", groupId : "@friends", keys : ["testKey1"]};
+                var req2 = osapi.appdata.get(params);
+                ok(req2 != null, "Req not null");
+                req2.execute(function(response){
+                		ok(!response.error,"No error in response");
+                		for(var person in response){
+                			ok(person != "john.doe", person + " is not john.doe");
+                			if(person == "jane.doe"){
+                    			ok(response[person]["testKey1"], person + " appdata contains contains testKey1");
+                    			ok(response[person]["testKey1"] == "friendDataZZ",
+                    					person + " testKey1 value = " + response[person]["testKey1"] + ", expected = friendDataZZ");
+                			}
+                		}
+                		start();
+                	});
+        	});
+        }, 1000);
+      
+	});
+	
+	//Assumes that one of the @owner's friends is jane.doe
+	asyncTest("osapi.appdata.(update, get) Owner Friends" , function(){
+		ok(osapi.appdata.update, "osapi.appdata.update exists");
+		ok(osapi.appdata.get, "osapi.appdata.get exists");
+        var pairs = {"testKey1" : "friendDataZZ"};
+        ok(pairs,"Setting \'jane.doe\' testKey1 to \'friendDataZZ\'");
+        var params = {userId : "jane.doe", groupId : "@self", data : pairs};
+        var req = osapi.appdata.update(params);
+        ok(req != null, "Req not null");
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"No error in response");
+                var params = {userId : "@owner", groupId : "@friends", keys : ["testKey1"]};
+                var req2 = osapi.appdata.get(params);
+                ok(req2 != null, "Req not null");
+                req2.execute(function(response){
+                		ok(!response.error,"No error in response");
+                		for(var person in response){
+                			ok(person != "john.doe", person + " is not john.doe");
+                			if(person == "jane.doe"){
+                    			ok(response[person]["testKey1"], person + " appdata contains contains testKey1");
+                    			ok(response[person]["testKey1"] == "friendDataZZ",
+                    					person + " testKey1 value = " + response[person]["testKey1"] + ", expected = friendDataZZ");
+                			}
+                		}
+                		start();
+                	});
+        	});
+        }, 1000);
+      
+	});
+	
+	asyncTest("osapi.appdata.(update, delete) Create TO_DELETE appdata then delete it" , function(){
+		ok(osapi.appdata.update, "osapi.appdata.update exists");
+		ok(osapi.appdata.delete, "osapi.appdata.delete exists");
+        var pairs = {"TO_DELETE" : "value"};
+        ok(pairs,"Setting TO_DELETE");
+        var params = {data : pairs};
+        var req = osapi.appdata.update(params);
+        setTimeout(function(){
+        	req.execute(function(response){
+        		ok(!response.error,"TO_DELETE set successfully");
+                var params = {keys : ["TO_DELETE"]};
+                var req2 = osapi.appdata.delete(params);
+                ok(req2 != null, "Delete request not null");
+                req2.execute(function(response){
+            		ok(!response.error,"No error in DELETE response");
+                    var params = {keys : ["*"]};
+                    var req2 = osapi.appdata.get(params);
+                    req2.execute(function(response){
+                		ok(!response.error,"No error in GET response");
+                		for(var person in response){
+                			ok(!response[person]["TO_DELETE"], person + " does not have TO_DELETE appdata");
+                		}
+                		start();
+                	});
+            	});
+        	});
+        }, 1500);
+      
+	});
+	
+	
+	//Assumes the existence of john.doe and jane.doe
+	asyncTest("osapi.batch appdata requests (multi-user multi-key)", function(){
+		ok(osapi.newBatch,"osapi.newBatch exists");
+		var time = new Date().getTime();
+		var johnvalue1 = "john.doe value1 " + time;
+		var johnvalue2 = "john.doe value2 " + time;
+		var janevalue1 = "jane.doe value1 " + time;
+		var janevalue2 = "jane.doe value2 " + time;
+        var batchUpdate = osapi.newBatch().add("john.doe", osapi.appdata.update({userId : "john.doe", 
+		        	data : {
+		        		"batchKey1" : johnvalue1, 
+		        		"batchKey2" : johnvalue2}
+        		})).add("jane.doe", osapi.appdata.update({userId: "jane.doe", 
+	        		data : {
+	        			"batchKey1" : janevalue1,
+	        			"batchKey2" : janevalue2}}));
+        		
+        
+        var batchGet = osapi.newBatch().add("john.doe", osapi.appdata.get({userId : "john.doe", "keys" : ["batchKey1", "batchKey2"]}))
+				.add("jane.doe", osapi.appdata.get({userId: "jane.doe", "keys" : ["batchKey1", "batchKey2"]}));
+        
+        setTimeout(function(){
+    	    batchUpdate.execute(function(result) {
+    	    	ok(!result["john.doe"].error,"No error in john.doe update response");
+    	    	ok(!result["jane.doe"].error,"No error in jane.doe update response");
+    	    	if (!result["jane.doe"].error && !result["jane.doe"].error) {
+    	    	    batchGet.execute(function(result) {
+    	    	    	ok(!result["john.doe"].error,"No error in john.doe get response");
+    	    	    	ok(!result["jane.doe"].error,"No error in jane.doe get response");
+    	    	    	if (!result["jane.doe"].error && !result["jane.doe"].error) {
+    	    	    		ok(result["john.doe"]["john.doe"]["batchKey1"] == johnvalue1,"john.doe key1 = " + johnvalue1 + " (expected "+johnvalue1+")");
+    	    	    		ok(result["jane.doe"]["jane.doe"]["batchKey1"] == janevalue1,"jane.doe key1 = " + janevalue1 + " (expected "+janevalue1+")");
+    	    	    		ok(result["john.doe"]["john.doe"]["batchKey2"] == johnvalue2,"john.doe key2 = " + johnvalue2 + " (expected "+johnvalue2+")");
+    	    	    		ok(result["jane.doe"]["jane.doe"]["batchKey2"] == janevalue2,"jane.doe key2 = " + janevalue2 + " (expected "+janevalue2+")");
+    	    	    	}
+    	    	    	start();
+    	    	     });
+    	    	}
+    	     });
+        }, 1000);
+		
+	});
+	
+	asyncTest("osapi.batch mixed appdata & people requests", function(){
+		var batch = osapi.newBatch().
+		    add("viewer", osapi.people.getViewer()).
+		    add("appdata", osapi.appdata.get({ userId : '@viewer', groupId : '@self', "keys" : ["*"]}));
+		setTimeout(function(){
+			batch.execute(function(result) {
+				    ok(!result.viewer.error, "osapi.people.getViewer() succeeded");
+				    if(result.viewer.error){
+				    	ok(false, result.viewer.error.message);
+				    }
+				    ok(!result.appdata.error, "osapi.appdata.get() succeeded");
+				    if(result.appdata.error){
+				    	ok(false, result.appdata.error.message);
+				    }
+					ok(result.viewer.id,"Got viewer "+result.viewer.id);
+					//TODO validate that appdata values match expected
+					for(var person in result.appdata){
+						for(var data in result.appdata[person]){
+							ok(result.appdata[person][data], person + " - key: " + data + ", value: " + result.appdata[person][data]);
+						}
+					}
+				    start();
+				});
+		}, 1000);
+
+
+		
+	});
+	
+
+	
+}

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/appdatasuite.js
------------------------------------------------------------------------------
    svn:mime-type = text/javascript

Modified: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml?rev=1137082&r1=1137081&r2=1137082&view=diff
==============================================================================
--- shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml (original)
+++ shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml Fri Jun 17 23:43:46 2011
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<Module specificationVersion="1.1">
-  <ModulePrefs title="AppData Tests 1.1" author="OpenSocial_QA"
-               description="AppData Requests Tests 1.1">
-    <Require feature="dynamic-height"/>
-    <Require feature="osapi"/>
-    <Require feature="opensocial-data"/>
-    <Require feature="opensocial"/>
-  </ModulePrefs>
-  <Content type="html" scrolling="true">
-    <![CDATA[
-<html>
-  <head>
-  <link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen" />
-  <script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
-  <script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js"></script>
-  <script type="text/javascript" src="appdatasuite.js"></script>
-  
-  <script>
-  
-      gadgets.util.registerOnLoadHandler(runAppDataSuite);
-      gadgets.util.registerOnLoadHandler(function(){
-            gadgets.window.adjustHeight(2000);
-      });
-
-  </script>
-  </head>
-  
-  <body>
-    <h1 id="qunit-header">OpenSocial JavaScript 1.1 AppData</h1>
-    <h2 id="qunit-banner"></h2>
-    <div id="qunit-testrunner-toolbar"></div>
-    <h2 id="qunit-userAgent"></h2>
-    <ol id="qunit-tests"></ol>
-    <div id="qunit-fixture">test markup, will be hidden</div>
-  </body>
-</html>
-  
-  
-]]>
-  </Content>
-</Module>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<Module specificationVersion="1.1">
+  <ModulePrefs title="AppData Tests 1.1" author="OpenSocial_QA"
+               description="AppData Requests Tests 1.1">
+    <Require feature="dynamic-height"/>
+    <Require feature="osapi"/>
+    <Require feature="opensocial-data"/>
+    <Require feature="opensocial"/>
+  </ModulePrefs>
+  <Content type="html" scrolling="true">
+    <![CDATA[
+<html>
+  <head>
+  <link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
+  <script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js"></script>
+  <script type="text/javascript" src="appdatasuite.js"></script>
+  
+  <script>
+  
+      gadgets.util.registerOnLoadHandler(runAppDataSuite);
+      gadgets.util.registerOnLoadHandler(function(){
+            gadgets.window.adjustHeight(2000);
+      });
+
+  </script>
+  </head>
+  
+  <body>
+    <h1 id="qunit-header">OpenSocial JavaScript 1.1 AppData</h1>
+    <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    <div id="qunit-fixture">test markup, will be hidden</div>
+  </body>
+</html>
+  
+  
+]]>
+  </Content>
+</Module>

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/content/gadgets/compliance/javascript-tests/1.1/appdata/suite.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml