Permalink
Browse files

functional test changes to support SD

  • Loading branch information...
Lichun Zhan
Lichun Zhan committed Jan 3, 2013
1 parent b0283b3 commit b41f2dd247d3b37c2c39cc6dd9df0f3e22a8d84f
Showing with 1,974 additions and 1,100 deletions.
  1. +414 −3 tests/func/common/{commonservertest_descriptor.json → common_descriptor.json}
  2. +0 −425 tests/func/common/commonclienttest_descriptor.json
  3. +6 −1 tests/func/common/html5apptest_descriptor.json
  4. +51 −0 tests/func/config/configtest0_descriptor.json
  5. +38 −0 tests/func/config/configtest1_descriptor.json
  6. +66 −0 tests/func/config/configtest2_descriptor.json
  7. +38 −0 tests/func/config/configtest3_descriptor.json
  8. +38 −0 tests/func/config/configtest4_descriptor.json
  9. +31 −0 tests/func/config/configtest5_descriptor.json
  10. +31 −0 tests/func/config/configtest6_descriptor.json
  11. +0 −145 tests/func/config/configtest_descriptor.json
  12. +54 −0 tests/func/examples/developerguide/binding_events_descriptor.json
  13. +30 −0 tests/func/examples/developerguide/configure_routing_descriptor.json
  14. +0 −254 tests/func/examples/developerguide/developerguide_descriptor.json
  15. +30 −0 tests/func/examples/developerguide/device_assets_descriptor.json
  16. +50 −0 tests/func/examples/developerguide/device_views_descriptor.json
  17. +30 −0 tests/func/examples/developerguide/framed_assets_descriptor.json
  18. +30 −0 tests/func/examples/developerguide/framed_config_descriptor.json
  19. +30 −0 tests/func/examples/developerguide/global_assets_descriptor.json
  20. +30 −0 tests/func/examples/developerguide/hello_descriptor.json
  21. +30 −0 tests/func/examples/developerguide/htmlframe_mojit_descriptor.json
  22. +30 −0 tests/func/examples/developerguide/inter-mojit_descriptor.json
  23. +45 −0 tests/func/examples/developerguide/locale_i18n_descriptor.json
  24. +44 −0 tests/func/examples/developerguide/model_yql_descriptor.json
  25. +30 −0 tests/func/examples/developerguide/multiple_mojits_descriptor.json
  26. +30 −0 tests/func/examples/developerguide/scroll_views_descriptor.json
  27. +30 −0 tests/func/examples/developerguide/simple_assets_descriptor.json
  28. +30 −0 tests/func/examples/developerguide/simple_config_descriptor.json
  29. +30 −0 tests/func/examples/developerguide/simple_logging_descriptor.json
  30. +30 −0 tests/func/examples/developerguide/simple_view_descriptor.json
  31. +30 −0 tests/func/examples/developerguide/unittest_model_controller_descriptor.json
  32. +38 −0 tests/func/examples/developerguide/using_configs_descriptor.json
  33. +30 −0 tests/func/examples/developerguide/using_parameters_descriptor.json
  34. +30 −0 tests/func/examples/developerguide/yui_module_descriptor.json
  35. +42 −0 tests/func/examples/input/get_descriptor.json
  36. +0 −89 tests/func/examples/input/input_descriptor.json
  37. +45 −0 tests/func/examples/input/merge_descriptor.json
  38. +45 −0 tests/func/examples/input/post_descriptor.json
  39. +30 −0 tests/func/examples/input/route_descriptor.json
  40. +6 −2 tests/func/examples/newsboxes/newsboxes_descriptor.json
  41. +30 −0 tests/func/examples/simple/part1_descriptor.json
  42. +30 −0 tests/func/examples/simple/part2_descriptor.json
  43. +30 −0 tests/func/examples/simple/part3_descriptor.json
  44. +30 −0 tests/func/examples/simple/part4_descriptor.json
  45. +30 −0 tests/func/examples/simple/part5_descriptor.json
  46. +30 −0 tests/func/examples/simple/part6_descriptor.json
  47. +45 −0 tests/func/examples/simple/part7_descriptor.json
  48. +30 −0 tests/func/examples/simple/part8_descriptor.json
  49. +0 −90 tests/func/examples/simple/simple_descriptor.json
  50. +6 −1 tests/func/routing/routingtest_descriptor.json
  51. +5 −1 tests/func/serveronly/serveronlytest_descriptor.json
  52. +5 −1 tests/func/usecases/usecasestest_descriptor.json
  53. +81 −88 tests/run.js

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -5,7 +5,12 @@
"name" : "html5app",
"config" :{
- "baseUrl" : "http://localhost:4084"
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"html5app",
+ "path": "./frameworkapp/flatfile",
+ "type": "static"
+ }
},
"dataprovider" : {
@@ -0,0 +1,51 @@
+[
+ {
+ "settings": [ "master" ],
+
+ "name" : "config",
+
+ "config" :{
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"configapp",
+ "path": "./frameworkapp/configapp"
+ }
+ },
+
+ "dataprovider" : {
+ "DefaultConfig1" : {
+ "group" : "functional,smoke,config,testgroup0",
+ "params" : {
+ "test" : "testDefaultConfig1.js",
+ "page" : "$$config.baseUrl$$"
+ }
+ },
+ "DefaultConfig2" : {
+ "group" : "functional,smoke,config,testgroup0",
+ "params" : {
+ "test" : "testDefaultConfig2.js",
+ "page" : "$$config.baseUrl$$/?lang=de"
+ }
+ },
+ "DefaultConfig3" : {
+ "group" : "functional,smoke,config,testgroup0",
+ "params" : {
+ "test" : "testDefaultConfig3.js",
+ "page" : "$$config.baseUrl$$/?lang=fr"
+ }
+ },
+ "DefaultConfig4" : {
+ "group" : "functional,smoke,config,testgroup0",
+ "params" : {
+ "test" : "testDefaultConfig4.js",
+ "page" : "$$config.baseUrl$$/?subject=math"
+ }
+ }
+ }
+ },
+
+ {
+ "settings": [ "environment:development" ]
+ }
+
+]
@@ -0,0 +1,38 @@
+[
+ {
+ "settings": [ "master" ],
+
+ "name" : "config",
+
+ "config" :{
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"configapp",
+ "path": "./frameworkapp/configapp",
+ "param": "environment:production"
+ }
+ },
+
+ "dataprovider" : {
+ "ProdEnv1" : {
+ "group" : "functional,smoke,config,testgroup1",
+ "params" : {
+ "test" : "testproductionenv1.js",
+ "page" : "$$config.baseUrl$$"
+ }
+ },
+ "ProdEnv2" : {
+ "group" : "functional,smoke,config,testgroup1",
+ "params" : {
+ "test" : "testproductionenv2.js",
+ "page" : "$$config.baseUrl$$/?lang=de"
+ }
+ }
+ }
+ },
+
+ {
+ "settings": [ "environment:development" ]
+ }
+
+]
@@ -0,0 +1,66 @@
+[
+ {
+ "settings": [ "master" ],
+
+ "name" : "config",
+
+ "config" :{
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"configapp",
+ "path": "./frameworkapp/configapp",
+ "param": "environment:testing"
+ }
+ },
+
+ "dataprovider" : {
+ "TestingEnv1" : {
+ "group" : "functional,smoke,config,testgroup2",
+ "params" : {
+ "test" : "testtestingenv1.js",
+ "page" : "$$config.baseUrl$$"
+ }
+ },
+ "TestingEnv2" : {
+ "group" : "functional,smoke,config,testgroup2",
+ "params" : {
+ "test" : "testtestingenv2.js",
+ "page" : "$$config.baseUrl$$/?lang=de"
+ }
+ },
+ "TestingEnv3" : {
+ "group" : "functional,smoke,config,testgroup2",
+ "params" : {
+ "test" : "testtestingenv3.js",
+ "page" : "$$config.baseUrl$$/?lang=fr"
+ }
+ },
+ "TestingEnv4" : {
+ "group" : "functional,smoke,config,testgroup2",
+ "params" : {
+ "test" : "testtestingenv4.js",
+ "page" : "$$config.baseUrl$$/?lang=fr-CA"
+ }
+ },
+ "TestingEnv5" : {
+ "group" : "functional,smoke,config,testgroup2",
+ "params" : {
+ "test" : "testtestingenv5.js",
+ "page" : "$$config.baseUrl$$/?subject=math"
+ }
+ },
+ "TestingEnv6" : {
+ "group" : "functional,smoke,config,testgroup2",
+ "params" : {
+ "test" : "testtestingenv6.js",
+ "page" : "$$config.baseUrl$$/?subject=math&lang=de"
+ }
+ }
+ }
+ },
+
+ {
+ "settings": [ "environment:development" ]
+ }
+
+]
@@ -0,0 +1,38 @@
+[
+ {
+ "settings": [ "master" ],
+
+ "name" : "config",
+
+ "config" :{
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"configapp",
+ "path": "./frameworkapp/configapp",
+ "param": "environment:testing,subject:math"
+ }
+ },
+
+ "dataprovider" : {
+ "MathEnv1" : {
+ "group" : "functional,smoke,config,testgroup3",
+ "params" : {
+ "test" : "testmathenv1.js",
+ "page" : "$$config.baseUrl$$/"
+ }
+ },
+ "MathEnv2" : {
+ "group" : "functional,smoke,config,testgroup3",
+ "params" : {
+ "test" : "testmathenv2.js",
+ "page" : "$$config.baseUrl$$/?subject=chemistry&lang=fr"
+ }
+ }
+ }
+ },
+
+ {
+ "settings": [ "environment:development" ]
+ }
+
+]
@@ -0,0 +1,38 @@
+[
+ {
+ "settings": [ "master" ],
+
+ "name" : "config",
+
+ "config" :{
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"configapp",
+ "path": "./frameworkapp/configapp",
+ "param": "environment:testing,subject:bc-100"
+ }
+ },
+
+ "dataprovider" : {
+ "ChemEnv1" : {
+ "group" : "functional,smoke,config,testgroup4",
+ "params" : {
+ "test" : "testchemenv1.js",
+ "page" : "$$config.baseUrl$$/"
+ }
+ },
+ "ChemEnv2" : {
+ "group" : "functional,smoke,config,testgroup4",
+ "params" : {
+ "test" : "testchemenv2.js",
+ "page" : "$$config.baseUrl$$/?lang=fr"
+ }
+ }
+ }
+ },
+
+ {
+ "settings": [ "environment:development" ]
+ }
+
+]
@@ -0,0 +1,31 @@
+[
+ {
+ "settings": [ "master" ],
+
+ "name" : "config",
+
+ "config" :{
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"configapp",
+ "path": "./frameworkapp/configapp",
+ "param": "environment:testing,lang:de,subject:math"
+ }
+ },
+
+ "dataprovider" : {
+ "MathDe" : {
+ "group" : "functional,smoke,config,testgroup5",
+ "params" : {
+ "test" : "testmathde.js",
+ "page" : "$$config.baseUrl$$/"
+ }
+ }
+ }
+ },
+
+ {
+ "settings": [ "environment:development" ]
+ }
+
+]
@@ -0,0 +1,31 @@
+[
+ {
+ "settings": [ "master" ],
+
+ "name" : "config",
+
+ "config" :{
+ "baseUrl" : "http://localhost:8666",
+ "application" : {
+ "name":"configapp",
+ "path": "./frameworkapp/configapp",
+ "param": "environment:testing,lang:fr"
+ }
+ },
+
+ "dataprovider" : {
+ "TestFr" : {
+ "group" : "functional,smoke,config,testgroup6",
+ "params" : {
+ "test" : "testfr.js",
+ "page" : "$$config.baseUrl$$/?lang=fr-CA"
+ }
+ }
+ }
+ },
+
+ {
+ "settings": [ "environment:development" ]
+ }
+
+]
Oops, something went wrong.

0 comments on commit b41f2dd

Please sign in to comment.