March 2011 - xwiki-devs@xwiki.org

[xwiki-devs] [Proposal] Use "colortheme" for the home dashboard by default
by Vincent Massol 22 Mar '11

22 Mar '11

Hi devs, I'd like to suggest we use {{dashboard style="colortheme"/}} by default on the main dashboard for the following reasons: 1) the default style has a heading size issue and it's hard for the dashboard to guess the correct size in all situations 2) it clearly shows it's a dashboard WDYT? Thanks -Vincent

7 13

[xwiki-devs] anonymous user / custom authentication
by Kevin P. Foote 22 Mar '11

22 Mar '11

Hi devs, In writing my own auth plugin I want the ability to run XWiki in anonymous browsing mode as well as the login request triggering my particular auth jar (much like xwiki.org - you can many pages w/out actually authenticating). I have two resulting questions. 1) Is there a magic user name in the form of XWiki."anonymous"/Guest etc.. that I can return in my checkAuth? OR am I thinking about this incorrectly and xwiki already knows that this user is who the context is representing.. 2) I see in reading the xwiki.cfg and tutuorials on how to run your own authentication code that there is a way to override the login page within the config. Is there also a way to "override" the call to the login? I know in (cough,cough) confluence they have a seraph mechanism that you can override what the login action is... looking for something similar here.. I've thought of perhaps using an apache rewrite rule on the login/XWikiLogin page to trigger my auth Thanks guys.. ------ thanks kevin.foote

3 4

[xwiki-devs] [VOTE] Change default published date for XWikiDocument#getDate() instead of instead of #getCreationDate()
by Thomas Mortagne 22 Mar '11

22 Mar '11

Hi devs, I was looking at http://jira.xwiki.org/jira/browse/XWIKI-5336 and basically I'm like Jens, I don't understand why we are using creation date in feed plugin. So I'm proposing to change it for date (last version date). FYI I'm planning to change protected Date getDefaultPublishedDate(Document doc, Map<String, Object> params, XWikiContext context) { return doc.getCreationDate(); } to protected Date getDefaultPublishedDate(Document doc, Map<String, Object> params, XWikiContext context) { return doc.getDate(); } in com.xpn.xwiki.plugin.feed.SyndEntryDocumentSource WDYT ? Here is my +1. -- Thomas Mortagne

6 5

[xwiki-devs] Question for search the resources in dev mailing list
by 许凌志(Jamesxu) 22 Mar '11

22 Mar '11

I am the beginner contributor of xwiki, and I need to find helps like how to get the source files, and how to compile them properly , and maybe some other problems when I am going on. I think most of the quesion at the begginning might be disscussed before in the mailing list. Is there any search tools for such kind information? -- Best wishes, 许凌志(Jame Xu) MOE KLINNS Lab and SKLMS Lab, Xi'an Jiaotong University Department of Computer Science and Technology, Xi’an Jiaotong University

4 4

[xwiki-devs] [Design] Message stream privacy and visibility
by Sergiu Dumitriu 21 Mar '11

21 Mar '11

Hi devs, I wrote two design proposals regarding the new message stream functionality (a.k.a. user status). - http://dev.xwiki.org/xwiki/bin/Design/UserMessagesVisibility specifies what kind of messages (and wiki activity) should be displayed in different contexts, like what should I see in my network tab, what should I see when I visit another user's profile, etc. - http://dev.xwiki.org/xwiki/bin/Design/UserMessagesPrivacy specifies some privacy requirements regarding messages, both from the read and write perspective, like should I be able to see messages for a given group, can I send a direct message to another user, etc. Any feedback is welcome. -- Sergiu Dumitriu http://purl.org/net/sergiu/

4 4

[xwiki-devs] [VOTE] Move sources to GitHub
by Vincent Massol 21 Mar '11

21 Mar '11

Hi everyone, I'd like test the waters and see what you'd feel about moving XWiki's source to GitHub. Pros: * Use Git instead of Subversion. Which means a better SCM especially wrt branching / diagnosins bugs (bissect) just to name 2 * More contributors since it's easy to fork/branch and we can see contributor's patches (pull requests) and apply them way more easily than with subversion * More collaboration in general between committers and contributors * A better SCM web site (check github.com - offers graphs/stats, views of forked/branched repos, etc) * Good buzz for us (tech marketing) * GitHub provides SVN integration (see https://github.com/blog/644-subversion-write-support) which means we can continue using SVN tools such as svnsearch, ohloh, our IDE integrations, etc * Less admin work and less maintenance since this is handled by GitHub itself * Good uptime on GitHub (probably at least as good as ours if not better) * Improved developer spirit since most devs wants to start using Git Cons: * Have to learn a new SCM/new tools * No integration of users with xwiki.org * Import/reorg work to be done obviously * Reliance on an external provider (but seen the other OSS projects there I'm not worried and there's no lock in since your have the repos spread on all users' machines) IMO the pros heavily outweight the cons. WDYT? Thanks -Vincent

9 10

Re: [xwiki-devs] [xwiki-notifications] r35749 - in enterprise/trunk/distribution-test: cluster-tests/src/test/it/org/xwiki/test/cluster cluster-tests/src/test/it/org/xwiki/test/cluster/framework escaping-tests/src/test/it/org/xwiki/test/escaping/fram
by Thomas Mortagne 21 Mar '11

21 Mar '11

On Mon, Mar 21, 2011 at 14:46, Caleb James DeLisle <calebdelisle(a)lavabit.com> wrote: > > > On 03/21/2011 05:20 AM, vmassol (SVN) wrote: >> Author: vmassol >> Date: 2011-03-21 10:20:45 +0100 (Mon, 21 Mar 2011) >> New Revision: 35749 >> >> Modified: >> enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java >> enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java >> enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java >> enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java >> enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java >> enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java >> enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java >> enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java >> enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java >> enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java >> enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java >> enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java >> enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java >> Log: >> XCOMMONS-2: Add JUnit4 Suite for starting/stopping XE + Running all JUnit tests in the current classloader >> >> Modified: enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java >> =================================================================== >> --- enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -24,6 +24,7 @@ >> import org.apache.commons.httpclient.HttpStatus; >> import org.apache.commons.httpclient.methods.GetMethod; >> import org.apache.commons.httpclient.methods.PutMethod; >> +import org.junit.*; > > I thought we didn't do that in tests, it will certainly make my life a lot easier. I tough we didn't do that at all. Look like a mistake. Vincent ? > > Caleb > > >> import org.xwiki.rest.model.jaxb.Attachment; >> import org.xwiki.rest.model.jaxb.Attachments; >> import org.xwiki.rest.resources.attachments.AttachmentResource; >> @@ -38,28 +39,30 @@ >> */ >> public class DocumentCacheTest extends AbstractClusterHttpTest >> { >> + @Test >> public void testDocumentCacheSync() throws Exception >> { >> // 1) edit a page on XWiki 0 >> >> switchXWiki(0); >> setPageContent(getWiki(), "Test", "CacheSync", "content"); >> - assertEquals("content", getPageContent(getWiki(), "Test", "CacheSync")); >> + Assert.assertEquals("content", getPageContent(getWiki(), "Test", "CacheSync")); >> >> // 2) modify content of the page on XWiki 1 >> >> switchXWiki(1); >> setPageContent(getWiki(), "Test", "CacheSync", "modified content"); >> - assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); >> + Assert.assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); >> >> // TODO: give some time to JGroups to send the message >> >> // ASSERT) the content in XWiki 0 should be the one set than in XWiki 1 >> >> switchXWiki(0); >> - assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); >> + Assert.assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); >> } >> >> + @Test >> public void testDocumentCacheSyncForAttachments() throws Exception >> { >> // 1) edit a page on XWiki 0 >> @@ -73,7 +76,7 @@ >> String attachmentUri = >> getUriBuilder(AttachmentResource.class).build(getWiki(), "Test", "AttachementCacheSync", "file.ext").toString(); >> PutMethod putMethod = executePut(attachmentUri, "content", MediaType.TEXT_PLAIN, "Admin", "admin"); >> - assertEquals(getHttpMethodInfo(putMethod), HttpStatus.SC_CREATED, putMethod.getStatusCode()); >> + Assert.assertEquals(getHttpMethodInfo(putMethod), HttpStatus.SC_CREATED, putMethod.getStatusCode()); >> >> // TODO: give some time to JGroups to send the message >> >> @@ -84,7 +87,7 @@ >> getUriBuilder(AttachmentsResource.class).build(getWiki(), "Test", "AttachementCacheSync").toString(); >> >> GetMethod getMethod = executeGet(attachmentsUri); >> - assertEquals(getHttpMethodInfo(getMethod), HttpStatus.SC_OK, getMethod.getStatusCode()); >> + Assert.assertEquals(getHttpMethodInfo(getMethod), HttpStatus.SC_OK, getMethod.getStatusCode()); >> >> boolean found = false; >> >> @@ -96,6 +99,6 @@ >> } >> } >> >> - assertTrue("Failed to find attachment", found); >> + Assert.assertTrue("Failed to find attachment", found); >> } >> } >> >> Modified: enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java >> =================================================================== >> --- enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -19,16 +19,19 @@ >> */ >> package org.xwiki.test.cluster.framework; >> >> +import org.junit.*; >> +import org.xwiki.test.integration.XWikiExecutor; >> import org.xwiki.test.rest.framework.AbstractHttpTest; >> -import org.xwiki.test.XWikiExecutor; >> >> /** >> * Base class for REST based clustering integration test. >> * >> * @version $Id$ >> */ >> +// TODO: Fix this, it's wrong to reuse AbstractHttpTest from the REST Tests module >> public abstract class AbstractClusterHttpTest extends AbstractHttpTest >> { >> + @Test >> public void testRepresentation() throws Exception >> { >> } >> >> Modified: enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java >> =================================================================== >> --- enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -23,11 +23,11 @@ >> import java.io.InputStream; >> import java.util.Properties; >> >> +import org.xwiki.test.integration.XWikiExecutor; >> +import org.xwiki.test.integration.XWikiTestSetup; >> + >> import junit.framework.Test; >> >> -import org.xwiki.test.XWikiExecutor; >> -import org.xwiki.test.XWikiTestSetup; >> - >> /** >> * Set clustering configuration and start two instances of XWiki. >> * <p> >> @@ -47,7 +47,7 @@ >> /** >> * {@inheritDoc} >> * >> - * @see org.xwiki.test.XWikiTestSetup#setUp() >> + * @see XWikiTestSetup#setUp() >> */ >> @Override >> protected void setUp() throws Exception >> >> Modified: enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java >> =================================================================== >> --- enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -19,9 +19,8 @@ >> */ >> package org.xwiki.test.escaping.framework; >> >> -import org.xwiki.test.XWikiExecutor; >> +import org.xwiki.test.integration.XWikiExecutor; >> >> - >> /** >> * Starts and stops exactly one XWiki instance. The methods {@link #start()} and {@link #stop()} >> * allow to call them multiple times, starting and stopping the server only on the first and >> >> Modified: enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java >> =================================================================== >> --- enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -21,10 +21,10 @@ >> >> import java.util.Properties; >> >> +import org.xwiki.test.integration.XWikiTestSetup; >> + >> import junit.framework.Test; >> >> -import org.xwiki.test.XWikiTestSetup; >> - >> /** >> * JUnit TestSetup extension that modify xwiki.cfg file to use LDAP as authentication system. This class is meant to >> * wrap a JUnit TestSuite. For example: >> >> Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java >> =================================================================== >> --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -19,32 +19,15 @@ >> */ >> package org.xwiki.test.rest; >> >> -import org.junit.AfterClass; >> -import org.junit.BeforeClass; >> -import org.junit.extensions.cpsuite.ClasspathSuite; >> import org.junit.runner.RunWith; >> -import org.xwiki.test.XWikiExecutor; >> +import org.xwiki.test.integration.XWikiExecutorSuite; >> >> /** >> * Runs all functional tests found in the classpath and start/stop XWiki before/after the tests (only once). >> * >> * @version $Id$ >> */ >> -(a)RunWith(ClasspathSuite.class) >> +(a)RunWith(XWikiExecutorSuite.class) >> public class AllTests >> { >> - /** This starts and stops the wiki engine. */ >> - private static final XWikiExecutor executor = new XWikiExecutor(0); >> - >> - @BeforeClass >> - public static void init() throws Exception >> - { >> - executor.start(); >> - } >> - >> - @AfterClass >> - public static void shutdown() throws Exception >> - { >> - executor.stop(); >> - } >> } >> >> Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java >> =================================================================== >> --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -56,7 +56,7 @@ >> import org.xwiki.rest.resources.pages.PageResource; >> import org.xwiki.rest.resources.wikis.WikisResource; >> import org.xwiki.test.AbstractComponentTestCase; >> -import org.xwiki.test.XWikiExecutor; >> +import org.xwiki.test.integration.XWikiExecutor; >> >> public abstract class AbstractHttpTest extends AbstractComponentTestCase >> { >> >> Modified: enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java >> =================================================================== >> --- enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -25,8 +25,7 @@ >> import junit.framework.TestCase; >> import junit.framework.TestSuite; >> >> -import org.xwiki.test.XWikiTestSetup; >> - >> +import org.xwiki.test.integration.XWikiTestSetup; >> import org.xwiki.test.selenium.framework.AbstractXWikiTestCase; >> import org.xwiki.test.selenium.framework.XWikiSeleniumTestSetup; >> >> >> Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java >> =================================================================== >> --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -21,7 +21,7 @@ >> >> import org.openqa.selenium.WebDriver; >> import org.openqa.selenium.firefox.FirefoxDriver; >> -import org.xwiki.test.XWikiExecutor; >> +import org.xwiki.test.integration.XWikiExecutor; >> >> /** >> * This is a container for holding all of the information which should persist throughout all of the tests. >> >> Modified: enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java >> =================================================================== >> --- enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -19,15 +19,12 @@ >> */ >> package org.xwiki.test.webdav; >> >> +import org.xwiki.test.integration.XWikiTestSetup; >> + >> import junit.framework.Test; >> import junit.framework.TestCase; >> import junit.framework.TestSuite; >> >> -import org.xwiki.test.webdav.DefaultWebDAVTest; >> -import org.xwiki.test.XWikiTestSetup; >> -import org.xwiki.test.webdav.RootViewTest; >> -import org.xwiki.test.webdav.TempFileTest; >> - >> /** >> * A class listing all the Functional tests to execute. We need such a class (rather than >> * letting the JUnit Runner discover the different TestCases classes by itself) because we want to >> >> Modified: enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java >> =================================================================== >> --- enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -23,7 +23,7 @@ >> import junit.framework.TestCase; >> import junit.framework.TestSuite; >> >> -import org.xwiki.test.XWikiTestSetup; >> +import org.xwiki.test.integration.XWikiTestSetup; >> import org.xwiki.validator.RSSValidator; >> import org.xwiki.validator.XHTMLValidator; >> import org.xwiki.validator.XWikiValidator; >> >> Modified: enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java >> =================================================================== >> --- enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -22,7 +22,7 @@ >> import junit.framework.Test; >> import junit.framework.TestCase; >> >> -import org.xwiki.test.XWikiTestSetup; >> +import org.xwiki.test.integration.XWikiTestSetup; >> import org.xwiki.test.selenium.framework.AbstractXWikiTestCase; >> import org.xwiki.test.selenium.framework.ColibriSkinExecutor; >> import org.xwiki.test.selenium.framework.XWikiSeleniumTestSetup; >> >> Modified: enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java >> =================================================================== >> --- enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) >> +++ enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) >> @@ -22,7 +22,8 @@ >> import junit.framework.Test; >> import junit.framework.TestCase; >> import junit.framework.TestSuite; >> -import org.xwiki.test.XWikiTestSetup; >> + >> +import org.xwiki.test.integration.XWikiTestSetup; >> import org.xwiki.test.xmlrpc.*; >> import org.xwiki.test.xmlrpc.AttachmentsTest; >> import org.xwiki.test.xmlrpc.PagesTest; >> >> _______________________________________________ >> notifications mailing list >> notifications(a)xwiki.org >> http://lists.xwiki.org/mailman/listinfo/notifications >> > > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Thomas Mortagne

2 1

21 Mar '11

On 03/21/2011 05:20 AM, vmassol (SVN) wrote: > Author: vmassol > Date: 2011-03-21 10:20:45 +0100 (Mon, 21 Mar 2011) > New Revision: 35749 > > Modified: > enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java > enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java > enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java > enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java > enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java > enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java > enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java > enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java > enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java > enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java > Log: > XCOMMONS-2: Add JUnit4 Suite for starting/stopping XE + Running all JUnit tests in the current classloader > > Modified: enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java > =================================================================== > --- enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/DocumentCacheTest.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -24,6 +24,7 @@ > import org.apache.commons.httpclient.HttpStatus; > import org.apache.commons.httpclient.methods.GetMethod; > import org.apache.commons.httpclient.methods.PutMethod; > +import org.junit.*; I thought we didn't do that in tests, it will certainly make my life a lot easier. Caleb > import org.xwiki.rest.model.jaxb.Attachment; > import org.xwiki.rest.model.jaxb.Attachments; > import org.xwiki.rest.resources.attachments.AttachmentResource; > @@ -38,28 +39,30 @@ > */ > public class DocumentCacheTest extends AbstractClusterHttpTest > { > + @Test > public void testDocumentCacheSync() throws Exception > { > // 1) edit a page on XWiki 0 > > switchXWiki(0); > setPageContent(getWiki(), "Test", "CacheSync", "content"); > - assertEquals("content", getPageContent(getWiki(), "Test", "CacheSync")); > + Assert.assertEquals("content", getPageContent(getWiki(), "Test", "CacheSync")); > > // 2) modify content of the page on XWiki 1 > > switchXWiki(1); > setPageContent(getWiki(), "Test", "CacheSync", "modified content"); > - assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); > + Assert.assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); > > // TODO: give some time to JGroups to send the message > > // ASSERT) the content in XWiki 0 should be the one set than in XWiki 1 > > switchXWiki(0); > - assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); > + Assert.assertEquals("modified content", getPageContent(getWiki(), "Test", "CacheSync")); > } > > + @Test > public void testDocumentCacheSyncForAttachments() throws Exception > { > // 1) edit a page on XWiki 0 > @@ -73,7 +76,7 @@ > String attachmentUri = > getUriBuilder(AttachmentResource.class).build(getWiki(), "Test", "AttachementCacheSync", "file.ext").toString(); > PutMethod putMethod = executePut(attachmentUri, "content", MediaType.TEXT_PLAIN, "Admin", "admin"); > - assertEquals(getHttpMethodInfo(putMethod), HttpStatus.SC_CREATED, putMethod.getStatusCode()); > + Assert.assertEquals(getHttpMethodInfo(putMethod), HttpStatus.SC_CREATED, putMethod.getStatusCode()); > > // TODO: give some time to JGroups to send the message > > @@ -84,7 +87,7 @@ > getUriBuilder(AttachmentsResource.class).build(getWiki(), "Test", "AttachementCacheSync").toString(); > > GetMethod getMethod = executeGet(attachmentsUri); > - assertEquals(getHttpMethodInfo(getMethod), HttpStatus.SC_OK, getMethod.getStatusCode()); > + Assert.assertEquals(getHttpMethodInfo(getMethod), HttpStatus.SC_OK, getMethod.getStatusCode()); > > boolean found = false; > > @@ -96,6 +99,6 @@ > } > } > > - assertTrue("Failed to find attachment", found); > + Assert.assertTrue("Failed to find attachment", found); > } > } > > Modified: enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java > =================================================================== > --- enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/AbstractClusterHttpTest.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -19,16 +19,19 @@ > */ > package org.xwiki.test.cluster.framework; > > +import org.junit.*; > +import org.xwiki.test.integration.XWikiExecutor; > import org.xwiki.test.rest.framework.AbstractHttpTest; > -import org.xwiki.test.XWikiExecutor; > > /** > * Base class for REST based clustering integration test. > * > * @version $Id$ > */ > +// TODO: Fix this, it's wrong to reuse AbstractHttpTest from the REST Tests module > public abstract class AbstractClusterHttpTest extends AbstractHttpTest > { > + @Test > public void testRepresentation() throws Exception > { > } > > Modified: enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java > =================================================================== > --- enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/cluster-tests/src/test/it/org/xwiki/test/cluster/framework/XWikiClusterTestSetup.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -23,11 +23,11 @@ > import java.io.InputStream; > import java.util.Properties; > > +import org.xwiki.test.integration.XWikiExecutor; > +import org.xwiki.test.integration.XWikiTestSetup; > + > import junit.framework.Test; > > -import org.xwiki.test.XWikiExecutor; > -import org.xwiki.test.XWikiTestSetup; > - > /** > * Set clustering configuration and start two instances of XWiki. > * <p> > @@ -47,7 +47,7 @@ > /** > * {@inheritDoc} > * > - * @see org.xwiki.test.XWikiTestSetup#setUp() > + * @see XWikiTestSetup#setUp() > */ > @Override > protected void setUp() throws Exception > > Modified: enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java > =================================================================== > --- enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/escaping-tests/src/test/it/org/xwiki/test/escaping/framework/SingleXWikiExecutor.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -19,9 +19,8 @@ > */ > package org.xwiki.test.escaping.framework; > > -import org.xwiki.test.XWikiExecutor; > +import org.xwiki.test.integration.XWikiExecutor; > > - > /** > * Starts and stops exactly one XWiki instance. The methods {@link #start()} and {@link #stop()} > * allow to call them multiple times, starting and stopping the server only on the first and > > Modified: enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java > =================================================================== > --- enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/ldap-tests/src/test/it/org/xwiki/test/ldap/framework/XWikiLDAPTestSetup.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -21,10 +21,10 @@ > > import java.util.Properties; > > +import org.xwiki.test.integration.XWikiTestSetup; > + > import junit.framework.Test; > > -import org.xwiki.test.XWikiTestSetup; > - > /** > * JUnit TestSetup extension that modify xwiki.cfg file to use LDAP as authentication system. This class is meant to > * wrap a JUnit TestSuite. For example: > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -19,32 +19,15 @@ > */ > package org.xwiki.test.rest; > > -import org.junit.AfterClass; > -import org.junit.BeforeClass; > -import org.junit.extensions.cpsuite.ClasspathSuite; > import org.junit.runner.RunWith; > -import org.xwiki.test.XWikiExecutor; > +import org.xwiki.test.integration.XWikiExecutorSuite; > > /** > * Runs all functional tests found in the classpath and start/stop XWiki before/after the tests (only once). > * > * @version $Id$ > */ > -(a)RunWith(ClasspathSuite.class) > +(a)RunWith(XWikiExecutorSuite.class) > public class AllTests > { > - /** This starts and stops the wiki engine. */ > - private static final XWikiExecutor executor = new XWikiExecutor(0); > - > - @BeforeClass > - public static void init() throws Exception > - { > - executor.start(); > - } > - > - @AfterClass > - public static void shutdown() throws Exception > - { > - executor.stop(); > - } > } > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/xwiki/test/rest/framework/AbstractHttpTest.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -56,7 +56,7 @@ > import org.xwiki.rest.resources.pages.PageResource; > import org.xwiki.rest.resources.wikis.WikisResource; > import org.xwiki.test.AbstractComponentTestCase; > -import org.xwiki.test.XWikiExecutor; > +import org.xwiki.test.integration.XWikiExecutor; > > public abstract class AbstractHttpTest extends AbstractComponentTestCase > { > > Modified: enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java > =================================================================== > --- enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/selenium-tests/src/test/it/org/xwiki/test/selenium/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -25,8 +25,7 @@ > import junit.framework.TestCase; > import junit.framework.TestSuite; > > -import org.xwiki.test.XWikiTestSetup; > - > +import org.xwiki.test.integration.XWikiTestSetup; > import org.xwiki.test.selenium.framework.AbstractXWikiTestCase; > import org.xwiki.test.selenium.framework.XWikiSeleniumTestSetup; > > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/test/ui/framework/PersistentTestContext.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -21,7 +21,7 @@ > > import org.openqa.selenium.WebDriver; > import org.openqa.selenium.firefox.FirefoxDriver; > -import org.xwiki.test.XWikiExecutor; > +import org.xwiki.test.integration.XWikiExecutor; > > /** > * This is a container for holding all of the information which should persist throughout all of the tests. > > Modified: enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java > =================================================================== > --- enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/webdav-tests/src/test/it/org/xwiki/test/webdav/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -19,15 +19,12 @@ > */ > package org.xwiki.test.webdav; > > +import org.xwiki.test.integration.XWikiTestSetup; > + > import junit.framework.Test; > import junit.framework.TestCase; > import junit.framework.TestSuite; > > -import org.xwiki.test.webdav.DefaultWebDAVTest; > -import org.xwiki.test.XWikiTestSetup; > -import org.xwiki.test.webdav.RootViewTest; > -import org.xwiki.test.webdav.TempFileTest; > - > /** > * A class listing all the Functional tests to execute. We need such a class (rather than > * letting the JUnit Runner discover the different TestCases classes by itself) because we want to > > Modified: enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java > =================================================================== > --- enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/webstandards-tests/src/test/it/org/xwiki/test/webstandards/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -23,7 +23,7 @@ > import junit.framework.TestCase; > import junit.framework.TestSuite; > > -import org.xwiki.test.XWikiTestSetup; > +import org.xwiki.test.integration.XWikiTestSetup; > import org.xwiki.validator.RSSValidator; > import org.xwiki.validator.XHTMLValidator; > import org.xwiki.validator.XWikiValidator; > > Modified: enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java > =================================================================== > --- enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/wysiwyg-tests/src/test/it/org/xwiki/test/wysiwyg/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -22,7 +22,7 @@ > import junit.framework.Test; > import junit.framework.TestCase; > > -import org.xwiki.test.XWikiTestSetup; > +import org.xwiki.test.integration.XWikiTestSetup; > import org.xwiki.test.selenium.framework.AbstractXWikiTestCase; > import org.xwiki.test.selenium.framework.ColibriSkinExecutor; > import org.xwiki.test.selenium.framework.XWikiSeleniumTestSetup; > > Modified: enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java > =================================================================== > --- enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java 2011-03-21 09:19:16 UTC (rev 35748) > +++ enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/test/xmlrpc/confluence/AllTests.java 2011-03-21 09:20:45 UTC (rev 35749) > @@ -22,7 +22,8 @@ > import junit.framework.Test; > import junit.framework.TestCase; > import junit.framework.TestSuite; > -import org.xwiki.test.XWikiTestSetup; > + > +import org.xwiki.test.integration.XWikiTestSetup; > import org.xwiki.test.xmlrpc.*; > import org.xwiki.test.xmlrpc.AttachmentsTest; > import org.xwiki.test.xmlrpc.PagesTest; > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

2 1

Re: [xwiki-devs] [xwiki-notifications] r35760 - platform/core/trunk/xwiki-core
by Sergiu Dumitriu 21 Mar '11

21 Mar '11

On 03/21/2011 01:12 PM, cjdelisle (SVN) wrote: > Author: cjdelisle > Date: 2011-03-21 13:12:13 +0100 (Mon, 21 Mar 2011) > New Revision: 35760 > > Modified: > platform/core/trunk/xwiki-core/pom.xml > Log: > XWIKI-4953: Memory leak in xwiki-core unit tests > Fixed upsrtream in http://jira.codehaus.org/browse/SUREFIRE-495 > Now works with maven2 and 3 with argline -Xmx128m > Yay, faster builds! -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

[xwiki-devs] [Discussion][Update] Wiki Importer
by vipunreddy.n＠gmail.com 21 Mar '11

21 Mar '11

Hi Devs, I would like to improve Wiki Importer sandbox project, by making few changes to the design to widen it scope of usage, and make sure its useful to the community. In the existing one ( http://svn.xwiki.org/svnroot/xwiki/contrib/sandbox/xwiki-wikiimporter/) I have implemented import from MediaWiki XML. Limitations: * listener implementation is tightly coupled with storage ( Importing/Saving pages or other objects into XWiki). * listener doesnt include all the xwiki related events. * No separate storage component, that can enable both imports and exports ( e.g. export the parsed content into XAR ). Existing documentation on WikiImporter : http://gsoc.myxwiki.org/xwiki/bin/view/Import+Export+other+wikis/WebHome http://gsoc.myxwiki.org/xwiki/bin/view/Import+Export+other+wikis/Wiki+Impor… Can i move the design documentation to Design Proposal wiki.? As Thomas suggested, it will be good to rename wiki importer to converter as it is not limited to importing only, So am planning to change it to WikiConverter. WDYT? Arun Reddy Arun Reddy

4 7