diff --git a/src/build/build.properties b/src/build/build.properties index 0833358b2..7992ca367 100644 --- a/src/build/build.properties +++ b/src/build/build.properties @@ -96,6 +96,9 @@ duplicated.libs=apache-jakarta-commons-codec-1.3.jar,\ commons-lang-2.2.jar,\ commons-lang-2.3.jar,\ commons-lang-2.4.jar,\ + commons-logging-1.0.4.jar,\ + apache-jakarta-commons-logging-1.0.4.jar,\ + commons-logging-1.1.jar,\ commons-beanutils-1.6.jar,\ commons-collections-2.1.jar,\ commons-collections-3.1.jar,\ diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index b0d30ea81..de9a92ef3 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -41,6 +41,7 @@ + diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/.gitignore b/src/realms/from-scratch-realm-template/src/test/canoo/.gitignore new file mode 100644 index 000000000..a0ef95109 --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/.gitignore @@ -0,0 +1,4 @@ +local.build.properties +results +definitions.xml +dtd/Project.dtd diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/README.txt b/src/realms/from-scratch-realm-template/src/test/canoo/README.txt new file mode 100644 index 000000000..fb9176f39 --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/README.txt @@ -0,0 +1,49 @@ + + Canoo Webtests for From Scratch Realm + ===================================== + +How to install and run the tests +-------------------------------- + +1. Download and install canoo webtest package + http://webtest.canoo.com/webtest/manual/Downloads.html (Successfully tested with revision canoo-3.0-1758) + +2. Unzip build.zip e.g. to /home/USERNAME/local/canoo-VERSION_r_REVISION + +3. Copy build.properties to local.build.properties and edit local.build.properties according to your local settings, for example set + webtest.home=/home/USERNAME/local/canoo-VERSION_r_REVISION + +4. Start web-application server (for example Tomcat) + (IMPORTANT: Make sure to set target environment inside 'TOMCAT/webapps/yanel/WEB-INF/classes/yanel.xml' to 'ci-test') + (IMPORTANT: Make sure that Yanel has SSL NOT configured, check YANEL_HOME/src/build/local.build.properties or TOMCAT/webapps/yanel/WEB-INF/web.xml) + (IMPORTANT: The language is configured inside includes/config.xml, but also inside the user itself ac-identities/users/lenya.xml) + +5. Type 'ant' (IMPORTANT: Make sure to use version 1.7.x) to run all the tests (You might have to reset your PATH environment variable, for example 'export PATH=/home/USER/yanel/tools/apache-ant/bin:$PATH') + + In order to run just "one" particular test, please type 'ant -Dwt.testInWork=tests/single-page.xml' or 'ant -Dwt.testInWork=tests/single-page/add-related-content-element.xml' + + + +How to add new tests +-------------------- + +0. Add new tests to ./tests/allTests.xml + +1. download and install the webtestrecorder firefox plugin + http://webtestrecorder.canoo.com/install.html + +2. record a test in the browser + +3. make a copy of one of the test files under ./tests + +4. edit the file and replace the actual test code with the recorded code + +5. clean up the code if necessary + + + +Known bugs +---------- + +the recorder plugin has a problem with XHTML strict. +somehow it doesn't record all events (e.g. clickButton). diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/build.properties b/src/realms/from-scratch-realm-template/src/test/canoo/build.properties new file mode 100644 index 000000000..bbc2ef9f1 --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/build.properties @@ -0,0 +1,11 @@ + +# file system path of canoo webtest package (http://webtest.canoo.com/webtest/build.zip) +webtest.home=/home/USERNAME/canoo-3.0-1758 + +# {protocol}://{host}:{port}/{basepath} +webtest.config.host=127.0.0.1 +webtest.config.port=8080 +webtest.config.protocol=http +webtest.config.basepath=yanel + +realm.path=from-scratch-realm/ diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/build.xml b/src/realms/from-scratch-realm-template/src/test/canoo/build.xml new file mode 100644 index 000000000..11cd94282 --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/build.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/definitions/login.xml b/src/realms/from-scratch-realm-template/src/test/canoo/definitions/login.xml new file mode 100644 index 000000000..68893ab9c --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/definitions/login.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/definitions/logout.xml b/src/realms/from-scratch-realm-template/src/test/canoo/definitions/logout.xml new file mode 100644 index 000000000..02f71a181 --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/definitions/logout.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/dtd/MyWebTest.dtd b/src/realms/from-scratch-realm-template/src/test/canoo/dtd/MyWebTest.dtd new file mode 100644 index 000000000..e11ed77be --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/dtd/MyWebTest.dtd @@ -0,0 +1,6 @@ + + + + +%webtest; +%project; diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/dtd/WebTest.dtd b/src/realms/from-scratch-realm-template/src/test/canoo/dtd/WebTest.dtd new file mode 100644 index 000000000..3178e50eb --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/dtd/WebTest.dtd @@ -0,0 +1,994 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/realms/from-scratch-realm-template/src/test/canoo/includes/config.xml b/src/realms/from-scratch-realm-template/src/test/canoo/includes/config.xml new file mode 100644 index 000000000..f1f0ac958 --- /dev/null +++ b/src/realms/from-scratch-realm-template/src/test/canoo/includes/config.xml @@ -0,0 +1,16 @@ + + + + + +
+ + +