- xwiki-devs@xwiki.org - lists.xwiki.org

[xwiki-devs] [Proposal] Replace download pages on code.xwiki.org with links to the maven repo

by Vincent Massol

Hi, Thomas, JV and I discussed about replacing download pages on xwiki.org with links to our maven repo (for stuff on code.xwiki.org only). The rationale: Speed up the dev process and make it a failsafe process. Advantages: * No need to upload artifacts (which means smaller wiki and faster release process) * Full history available * No risk of being not synced with the maven repo (which is the official artifact repository) * Low-tech solution http://code.xwiki.org/xwiki/bin/view/Applications/AnnotationsApplication When you click on download you go to: http://maven.xwiki.org/releases/org/xwiki/platform/applications/xwiki-appli… Thomas has already implemented it during the last release. It should have been discussed before but Thomas was in a hurry for the release. Let us know if you don't agree. Thanks -Vincent

15 years, 2 months

2
2
0 0

[xwiki-devs] REST refactoring

by Fabio Mancinelli

Hi all, I did a small refactoring in the REST module which consisted in isolating the JAXB model classes in a separate module. This allows client to use JAXB classes for retrieving XML representations without dragging in all the core dependencies. The refactoring consisted in creating an xwiki-rest-model module in core, moving some files, and update the pom.xml's to make things compile. Maybe it's risky to commit it now, but if you are ok everything's ready. I include a diff so that you can check what it looks like. -Fabio

15 years, 2 months

4
5
0 0

Re: [xwiki-devs] [xwiki-notifications] r30000 - platform/core/trunk/xwiki-shared-tests/src/main/java/org/xwiki/test

by Vincent Massol

On Jul 5, 2010, at 7:00 PM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-07-05 19:00:58 +0200 (Mon, 05 Jul 2010) > New Revision: 30000 yeah rev 30000 :) -Vincent > > Modified: > platform/core/trunk/xwiki-shared-tests/src/main/java/org/xwiki/test/AbstractMockingComponentTestCase.java > Log: > Added comment > > Modified: platform/core/trunk/xwiki-shared-tests/src/main/java/org/xwiki/test/AbstractMockingComponentTestCase.java > =================================================================== > --- platform/core/trunk/xwiki-shared-tests/src/main/java/org/xwiki/test/AbstractMockingComponentTestCase.java 2010-07-05 16:26:20 UTC (rev 29999) > +++ platform/core/trunk/xwiki-shared-tests/src/main/java/org/xwiki/test/AbstractMockingComponentTestCase.java 2010-07-05 17:00:58 UTC (rev 30000) > @@ -59,6 +59,7 @@ > this.componentManager = new EmbeddableComponentManager(); > > // Step 1: Register all components available > + // TODO: Remove this so that tests are executed faster. Need to offer a way to register components manually. > this.loader.initialize(this.componentManager, getClass().getClassLoader()); > > // Step 2: Inject all fields annotated with @MockingRequirement.

15 years, 2 months

2
1
0 0

[xwiki-devs] [VOTE] Agree to start using AbstractMockingComponentTestCase

by Vincent Massol

Hi, Some time ago I had added the AbstractMockingComponentTestCase class in shared-test. I've refactored it a bit over the week end to make it even easier to use. The idea is to use a @MockingRequirement annotation in the test case class to get a component instance with all its @Requirement fields injected with mocks. This makes it easier to test than using the older AbstractComponentTestCase since you don't need to setup component mocks manually. Here's an example usage: public class MacroContentTableBlockDataSourceTest extends AbstractMockingComponentTestCase { @MockingRequirement private MacroContentTableBlockDataSource source; ... Another example: public class DefaultMacroManagerTest extends AbstractMockingComponentTestCase { // Mock all required components except for some for which we want to use the real implementations since they make // the test easier to write (no need to mock them). @MockingRequirement(exceptions = { ComponentManager.class, MacroIdFactory.class }) private DefaultMacroManager macroManager; As you can see in this second example, it's also possible to exclude some @Requirement from being mocked if need be. I'd like that we agree to use this new test class from now on instead of AbstractComponentTestCase (unless there are cases where it's not usable but please discuss those use cases with me since maybe there are solutions to improve AbstractMockingComponentTestCase). Here's my +1 Thanks -Vincent

15 years, 2 months

5
6
0 0

[xwiki-devs] unsubscribe

by Hermes, Lars

Festo AG & Co. KG Lars Hermes Abteilung IS-PB BSP Development + User Services Plieninger Stra?e 50 73760 Ostfildern-Scharnhausen Deutschland Telefon +49(711)347-4510 Telefax +49(711)34754-4510 http://www.festo.com Der Inhalt dieses E-Mails ist ausschliesslich fuer den bezeichneten Adressaten bestimmt. Jede Form der Kenntnisnahme, Veroeffentlichung, Vervielfaeltigung oder Weitergabe des Inhalts dieses E-Mails durch unberechtigte Dritte ist unzulaessig. Wir bitten Sie, sich mit dem Absender des E-Mails in Verbindung zu setzen, falls Sie nicht der Adressat dieses E-Mails sind und das Material von Ihrem Computer zu loeschen. This e-mail and any attachments are confidential and intended solely for the addressee. The perusal, publication, copying or dissemination of the contents of this e-mail by unauthorised third parties is prohibited. If you are not the intended recipient of this e-mail, please delete it and immediately notify the sender. Rechtsform: Kommanditgesellschaft Sitz: Esslingen a.N., Registergericht Stuttgart HRA 211583, Umsatzsteuerident-Nummer: DE 145339206 Pers?nlich haftende Gesellschafterin: Festo Management Aktiengesellschaft Sitz: Wien/?sterreich, Firmenbuchgericht: Handelsgericht Wien, Firmenbuch Nr. FN 303027 d Vorstand: Dipl.-Kfm. Alfred Goll Dr. Claus Jessen Dr. Ansgar Kriwet Dr. Eberhard Veit (Vorsitzender) Dipl.- Kfm. Michael M?lleken Aufsichtsratsvorsitzender: Dr. Wilfried Stoll

15 years, 2 months

1
0
0 0

[xwiki-devs] [Discussion] Integrating officepreview module into main source tree

by Asiri Rathnayake

Hi Devs, I have almost completed my work on officepreview module and I would like to discuss about integrating it into main source tree (and release it with 2.4M1). There are a couple of things to discuss: 1. officepreview module have to depend on xwiki-core for the time being because with current component approach there is no way of determining the version of an attachment (officepreview module needs to know attachment version). 2. Need a couple of tests - I'm working on this. 3. Where to place the officepreview module in main source tree. My initial idea for (3) was to create a /platform/core/trunk/xwiki-officepreview submodule. However, since officepreview module depends on officeimporter module, I'm not sure if we should create a parent module that would host both of these projects. Another problem lingering in my mind is that with recent changes xwiki-officeimporter module encapsulates two sub modules - a module capable of converting documents from one format to another (this is a generic converter api kind of thing) and another module which is importing office documents into xwiki specific formats (XDOMOfficeDocumentBuilder, PresentationBuilder etc.). I'm not sure if these two modules should be seperated out, but may be that's a separate discussion. Please let me know your comments about above points. Thanks. - Asiri

15 years, 2 months

2
5
0 0

Re: [xwiki-devs] [xwiki-notifications] r29965 - contrib/sandbox/xwiki-officepreview

by Vincent Massol

Actually the solution is to simply add: ... </build> <properties>  <xwiki.clirr.skip>true</xwiki.clirr.skip> </properties> </project> Thanks -Vincent On Jul 4, 2010, at 2:51 PM, asiri (SVN) wrote: > Author: asiri > Date: 2010-07-04 14:51:21 +0200 (Sun, 04 Jul 2010) > New Revision: 29965 > > Modified: > contrib/sandbox/xwiki-officepreview/pom.xml > Log: > * Removed clirr plugin checks because we don't have a previous version of xwiki-core-officepreview artifact. > > Modified: contrib/sandbox/xwiki-officepreview/pom.xml > =================================================================== > --- contrib/sandbox/xwiki-officepreview/pom.xml 2010-07-04 01:50:57 UTC (rev 29964) > +++ contrib/sandbox/xwiki-officepreview/pom.xml 2010-07-04 12:51:21 UTC (rev 29965) > @@ -97,6 +97,13 @@ > </excludes> > </configuration> > </plugin> > + <plugin> > + <groupId>org.codehaus.mojo</groupId> > + <artifactId>clirr-maven-plugin</artifactId> > + <configuration> > + <skip>true</skip> > + </configuration> > + </plugin> > </plugins> > </build> > -</project> > \ No newline at end of file > +</project>

15 years, 2 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r29958 - in platform/core/trunk: . xwiki-chart/xwiki-chart-renderer xwiki-core

by Thomas Mortagne

On Sat, Jul 3, 2010 at 20:08, vmassol <platform-notifications(a)xwiki.org> wrote: > Author: vmassol > Date: 2010-07-03 20:08:56 +0200 (Sat, 03 Jul 2010) > New Revision: 29958 > > Modified: > platform/core/trunk/pom.xml > platform/core/trunk/xwiki-chart/xwiki-chart-renderer/pom.xml > platform/core/trunk/xwiki-core/pom.xml > Log: > XWIKI-867: Move to the latest JFreeChart library version > > * Fixed missing dependency in POM > > Modified: platform/core/trunk/pom.xml > =================================================================== > --- platform/core/trunk/pom.xml 2010-07-03 16:38:29 UTC (rev 29957) > +++ platform/core/trunk/pom.xml 2010-07-03 18:08:56 UTC (rev 29958) > @@ -70,6 +70,13 @@ > <artifactId>jfreechart</artifactId> > <version>1.0.13</version> > </dependency> > +  > + <dependency> > + <groupId>jfree</groupId> > + <artifactId>jcommon</artifactId> > + <version>1.0.15</version> > + </dependency> > </dependencies> > </dependencyManagement> > <build> Thanks, I was wondering why it did not worked when looking at hudson but did not had time to look yet. > > Modified: platform/core/trunk/xwiki-chart/xwiki-chart-renderer/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-chart/xwiki-chart-renderer/pom.xml 2010-07-03 16:38:29 UTC (rev 29957) > +++ platform/core/trunk/xwiki-chart/xwiki-chart-renderer/pom.xml 2010-07-03 18:08:56 UTC (rev 29958) > @@ -41,6 +41,12 @@ > <groupId>jfree</groupId> > <artifactId>jfreechart</artifactId> > </dependency> > +  > + <dependency> > + <groupId>jfree</groupId> > + <artifactId>jcommon</artifactId> > + </dependency> >  > <dependency> > <groupId>org.xwiki.platform</groupId> > > Modified: platform/core/trunk/xwiki-core/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-core/pom.xml 2010-07-03 16:38:29 UTC (rev 29957) > +++ platform/core/trunk/xwiki-core/pom.xml 2010-07-03 18:08:56 UTC (rev 29958) > @@ -134,6 +134,12 @@ > <groupId>jfree</groupId> > <artifactId>jfreechart</artifactId> > </dependency> > +  > + <dependency> > + <groupId>jfree</groupId> > + <artifactId>jcommon</artifactId> > + </dependency> > >  > <dependency> > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications > -- Thomas Mortagne

15 years, 2 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r29955 - platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx

by Vincent Massol

On Jul 3, 2010, at 4:21 PM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2010-07-03 16:21:17 +0200 (Sat, 03 Jul 2010) > New Revision: 29955 > > Modified: > platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/AbstractSkinExtensionPlugin.java > Log: > [misc] Improved URL escaping method > > Modified: platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/AbstractSkinExtensionPlugin.java > =================================================================== > --- platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/AbstractSkinExtensionPlugin.java 2010-07-03 12:50:27 UTC (rev 29954) > +++ platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/AbstractSkinExtensionPlugin.java 2010-07-03 14:21:17 UTC (rev 29955) > @@ -20,6 +20,8 @@ > > package com.xpn.xwiki.plugin.skinx; > > +import java.io.UnsupportedEncodingException; > +import java.net.URLEncoder; > import java.util.Collections; > import java.util.HashMap; > import java.util.LinkedHashSet; > @@ -27,7 +29,6 @@ > import java.util.Set; > import java.util.Map.Entry; > > -import org.apache.commons.lang.StringUtils; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > > @@ -307,10 +308,11 @@ > protected String sanitize(String value) > { > String result = value; > - result = StringUtils.replace(result, "\"", "%22"); > - result = StringUtils.replace(result, "'", "%27"); > - result = StringUtils.replace(result, "<", "%3C"); > - result = StringUtils.replace(result, ">", "%3E"); > + try { > + result = URLEncoder.encode(value, "UTF-8"); > + } catch (UnsupportedEncodingException ex) { > + // Should never happen. > + } What if it happens (if the exception is there it means it can happen)? Shouldn't you at least log an error or warning that says the result is left as is without being encoded? Thanks -Vincent

15 years, 2 months

2
4
0 0

[xwiki-devs] [VOTE] Remote org.jfree.chart.plot.Plot#setDataAreaRatio call and upgrade to jfreechart 1.0.13

by Thomas Mortagne

Hi devs, Currently we are using some custom 1.0.0RC1 version of jfreechart and keep using it for only one reason: we are using org.jfree.chart.plot.Plot#setDataAreaRatio API in the old chart plugin and we can't find a proper equivalent (i don't even see what this is doing since it does not change anything in the chart i tried like in statistics). My proposal is to simply remove it so that we can move on. In any case there is a new charting component that should be the one use and which is already built with recent jfreechart API (we are pretty lucky that it simply work in such conditions since we distribute XE with 1.0.0RC1) and if setDataAreaRatio is really related to en important feature it should be supported by the new component if not already done. WDYT ? Here is my +1 -- Thomas Mortagne

15 years, 2 months

5
5
0 0

Re: [xwiki-devs] [xwiki-notifications] r29950 - enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui

by Vincent Massol

Hi Sergiu, On Jul 3, 2010, at 12:56 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2010-07-03 00:56:27 +0200 (Sat, 03 Jul 2010) > New Revision: 29950 > > Modified: > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditObjectsTest.java > Log: > [misc] New test: adding an object by clicking the inline "New <class> object" [snip] > + > + @Test > + public void testInlineObjectAddButton() > + { > + ObjectEditPage oep = new ObjectEditPage(); > + oep.switchToEdit("Test", "EditObjectsTestObject"); > + oep.addObject("XWiki.XWikiUsers"); > + > + getDriver().findElement(By.cssSelector("[id='add_xobject_XWiki.XWikiUsers'] .xobject-add-control")).click(); > + Wait<WebDriver> wait = new WebDriverWait(getDriver(), getUtil().getTimeout()); > + wait.until(new ExpectedCondition<Boolean>() > + { > + public Boolean apply(WebDriver driver) > + { > + return Boolean.valueOf(driver.findElements(By.cssSelector("[id='xclass_XWiki.XWikiUsers'] .xobject")) > + .size() == 2); > + } > + }); Isn't this an api missing in Page Objects (what does it do)? Thanks -Vincent

15 years, 2 months

2
2
0 0

[xwiki-devs] FAQ sorting

by Sales, G. (Grant)

http://www.xwiki.org/xwiki/bin/view/FAQ/#Attachments Three Questions. 1) how can I sort my FAQ into these two columns ? 2) Can I see the wiki code for this page? 3) How can I get the Author and Modifier at the bottom of the page like that? Grant Sales Security Operations Analyst ING 20 Washington Ave South Minneapolis, MN 55401 Tel: 612.342.7889 Fax: 612.342.3428 Cell: 320.761.0966 Email: grant.sales(a)us.ing.com www.ing-usa.com ING. Your future. Made easier. (r) --------------------------------------------------------- NOTICE: The information contained in this electronic mail message is confidential and intended only for certain recipients. If you are not an intended recipient, you are hereby notified that any disclosure, reproduction, distribution or other use of this communication and any attachments is strictly prohibited. If you have received this communication in error, please notify the sender by reply transmission and delete the message without copying or disclosing it. ============================================================================================

15 years, 2 months

5
21
0 0

[xwiki-devs] [ANN] XWiki Enterprise 2.4 Milestone 2 Released

by Thomas Mortagne

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.4 Milestone 2. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This is second and last milestone of the XWiki Enterprise 2.4 version. Main changes from XWiki Enterprise 2.4 Milestone 2: * Objects and classes editor improvements * New Template-based page creation * New Invitation Manager application * New search application improvements * WYSIWYG Improvements * JMX Administration Console * Watchlist improvements * Script improvements * Javascript improvements * Lots of bugs fixes For more information see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise24M2 Thanks - The XWiki dev team

15 years, 2 months

1
0
0 0

[xwiki-devs] [HELP NEEDED] we urgently need references with more than 1000 users to get XWiki in the Gartner report

by Ludovic Dubost

Hi XWiki users, We have an urgent request, as we need to be able to make a response TONIGHT (it's not that we did it at the last moment, but that we got the information very late). We would like to have XWiki included in the Gartner "Magic Quadrant for Social Software in the Workplace", which has some tough criterias to get in. The criterias are to have: - at least 100000 users (internal to companies, all deployments included) AND - at least 4 companies with more than 5000 users (internal to companies) willing to talk to Gartner about their usage. While we do have at XWiki SAS companies we work with that we know the deployment size and that we can contact to see if they are willing to talk to Gartner, we do need more. If you have or know of a deployment with more than 1000 users of the Wiki for INTERNAL USAGE (not public web sites), it would be great if you can contact us ASAP at marketing(a)xwiki.com If you have more than 5000 users, please do contact us even more. Even if you are not sure that you can talk to Gartner please do tell us, as we need to answer before tonight if we meet the inclusion criterias. Then there is a follow-up process and we can verify then if talking with Gartner is possible (we would need at least the deployment acknowledged) This is very important for XWiki as in can give a lot of visibility to XWiki and widden the user base thanks to this visibility. Thanks for your help Ludovic Dubost XWiki SAS CEO and XWiki creator -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

15 years, 2 months

1
0
0 0

[xwiki-devs] [VOTE] Release XE 2.4M1

by Thomas Mortagne

Hi devs, We are already a bit late so i would like to release XE 2.4M1, there is only some flickering test remaining plus mostly inline style DWG validation failure. You can see the started release note at http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise24M2 WDYT ? -- Thomas Mortagne

15 years, 2 months

2
1
0 0

[xwiki-devs] [VOTE] Release XE 2.4M2

by Thomas Mortagne

That's 2.4M2 of course On Tue, Jun 29, 2010 at 15:47, Thomas Mortagne <thomas.mortagne(a)xwiki.com> wrote: > Hi devs, > > We are already a bit late so i would like to release XE 2.4M1, there > is only some flickering test remaining plus mostly inline style DWG > validation failure. > > You can see the started release note at > http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise24M2 > > WDYT ? > > -- > Thomas Mortagne > -- Thomas Mortagne

15 years, 2 months

5
4
0 0

[xwiki-devs] [proposal] Make EntityReferences easier to create.

by Caleb James DeLisle

I believe that in order for a new api to be accepted by the community, it must be more useful and/or easier to use than the api which it replaces. The old way of getting a document was this: $xwiki.getDocument("xwiki:Main.WebHome") The current way to get a document is this: $xwiki.getDocument($services.model.createDocumentReference($context.wiki, $space, "WebHome")) I am quite sure that the user community will choose the former even if it has escaping issues. Lest one think we can bully the community into choosing the latter by deprecation or removal of methods, recall the dismal sales of Windows Vista even with the control afforded by the proprietary license and the awesome power Microsoft wields over the market. The user is the boss, their word is law. My first proposal is that we move to an easier way to handle document names. My second proposal is a possible way to do it. I would like velocity and groovy script authors to be able to give a command like this: xwiki.getDocument(["Main", "WebHome"]); or in velocity $xwiki.getDocument(["Main", "WebHome"]) To make that possible I am proposing we change the reference model as follows: EntityReference extends List<String> Each reference has a name which is expressed as a string, it also has a reference to the next node and the last node. This is a classic example of a LinkedList. The point is that any List<String> is a valid (although reletive) reference. When a relative reference is passed, it is replaced with a complete reference which is completed using the document in the context. As you prepare your -1's please recognize that the community will never go for the current model and almost anything is better than a rift between the community and the development team. If there are any other ideas of how to make it that easy, I would be glad to hear them. Caleb

15 years, 2 months

5
10
0 0

[xwiki-devs] Advanced XWQL : query with many XWikDocument

by farouk korteby

Hi devs, I can't execute a XWQL query with different XWikDocument as example below : *select *userDoc.fullName *from *XWikiDocument as userDoc, XWikiDocument as doc *where *doc.object(XWiki.ArticleClass).content like '%ludovic%' and userDoc.object(XWiki.XWikiUsers).email like '%xwiki.com' *can some one help me ?* -- Farouk Korteby

15 years, 2 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r29788 - in enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui: . framework/elements invitation

by Caleb James DeLisle

vmassol (SVN) wrote: > Author: vmassol > Date: 2010-06-28 15:36:43 +0200 (Mon, 28 Jun 2010) > New Revision: 29788 > > Added: > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditObjectsTest.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ClassEditPage.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/DatabaseListClassEditElement.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ObjectEditPage.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/PreviewableEditPage.java > Removed: > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditObjectsPage.java > Modified: > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditWikiTest.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/BasePage.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditPage.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/FormElement.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ViewPage.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WYSIWYGEditPage.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WikiEditPage.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/invitation/InvitationTest.java > Log: > Start porting the XObjectsTest class to the XWiki selenium2 framework > > Added: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditObjectsTest.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditObjectsTest.java (rev 0) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditObjectsTest.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -0,0 +1,91 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > +package org.xwiki.it.ui; > + > +import org.junit.Assert; > +import org.junit.Before; > +import org.junit.Test; > +import org.openqa.selenium.By; > +import org.xwiki.it.ui.framework.AbstractAdminAuthenticatedTest; > +import org.xwiki.it.ui.framework.elements.ClassEditPage; > +import org.xwiki.it.ui.framework.elements.FormElement; > +import org.xwiki.it.ui.framework.elements.ObjectEditPage; > +import org.xwiki.it.ui.framework.elements.ViewPage; > +import org.xwiki.it.ui.framework.elements.WikiEditPage; > + > +/** > + * Test XObject editing. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +public class EditObjectsTest extends AbstractAdminAuthenticatedTest > +{ > + @Before > + @Override > + public void setUp() > + { > + super.setUp(); > + getUtil().deletePage("Test", "EditObjectsTestClass"); > + getUtil().deletePage("Test", "EditObjectsTestObject"); > + } > + > + /** > + * Tests that XWIKI-1621 remains fixed. > + */ > + @Test > + public void testChangeMultiselectProperty() > + { > + // Create a class with a database list property set to return all documents > + ClassEditPage cep = new ClassEditPage(); > + cep.switchToEdit("Test", "EditObjectsTestClass"); > + cep.addProperty("prop", "com.xpn.xwiki.objects.classes.DBListClass"); > + cep.getDatabaseListClassEditElement("prop").setHibernateQuery( > + "select doc.fullName from XWikiDocument doc where doc.space = 'Test'"); > + ViewPage vp = cep.clickSaveAndView(); > + > + // Create a second page to hold the Object and set its content > + WikiEditPage wep = new WikiEditPage(); > + wep.switchToEdit("Test", "EditObjectsTestObject"); > + wep.setContent("this is the content"); > + vp = wep.clickSaveAndView(); > + > + // Add an object of the class created and set the value to be the test page > + ObjectEditPage oep = vp.clickEditObjects(); > + FormElement objectForm = oep.addObject("Test.EditObjectsTestClass"); > + objectForm.setFieldValue(By.id("Test.EditObjectsTestClass_0_prop"), "Test.EditObjectsTestClass"); > + vp = oep.clickSaveAndView(); > + > + // Set multiselect to true > + cep = new ClassEditPage(); > + cep.switchToEdit("Test", "EditObjectsTestClass"); > + cep.getDatabaseListClassEditElement("prop").isMultiSelect(true); > + vp = cep.clickSaveAndView(); > + > + // Select a second document in the DB list select field. > + oep = new ObjectEditPage(); > + oep.switchToEdit("Test", "EditObjectsTestObject"); > + oep.getObjectsOfClass("Test.EditObjectsTestClass").get(0).setFieldValue( > + By.id("Test.EditObjectsTestClass_0_prop"), "Test.EditObjectsTestObject"); > + vp = oep.clickSaveAndView(); > + > + Assert.assertEquals("this is the content", vp.getContent()); > + } > +} > > > Property changes on: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditObjectsTest.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditWikiTest.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditWikiTest.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/EditWikiTest.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -35,7 +35,7 @@ > */ > public class EditWikiTest extends AbstractAdminAuthenticatedTest > { > - /** Page used for testing: Main.EditWikiTest */ > + /** Page used for testing: Test.EditWikiTest */ > private WikiEditPage editPage; > > @Before > @@ -47,12 +47,6 @@ > getUtil().deletePage("Test", "EditWikiTest"); > } > > - @After > - public void cleanUp() > - { > - getUtil().deletePage("Test", "EditWikiTest"); > - } > - > /** Test that save and continue saves as a minor version. */ > @Test > public void testSaveAndContinueSavesAsMinorEdit() > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/BasePage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/BasePage.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/BasePage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -179,16 +179,18 @@ > /** > * Performs a click on the "edit objects" entry of the content menu. > */ > - public void clickEditObjects() > + public ObjectEditPage clickEditObjects() > { > - clickContentMenuEditSubMenuEntry("tmEditObjects"); > + clickContentMenuEditSubMenuEntry("tmEditObject"); > + return new ObjectEditPage(); > } > > /** > * Performs a click on the "edit class" entry of the content menu. > */ > - public void clickEditClass() > + public ClassEditPage clickEditClass() > { > clickContentMenuEditSubMenuEntry("tmEditClass"); > + return new ClassEditPage(); > } > } > > Added: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ClassEditPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ClassEditPage.java (rev 0) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ClassEditPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -0,0 +1,112 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > +package org.xwiki.it.ui.framework.elements; > + > +import org.openqa.selenium.By; > +import org.openqa.selenium.WebElement; > +import org.openqa.selenium.support.FindBy; > + > +/** > + * Represents the common actions possible on all Pages when using the "edit" action with the "class" editor. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +// TODO: Fix the fact that this class should extend EditPage but the id of the save action is incorrectly different... > +public class ClassEditPage extends BasePage > +{ > + @FindBy(name = "action_saveandcontinue") > + private WebElement saveandcontinue; > + > + @FindBy(name = "action_propupdate") > + private WebElement saveandview; > + > + @FindBy(name = "action_cancel") > + private WebElement cancel; > + > + @FindBy(id ="propupdate") > + private WebElement propertyForm; > + > + @FindBy(id = "propname") > + private WebElement propertyNameField; > + > + @FindBy(id = "proptype") > + private WebElement propertyTypeField; > + > + @FindBy(name = "action_propadd") > + private WebElement propertySubmit; > + > + private FormElement form; > + > + public void addProperty(String propertyName, String propertyType) > + { > + getForm().setFieldValue(this.propertyNameField, propertyName); > + getForm().setFieldValue(this.propertyTypeField, propertyType); > + this.propertySubmit.click(); > + } > + > + private FormElement getForm() > + { > + if (this.form == null) { > + this.form = new FormElement(this.propertyForm); > + } > + return this.form; > + } > + > + /** > + * Start editing the page using the Class editor. > + * > + * @param space > + * @param page > + */ > + public void switchToEdit(String space, String page) > + { > + getUtil().gotoPage(space, page, "edit", "editor=class"); > + } > + > + public DatabaseListClassEditElement getDatabaseListClassEditElement(String propertyName) > + { > + // Make the element visible before returning it > + By locator = By.id("xproperty_" + propertyName + "_title"); > + waitUntilElementIsVisible(locator); > + getDriver().findElement(locator).click(); > + return new DatabaseListClassEditElement(getForm(), propertyName); > + } > + > + public void clickSaveAndContinue() > + { > + this.saveandcontinue.click(); > + > + // Wait until the page is really saved > + waitUntilElementIsVisible(By.xpath("//div[contains(@class,'xnotification-done') and text()='Saved']")); > + } > + > + public ViewPage clickSaveAndView() > + { > + this.saveandview.click(); > + return new ViewPage(); > + } > + > + public ViewPage clickCancel() > + { > + this.cancel.click(); > + return new ViewPage(); > + } > +} > > > Property changes on: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ClassEditPage.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Added: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/DatabaseListClassEditElement.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/DatabaseListClassEditElement.java (rev 0) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/DatabaseListClassEditElement.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -0,0 +1,51 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > +package org.xwiki.it.ui.framework.elements; > + > +import org.openqa.selenium.By; > + > +/** > + * Represents a DatabaseListClass property form. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +public class DatabaseListClassEditElement extends BaseElement > +{ > + private String propertyName; > + > + private FormElement form; > + > + public DatabaseListClassEditElement(FormElement form, String propertyName) > + { > + this.form = form; > + this.propertyName = propertyName; > + } > + > + public void setHibernateQuery(String value) > + { > + this.form.setFieldValue(By.id(this.propertyName + "_sql"), value); > + } > + > + public void isMultiSelect(boolean isMultiSelect) > + { > + this.form.setFieldValue(By.id(this.propertyName + "_multiSelect"), isMultiSelect ? "true" : "false"); > + } > +} > > > Property changes on: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/DatabaseListClassEditElement.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Deleted: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditObjectsPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditObjectsPage.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditObjectsPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -1,117 +0,0 @@ > -/* > - * See the NOTICE file distributed with this work for additional > - * information regarding copyright ownership. > - * > - * This is free software; you can redistribute it and/or modify it > - * under the terms of the GNU Lesser General Public License as > - * published by the Free Software Foundation; either version 2.1 of > - * the License, or (at your option) any later version. > - * > - * This software is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this software; if not, write to the Free > - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > - */ > -package org.xwiki.it.ui.framework.elements; > - > -import java.util.Set; > -import java.util.List; > -import java.util.ArrayList; > - > -import org.openqa.selenium.RenderedWebElement; > -import org.openqa.selenium.WebElement; > -import org.openqa.selenium.WebDriverException; > -import org.openqa.selenium.By; > - > -/** > - * Represents the common actions possible editing objects on a page. > - * > - * @version $Id$ > - * @since 2.4M2 > - */ > -public class EditObjectsPage extends EditPage > -{ > - public String getURL(String space, String page) > - { > - return getUtil().getURL(space, page, "edit", "editor=object"); > - } > - > - public void clickPreview() > - { > - throw new WebDriverException("Preview not available in object editor"); > - } > - > - /** className will look something like "XWiki.XWikiRights" */ > - public List<FormElement> getObjectsOfClass(String className) > - { > - List<WebElement> titles = getDriver().findElement(By.id("xclass_" + className)) > - .findElements(By.className("xobject-title")); > - List<WebElement> elements = getDriver().findElement(By.id("xclass_" + className)) > - .findElements(By.className("xobject-content")); > - List<FormElement> forms = new ArrayList<FormElement>(elements.size()); > - for (int i = 0; i < elements.size(); i++) { > - WebElement element = elements.get(i); > - // Make sure all forms are displayed otherwise we can't interact with them. > - if (element instanceof RenderedWebElement && !((RenderedWebElement) element).isDisplayed()) { > - titles.get(i).click(); > - } > - forms.add(new FormElement(element)); > - } > - return forms; > - } > - > - /** > - * Adding an object is easy, you simply say: > - * page.getAddPanel().selectClass("XWiki.XWikiRights").clickAdd(); > - */ > - public AddObjectPanel getAddPanel() > - { > - return this.new AddObjectPanel(); > - } > - > - public class AddObjectPanel > - { > - private WebElement form; > - > - private FormElement.SelectElement classSelector; > - > - private WebElement getForm() > - { > - if (form == null) { > - form = getDriver().findElement(By.id("objectadd")); > - } > - return form; > - } > - > - private FormElement.SelectElement getClassSelector() > - { > - if (classSelector == null) { > - classSelector = new FormElement(getForm()).getSelectElement(By.name("classname")); > - } > - return classSelector; > - } > - > - public AddObjectPanel selectClass(String name) > - { > - getClassSelector().select(name); > - return this; > - } > - > - public Set<String> getOptions() > - { > - return getClassSelector().getOptions(); > - } > - > - public void clickAdd() > - { > - getForm().findElement(By.className("button")).click(); > - } > - } > - > - > -} > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditPage.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/EditPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -31,9 +31,6 @@ > */ > public class EditPage extends BasePage > { > - @FindBy(name = "action_preview") > - private WebElement preview; > - > @FindBy(name = "action_saveandcontinue") > private WebElement saveandcontinue; > > @@ -43,11 +40,6 @@ > @FindBy(name = "action_cancel") > private WebElement cancel; > > - public void clickPreview() > - { > - preview.click(); > - } > - > public void clickSaveAndContinue() > { > saveandcontinue.click(); > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/FormElement.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/FormElement.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/FormElement.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -28,7 +28,6 @@ > import org.openqa.selenium.By; > import org.openqa.selenium.WebDriverException; > import org.openqa.selenium.WebElement; > -import org.xwiki.it.ui.framework.elements.BaseElement; > > /** > * Represents a Form. > @@ -75,11 +74,18 @@ > > public void setFieldValue(WebElement fieldElement, String value) > { > - if (!fieldElement.getTagName().equals("input") && !fieldElement.getTagName().equals("textarea")) { > - throw new WebDriverException("You can only fill in input and textarea elements."); > - } > if ("checkbox".equals(fieldElement.getAttribute("type"))) { > setCheckBox(fieldElement, value.equals("true")); > + } else if ("select".equals(fieldElement.getTagName())) { > + // TODO: Should we do this? (don't seem to work) > + //SelectElement select = new SelectElement(fieldElement); > + //select.select(value); Are you referring to this? http://code.google.com/p/selenium/source/browse/trunk/support/src/java/org/… I didn't know the selenium people were using the same pattern that I was. > + List<WebElement> allOptions = fieldElement.findElements(By.tagName("option")); > + for (WebElement option : allOptions) { > + if (value.equals(option.getValue())) { > + option.setSelected(); > + } > + } > } else { > fieldElement.clear(); > fieldElement.sendKeys(value); > > Added: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ObjectEditPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ObjectEditPage.java (rev 0) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ObjectEditPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -0,0 +1,97 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > +package org.xwiki.it.ui.framework.elements; > + > +import java.util.ArrayList; > +import java.util.List; > + > +import org.openqa.selenium.By; > +import org.openqa.selenium.RenderedWebElement; > +import org.openqa.selenium.WebElement; > +import org.openqa.selenium.support.FindBy; > + > +/** > + * Represents the common actions possible on all Pages when using the "edit" action with the "object" editor. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +public class ObjectEditPage extends EditPage > +{ > + @FindBy(id ="update") > + private WebElement objectForm; > + > + @FindBy(id = "classname") > + private WebElement classNameField; > + > + @FindBy(name = "action_objectadd") > + private WebElement classNameSubmit; > + > + private FormElement form; > + > + public FormElement addObject(String className) > + { > + getForm().setFieldValue(this.classNameField, className); > + this.classNameSubmit.click(); > + > + // Make sure we wait for the element to appear since there's no page refresh. > + waitUntilElementIsVisible(By.id("xclass_" + className)); > + > + List<FormElement> objects = getObjectsOfClass(className); > + return objects.get(objects.size() - 1); > + } > + > + private FormElement getForm() > + { > + if (this.form == null) { > + this.form = new FormElement(this.objectForm); > + } > + return this.form; > + } > + > + public String getURL(String space, String page) > + { > + return getUtil().getURL(space, page, "edit", "editor=object"); > + } > + > + /** className will look something like "XWiki.XWikiRights" */ > + public List<FormElement> getObjectsOfClass(String className) > + { > + List<WebElement> titles = getDriver().findElement(By.id("xclass_" + className)) > + .findElements(By.className("xobject-title")); > + List<WebElement> elements = getDriver().findElement(By.id("xclass_" + className)) > + .findElements(By.className("xobject-content")); > + List<FormElement> forms = new ArrayList<FormElement>(elements.size()); > + for (int i = 0; i < elements.size(); i++) { > + WebElement element = elements.get(i); > + // Make sure all forms are displayed otherwise we can't interact with them. > + if (element instanceof RenderedWebElement && !((RenderedWebElement) element).isDisplayed()) { > + titles.get(i).click(); > + } > + forms.add(new FormElement(element)); > + } > + return forms; > + } > + > + public void switchToEdit(String space, String page) > + { > + getUtil().gotoPage(space, page, "edit", "editor=object"); Maybe use getDriver().get(getURL()); ? I have used this pattern elsewhere. > + } > +} > > > Property changes on: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ObjectEditPage.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Added: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/PreviewableEditPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/PreviewableEditPage.java (rev 0) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/PreviewableEditPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -0,0 +1,40 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > +package org.xwiki.it.ui.framework.elements; > + > +import org.openqa.selenium.WebElement; > +import org.openqa.selenium.support.FindBy; > + > +/** > + * Edit page with a preview button. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +public class PreviewableEditPage extends EditPage > +{ > + @FindBy(name = "action_preview") > + private WebElement preview; > + > + public void clickPreview() > + { > + preview.click(); > + } > +} > > > Property changes on: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/PreviewableEditPage.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ViewPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ViewPage.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/ViewPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -57,6 +57,9 @@ > @FindBy(id = "tmAdminWiki") > private WebElement administerWikiMenuLink; > > + @FindBy(id = "xwikicontent") > + private WebElement content; > + > /** > * Logs in the Admin user (move to the home page if the current page has no log in link). > */ > @@ -159,4 +162,13 @@ > } > return true; > } > + > + /** > + * @return the page's main content > + * @since 2.4M2 > + */ > + public String getContent() > + { > + return this.content.getText(); > + } I don't know what getText() will do in this instance, the content inside of xwikicontent is HTML so IMO it should return the WebElement. > } > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WYSIWYGEditPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WYSIWYGEditPage.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WYSIWYGEditPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -28,7 +28,7 @@ > * @version $Id$ > * @since 2.3M1 > */ > -public class WYSIWYGEditPage extends EditPage > +public class WYSIWYGEditPage extends PreviewableEditPage > { > @FindBy(id = "xwikidoctitleinput") > private WebElement titleField; > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WikiEditPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WikiEditPage.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/framework/elements/WikiEditPage.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -28,7 +28,7 @@ > * @version $Id$ > * @since 2.4M1 > */ > -public class WikiEditPage extends EditPage > +public class WikiEditPage extends PreviewableEditPage > { > @FindBy(id = "xwikidoctitleinput") > private WebElement titleInput; > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/invitation/InvitationTest.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/invitation/InvitationTest.java 2010-06-28 13:29:41 UTC (rev 29787) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/invitation/InvitationTest.java 2010-06-28 13:36:43 UTC (rev 29788) > @@ -37,6 +37,7 @@ > import org.openqa.selenium.By; > import org.openqa.selenium.WebElement; > import org.xwiki.it.ui.administration.elements.AdminSectionPage; > +import org.xwiki.it.ui.framework.elements.ObjectEditPage; > import org.xwiki.it.ui.invitation.elements.InvitationSenderPage; > import org.xwiki.it.ui.invitation.elements.InvitationMessageDisplayElement; > import org.xwiki.it.ui.framework.elements.TableElement; > @@ -44,7 +45,6 @@ > import org.xwiki.it.ui.invitation.elements.InvitationActionConfirmationElement; > import org.xwiki.it.ui.invitation.elements.InvitationGuestActionsPage; > import org.xwiki.it.ui.framework.elements.RegisterPage; > -import org.xwiki.it.ui.framework.elements.EditObjectsPage; > import org.xwiki.it.ui.framework.AbstractTest; > import org.xwiki.it.ui.framework.TestUtils; > > @@ -508,13 +508,13 @@ > TestUtils.Session admin = getUtil().getSession(); > try { > // First we ban anon from registering. > - EditObjectsPage eop = new EditObjectsPage(); > - getDriver().get(eop.getURL("XWiki", "XWikiPreferences")); > + ObjectEditPage oep = new ObjectEditPage(); > + getDriver().get(oep.getURL("XWiki", "XWikiPreferences")); > > - eop.getObjectsOfClass("XWiki.XWikiGlobalRights").get(2) > + oep.getObjectsOfClass("XWiki.XWikiGlobalRights").get(2) > .getSelectElement(By.name("XWiki.XWikiGlobalRights_2_levels")).unSelect("register"); > > - eop.clickSaveAndContinue(); > + oep.clickSaveAndContinue(); > // now prove anon cannot register > getUtil().setSession(null); > new RegisterPage().gotoPage(); > @@ -554,13 +554,13 @@ > getUtil().setSession(admin); > > // Better open the wiki back up again. > - EditObjectsPage eop = new EditObjectsPage(); > - getDriver().get(eop.getURL("XWiki", "XWikiPreferences")); > + ObjectEditPage oep = new ObjectEditPage(); > + getDriver().get(oep.getURL("XWiki", "XWikiPreferences")); > > - eop.getObjectsOfClass("XWiki.XWikiGlobalRights").get(2) > + oep.getObjectsOfClass("XWiki.XWikiGlobalRights").get(2) > .getSelectElement(By.name("XWiki.XWikiGlobalRights_2_levels")).select("register"); > > - eop.clickSaveAndContinue(); > + oep.clickSaveAndContinue(); > } > } > > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

15 years, 2 months

1
0
0 0

Re: [xwiki-devs] Embed xwiki to existing project

by xManish

Hi... Good to know there are people with common interest in embedding xwiki to existing project. Here is my confusion. Please comment if you have idea on this. I have my J2EE project. It uses JSF, Spring and Hibernate. So I have my own hibernate.cfg.xml and web.xml and other config files. Now, I'm trying to add xwiki as a module to my project. Since Xwiki uses Struts and Hibernate, it also has its own hibernate.cfg.xml and web.xml files. How do I integrate these two now? Can I have both of these in my project and move on? If I am able to work it out, I think I can move forward. I just learnt the way how we can delegate the struts action management to the spring framework. Regards, Manish -- View this message in context: http://xwiki.475771.n2.nabble.com/Embed-xwiki-to-existing-project-tp5070278… Sent from the XWiki- Dev mailing list archive at Nabble.com.

15 years, 2 months

3
3
0 0

Re: [xwiki-devs] [xwiki-notifications] r29794 - enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements platform/xwiki-applications/trunk/administration/src/main/resources/XWiki

by Vincent Massol

On Jun 28, 2010, at 5:02 PM, jvdrean (SVN) wrote: > Author: jvdrean > Date: 2010-06-28 17:02:21 +0200 (Mon, 28 Jun 2010) > New Revision: 29794 > > Modified: > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java > platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/AdminTemplatesSheet.xml > Log: > [misc] Little refactoring > > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java 2010-06-28 14:48:38 UTC (rev 29793) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java 2010-06-28 15:02:21 UTC (rev 29794) > @@ -36,7 +36,7 @@ > @FindBy(id = "page") > private WebElement pageInput; > > - @FindBy(xpath = "//form/div/input[@type='submit']") > + @FindBy(xpath = "//input[@id='createTemplateProvider']") Almost :) @FindBy(id = 'createTemplateProvider') (since ids are unique) Do we have a naming convention for ids? Thanks -Vincent > private WebElement createButton; > > public AdminTemplatesPage() > > Modified: platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/AdminTemplatesSheet.xml > =================================================================== > --- platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/AdminTemplatesSheet.xml 2010-06-28 14:48:38 UTC (rev 29793) > +++ platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/AdminTemplatesSheet.xml 2010-06-28 15:02:21 UTC (rev 29794) > @@ -34,7 +34,7 @@ > <input type="text" id="space" name="space" value="XWiki" size="8"/> > <label for="page">$msg.get('admin.templates.createprovider.page')</label> > <input type="text" id="page" name="page" value="$msg.get('admin.templates.createprovider.defaultdocname')" class="withTip"'/> > - <input type="submit" value="$msg.get('admin.templates.createprovider.create')" class="button"/> > + <input id="createTemplateProvider" type="submit" value="$msg.get('admin.templates.createprovider.create')" class="button"/> > </div> > </form> > {{/html}}

15 years, 2 months

3
2
0 0

[xwiki-devs] [proposal] Add velocity api which is deprecated so that templates can be made to log a deprecated warning.

by Caleb James DeLisle

I would like to start deprecating templates which are no longer used and I think the right way is to make the deprecated template throw a warning to the logs when it's called. I am proposing adding a service which does nothing but is deprecated. Templates which we deprecate will have this call added and then users of said templates will have fair warning that the template will be removed. Not knowing what the convention is I will blindly suggest: $services.velocity.deprecated() If anyone has a better name, I'd like to hear it. WDYT? Caleb

15 years, 2 months

3
3
0 0

Re: [xwiki-devs] [xwiki-notifications] r29792 - enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements

by Vincent Massol

On Jun 28, 2010, at 4:47 PM, jvdrean (SVN) wrote: > Author: jvdrean > Date: 2010-06-28 16:47:46 +0200 (Mon, 28 Jun 2010) > New Revision: 29792 > > Modified: > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java > Log: > [misc] Updated test after modifications in the admin app > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java 2010-06-28 14:23:42 UTC (rev 29791) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/administration/elements/AdminTemplatesPage.java 2010-06-28 14:47:46 UTC (rev 29792) > @@ -36,7 +36,7 @@ > @FindBy(id = "page") > private WebElement pageInput; > > - @FindBy(xpath = "//form/input[@type='submit']") > + @FindBy(xpath = "//form/div/input[@type='submit']") Would be better to use an id or name IMO (would make it more deterministic + less maintenance). Thanks -Vincent > private WebElement createButton; > > public AdminTemplatesPage()

15 years, 2 months

2
1
0 0

[xwiki-devs] [proposal] Remove registeruser.vm and RegisterAction.java, and fold register-inline.vm into register.vm

by Caleb James DeLisle

I would like to remove registeruser.vm because it was once used by the administration app and is now unused. I would also like to merge register-inline.vm into register.vm and remove c.x.x.web.RegisterAction and move it's functionality into register.vm so that everything will continue to work without XWiki.Registration. This will remove 60 lines in one class from xwiki-core and remove/merge away 2 templates making the code easier to understand for people who don't know the history of it. WDYT? Caleb

15 years, 2 months

2
2
0 0

[xwiki-devs] Gadgets & Dashboard roadmap

by Anca Luca

Hi all, I am now restarting the work on the gadgets & dashboard project, documented here http://dev.xwiki.org/xwiki/bin/view/Design/GadgetIntegration (however documentation needs to be slightly revised). What is done already can be summarized as: * gadgets are implemented as macros and there is a script to import google gadgets as xwiki macros, * also, right now, gadgets are implemented as xwiki macros and can be used anywhere just like a regular wiki macro, and any wiki macro can be seen/used as a gadget so **there is no difference between macros and gadgets** . WDYT about this? should we keep it like that? (A) * there is a dashboard macro responsible with layouting a gadgets dashboard, which also provides specific editing features in inline mode (gadgets can be dragged around, toolboxes for gadgets in the top right) * there is a minimal macros directory, where one can see all the existing macros, descriptions, details about the parameters. * there is an PanelMacro macro, that displays an xwiki panel inside a document, which can be used to display xwiki panels as gadgets in a dashboard. The big picture of the roadmap is that we should: 1/ have a fully working dashboard, that is implement add gadget and edit gadget settings 2/ implement the main dashboard (Main.Dashboard) as a dashboard and fill it with the appropriate gadgets by default, and also to add a user specific dashboard ("My dashboard") where each user can configure his/her dashboard, and is available to a user from his / her profile or the user menu 3/ have a nice macros directory where a user can navigate through existing gadgets and add one to a dashboard 4/ have a "dashboard template", integrated with the document templates system to easily allow a user to create a dashboard 5/ also, since the xwiki panels can be seen as gadgets / macros, and can be implemented as such, somewhere in the future a refactoring should be made to integrate the 2 notions 6/ be able to publish the gadgets in the wiki such that other apps can integrate this in their content WDYT about the order above? (B) with the mention that points 5 and 6 could eventually be infinitely postponed. Also, after points 1 and 2 are implemented, the feature could be available with xwiki platform and integrated in XE by default. WDYT? (C) my +1 for (A), (B) and (C). Happy hacking, Anca

15 years, 3 months

5
11
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs