You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/03/19 16:55:54 UTC
svn commit: r756061 - in /lenya/contributions/2_0_X/modules/atom/test/canoo:
results/ test.xml
Author: andreas
Date: Thu Mar 19 15:55:53 2009
New Revision: 756061
URL: http://svn.apache.org/viewvc?rev=756061&view=rev
Log:
Removing canoo test results from SVN, pass pub title to login step.
Removed:
lenya/contributions/2_0_X/modules/atom/test/canoo/results/
Modified:
lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml
Modified: lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml?rev=756061&r1=756060&r2=756061&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml (original)
+++ lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml Thu Mar 19 15:55:53 2009
@@ -18,9 +18,11 @@
<!--
<!DOCTYPE project SYSTEM "../../../../modules/development/test/canoo/lenya_webtest.dtd">
-->
-<project name="administration" basedir="." default="wt.full">
-
+<project name="atom" basedir="." default="wt.full">
+ <!--
<import file="../../../../modules/development/test/canoo/macros.xml"/>
+-->
+ <import file="/Users/nobby/apache/lenya/temp/firedocs/BRANCH_2_0_X/src/modules/development/test/canoo/macros.xml"/>
<macrodef name="checkEmptyCollection">
<attribute name="url"/>
@@ -43,7 +45,9 @@
<property name="sessionId" value=""/>
- <property name="prefix" value="/default/authoring"/>
+ <property name="pubId" value="defaultfiredocs"/>
+ <property name="pubTitle" value="Default with Firedocs"/>
+ <property name="prefix" value="/${pubId}/authoring"/>
<property name="documentUrl" value="${prefix}/concepts.html"/>
<property name="assetsUrl" value="${prefix}/concepts.html?lenya.usecase=atom.assets"/>
@@ -82,13 +86,13 @@
<webtest name="atom.setup">
<steps>
<groovy>
- def helper = step.context.xPathHelper;
- helper.registerGlobalNamespace("app", "http://www.w3.org/2007/app");
- helper.registerGlobalNamespace("atom", "http://www.w3.org/2005/Atom");
- helper.registerGlobalNamespace("xhtml", "http://www.w3.org/1999/xhtml");
- helper.registerGlobalNamespace("dc", "http://purl.org/dc/elements/1.1/");
- helper.registerGlobalNamespace("edit", "http://apache.org/lenya/editing");
- helper.registerGlobalNamespace("relaxng", "http://relaxng.org/ns/structure/1.0");
+ import com.canoo.webtest.engine.xpath.XPathHelper
+ XPathHelper.registerGlobalNamespace("app", "http://www.w3.org/2007/app")
+ XPathHelper.registerGlobalNamespace("atom", "http://www.w3.org/2005/Atom")
+ XPathHelper.registerGlobalNamespace("xhtml", "http://www.w3.org/1999/xhtml")
+ XPathHelper.registerGlobalNamespace("dc", "http://purl.org/dc/elements/1.1/")
+ XPathHelper.registerGlobalNamespace("edit", "http://apache.org/lenya/editing")
+ XPathHelper.registerGlobalNamespace("relaxng", "http://relaxng.org/ns/structure/1.0")
</groovy>
</steps>
</webtest>
@@ -111,7 +115,7 @@
<invoke url="${entryUrl}"/>
<verifyResponseCode code="200"/>
<storeXPath property="schemaUri" xpath="/atom:entry/edit:edit/edit:schema/@href"/>
- <verifyProperty name="schemaUri" text="/default/modules/xhtml/schemas/xhtml.rng"/>
+ <verifyProperty name="schemaUri" text="/${pubId}/modules/xhtml/schemas/xhtml.rng"/>
<storeXPath property="uuid2urlUri" xpath="/atom:entry/edit:edit/edit:uri-resolver[@protocol = 'lenya-document']/@href"/>
<storeXPath property="lenyaDocumentUri" xpath="/atom:entry/atom:content/@src"/>
@@ -215,7 +219,7 @@
<option name="ThrowExceptionOnFailingStatusCode" value="false"/>
</config>
<steps>
- <doLogin username="lenya" password="levi" url="${documentUrl}"/>
+ <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
<!-- ====================================================================== -->
<!-- check workspace service document -->
@@ -223,7 +227,7 @@
<invoke url="${documentUrl}"/>
<storeXPath xpath="/html/head/link[@rel = 'service']/@href" property="workspaceUrl"/>
- <invoke url="/default/authoring/#{workspaceUrl}"/>
+ <invoke url="${prefix}/#{workspaceUrl}"/>
<verifyXPath xpath="/app:service"/>
<storeXPath property="topLevelDocsUrl" xpath="/app:service/app:workspace[atom:title = 'Documents']/app:collection/@href"/>
@@ -259,7 +263,7 @@
<option name="ThrowExceptionOnFailingStatusCode" value="false"/>
</config>
<steps>
- <doLogin username="lenya" password="levi" url="${documentUrl}"/>
+ <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
<!-- ====================================================================== -->
<!-- clean up previous changes -->
@@ -310,7 +314,7 @@
<option name="ThrowExceptionOnFailingStatusCode" value="false"/>
</config>
<steps>
- <doLogin username="lenya" password="levi" url="${documentUrl}"/>
+ <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
<invoke url="${entryUrl}" method="PUT" contentFile="${entryFile}" contentType="application/atom+xml"/>
<verifyResponseCode code="200"/>
@@ -336,7 +340,7 @@
</config>
<steps>
- <doLogin username="lenya" password="levi" url="${documentUrl}"/>
+ <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
<!-- ====================================================================== -->
<!-- remove existing lock -->
@@ -390,7 +394,7 @@
<doLogout/>
- <doLogin username="alice" password="levi" url="${documentUrl}"/>
+ <doLogin username="alice" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
<!-- ====================================================================== -->
<!-- can't create lock if already locked by a different user -->
@@ -431,7 +435,7 @@
<option name="ThrowExceptionOnFailingStatusCode" value="false"/>
</config>
<steps>
- <doLogin username="lenya" password="levi" url="${documentUrl}"/>
+ <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
<!-- ====================================================================== -->
<!-- delete asset -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org