xwiki-devs January 2009

xwiki-devs@xwiki.org

34 participants
124 discussions

Re: [xwiki-devs] [xwiki-notifications] r15982 - in platform/core/trunk/xwiki-rendering: xwiki-rendering-api/src/main/java/org/xwiki/rendering/block xwiki-rendering-macros/xwiki-rendering-macro-toc xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/internal/macro/toc xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/java/org/xwiki/rendering

by Vincent Massol

I think you commented out too many tests in this commit... :) -Vincent On Jan 31, 2009, at 7:22 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-01-31 19:22:16 +0100 (Sat, 31 Jan 2009) > New Revision: 15982 > > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/block/AbstractBlock.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/block/Block.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/pom.xml > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/src/main/java/org/xwiki/rendering/internal/macro/ > toc/TocMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/src/test/java/org/xwiki/rendering/ > RenderingTests.java > Log: > XWIKI-3174: Rename current SectionBlock to HeaderBlock and make > SectionBlock represent the whole section content > * improve toc macro execution based on new section block > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/ > src/main/java/org/xwiki/rendering/block/AbstractBlock.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/block/AbstractBlock.java 2009-01-31 > 18:02:32 UTC (rev 15981) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/block/AbstractBlock.java 2009-01-31 > 18:22:16 UTC (rev 15982) > @@ -20,18 +20,18 @@ > package org.xwiki.rendering.block; > > import java.util.ArrayList; > +import java.util.Collections; > import java.util.LinkedHashMap; > import java.util.List; > import java.util.Map; > -import java.util.Collections; > > import org.apache.commons.beanutils.ConvertUtils; > import org.apache.commons.lang.builder.EqualsBuilder; > import org.apache.commons.lang.builder.HashCodeBuilder; > > /** > - * Implementation for Block operations. All blocks should extend > this class. Supports the notion of parameters > - * which can be added to a block (see {@link #setParameter(String, > Object)} for more details). > + * Implementation for Block operations. All blocks should extend > this class. Supports the notion of parameters which can > + * be added to a block (see {@link #setParameter(String, Object)} > for more details). > * > * @version $Id$ > * @since 1.5M2 > @@ -70,7 +70,7 @@ > { > this.parameters.putAll(parameters); > } > - > + > /** > * {@inheritDoc} > * > @@ -194,15 +194,15 @@ > } > > /** > - * Set a parameter on the current block. A parameter is any > semantic data associated with a block. > - * It can be used for various purposes and provide additional > information to the renderers/listeners. > - * For example you can pass style information such as > <code>style="color:red"</code> (in that example > - * the name would be <code>style</code> and the value > <code>"color:red"</code>) to indicate that the > - * current block should be displayed in red. > + * Set a parameter on the current block. A parameter is any > semantic data associated with a block. It can be used > + * for various purposes and provide additional information to > the renderers/listeners. For example you can pass > + * style information such as <code>style="color:red"</code> (in > that example the name would be <code>style</code> > + * and the value <code>"color:red"</code>) to indicate that the > current block should be displayed in red. > + * > + * Note that there are currently no well-defined known > parameter names and you'll need to check what the different > + * renderers/listeners support to know what to use. > + * > * > - * Note that there are currently no well-defined known > parameter names and you'll need to check what > - * the different renderers/listeners support to know what to > use. > - * > * @param name the parameter's name > * @param value the parameter's value > */ > @@ -285,7 +285,7 @@ > > for (int i = index - 1; i >= 0; --i) { > Block previousBlock = blocks.get(i); > - if (previousBlock instanceof HeaderBlock) { > + if > (blockClass.isAssignableFrom(previousBlock.getClass())) { > return (T) previousBlock; > } > } > @@ -317,6 +317,7 @@ > > /** > * {@inheritDoc} > + * > * @see Object#clone() > */ > @Override > @@ -330,7 +331,7 @@ > throw new RuntimeException("Failed to clone object", e); > } > block.parameters = new LinkedHashMap<String, > String>(getParameters()); > - // Clone all children blocks. Note that we cannot use an > iterator since we're going to change the objects > + // Clone all children blocks. Note that we cannot use an > iterator since we're going to change the objects > // themselves. Using an iterator would lead to a > ConcurrentModificationException > Object[] objectArray = getChildren().toArray(); > block.childrenBlocks = new ArrayList<Block>(); > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/ > src/main/java/org/xwiki/rendering/block/Block.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/block/Block.java 2009-01-31 18:02:32 UTC > (rev 15981) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/block/Block.java 2009-01-31 18:22:16 UTC > (rev 15982) > @@ -84,7 +84,7 @@ > * @param newBlocks the new blocks to replace the current block > with > */ > void replace(List<Block> newBlocks); > - > + > /** > * Get the parent block. All blocks have a parent and the top > level parent is the {@link XDOM} object. > * > @@ -126,7 +126,7 @@ > <T extends Block> List<T> getChildrenByType(Class<T> blockClass, > boolean recurse); > > /** > - * Look forward to find a block which inherit or s provided type. > + * Look forward to find a block which inherit or is provided > type. > * > * @param <T> the class of the Blocks to return > * @param blockClass the block class to look for > @@ -135,9 +135,10 @@ > * @since 1.6M1 > */ > <T extends Block> T getPreviousBlockByType(Class<T> blockClass, > boolean recurse); > - > + > /** > * {@inheritDoc} > + * > * @see Object#clone() > */ > Block clone(); > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-toc/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/pom.xml 2009-01-31 18:02:32 UTC (rev 15981) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/pom.xml 2009-01-31 18:22:16 UTC (rev 15982) > @@ -43,11 +43,11 @@ > </includes> > </configuration> > </plugin> > -  > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-checkstyle-plugin</artifactId> > - </plugin> --> > + </plugin> > </plugins> > </build> > </project> > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/internal/ > macro/toc/TocMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/src/main/java/org/xwiki/rendering/internal/macro/ > toc/TocMacro.java 2009-01-31 18:02:32 UTC (rev 15981) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/src/main/java/org/xwiki/rendering/internal/macro/ > toc/TocMacro.java 2009-01-31 18:22:16 UTC (rev 15982) > @@ -31,6 +31,7 @@ > import org.xwiki.rendering.block.ListItemBlock; > import org.xwiki.rendering.block.NumberedListBlock; > import org.xwiki.rendering.block.HeaderBlock; > +import org.xwiki.rendering.block.SectionBlock; > import org.xwiki.rendering.internal.util.EnumConverter; > import org.xwiki.rendering.listener.Link; > import org.xwiki.rendering.macro.AbstractMacro; > @@ -108,26 +109,30 @@ > // Get the root block from scope parameter > > Block root; > - HeaderBlock rootSectionBlock = null; > > - if (parameters.getScope() == Scope.LOCAL && > context.getCurrentMacroBlock() != null) { > + if (parameters.getScope() == Scope.LOCAL) { > root = context.getCurrentMacroBlock().getParent(); > - rootSectionBlock = > context > .getCurrentMacroBlock().getPreviousBlockByType(HeaderBlock.class, > true); > } else { > root = context.getXDOM(); > } > > // Get the list of sections in the scope > > - List<HeaderBlock> sections = > root.getChildrenByType(HeaderBlock.class, true); > + List<HeaderBlock> headers = > root.getChildrenByType(HeaderBlock.class, true); > > - if (!sections.isEmpty()) { > - // Construct table of content from sections list > - Block rootBlock = > - generateTree(sections, parameters.getStart(), > parameters.getDepth(), parameters.isNumbered(), > - rootSectionBlock); > + if (!headers.isEmpty()) { > + // If the root block is a section, remove it's header > block for the list of header blocks > + if (root instanceof SectionBlock) { > + Block block = root.getChildren().get(0); > > - return Arrays.asList(rootBlock); > + if (block instanceof HeaderBlock) { > + headers.remove(block); > + } > + } > + > + // Construct table of content from sections list > + return Arrays.asList(generateTree(headers, > parameters.getStart(), parameters.getDepth(), parameters > + .isNumbered())); > } > > return Collections.emptyList(); > @@ -142,47 +147,31 @@ > } > > /** > - * Convert sections into list block tree. > + * Convert headers into list block tree. > * > - * @param sections the sections to convert. > + * @param headers the headers to convert. > * @param start the "start" parameter value. > * @param depth the "depth" parameter value. > * @param numbered the "numbered" parameter value. > - * @param rootSectionBlock the section where the toc macro > search for children sections. > * @return the root block of generated block tree. > */ > - private Block generateTree(List<HeaderBlock> sections, int > start, int depth, boolean numbered, > - HeaderBlock rootSectionBlock) > + private Block generateTree(List<HeaderBlock> headers, int > start, int depth, boolean numbered) > { > - int rootSectionLevel = rootSectionBlock != null ? > rootSectionBlock.getLevel().getAsInt() : 0; > - boolean rootSectionFound = false; > - > int currentLevel = 0; > Block currentBlock = null; > - for (HeaderBlock sectionBlock : sections) { > - int sectionLevel = sectionBlock.getLevel().getAsInt(); > + for (HeaderBlock headerBlock : headers) { > + int headerLevel = headerBlock.getLevel().getAsInt(); > > - if (rootSectionBlock != null) { > - if (rootSectionBlock == sectionBlock) { > - rootSectionFound = true; > - continue; > - } else if (rootSectionBlock.getParent() == > sectionBlock.getParent() && sectionLevel <= rootSectionLevel) { > - break; > - } > - } else { > - rootSectionFound = true; > - } > + if (headerLevel >= start && headerLevel <= depth) { > + ListItemBlock itemBlock = > createTocEntry(headerBlock); > > - if (rootSectionFound && sectionLevel >= start && > sectionLevel <= depth) { > - ListItemBlock itemBlock = > createTocEntry(sectionBlock); > + // Move to next header in toc tree > > - // Move to next section in toc tree > - > - while (currentLevel < sectionLevel) { > + while (currentLevel < headerLevel) { > currentBlock = createChildListBlock(numbered, > currentBlock); > ++currentLevel; > } > - while (currentLevel > sectionLevel) { > + while (currentLevel > headerLevel) { > currentBlock = currentBlock.getParent(); > --currentLevel; > } > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-toc/src/test/java/org/xwiki/rendering/ > RenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/src/test/java/org/xwiki/rendering/ > RenderingTests.java 2009-01-31 18:02:32 UTC (rev 15981) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-toc/src/test/java/org/xwiki/rendering/ > RenderingTests.java 2009-01-31 18:22:16 UTC (rev 15982) > @@ -37,12 +37,14 @@ > { > RenderingTestSuite suite = new RenderingTestSuite("Test Toc > Macro"); > > - suite.addTestsFromResource("macrotoc1", true); > + /*suite.addTestsFromResource("macrotoc1", true); > suite.addTestsFromResource("macrotoc2", true); > suite.addTestsFromResource("macrotoc3", true); > suite.addTestsFromResource("macrotoc4", true); > - suite.addTestsFromResource("macrotoc5", true); > + suite.addTestsFromResource("macrotoc5", true);*/ > > + suite.addTestsFromResource("macrotoc4", true); > + > return new RenderingPlexusTestSetup(suite); > } > }

15 years, 10 months

[xwiki-devs] some silly 1.8M1 bugs I've found

by Niels Mayer

http://jira.xwiki.org/jira/browse/XE-374 -- Actions->Copy of document doesn't work, but claims success http://jira.xwiki.org/jira/browse/XE-375 -- "Add Object" Panel in "Objects Editor" should validate selection prior to "Add Object from this Class" http://jira.xwiki.org/jira/browse/XE-376 -- characters entered as document title must be escaped or a cascade of bugs occur Niels http://nielsmayer.com

15 years, 10 months

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

by Vincent Massol

On Jan 30, 2009, at 12:37 PM, fmancinelli (SVN) wrote: > Author: fmancinelli > Date: 2009-01-30 12:37:35 +0100 (Fri, 30 Jan 2009) > New Revision: 15898 > > Modified: > enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/ > xwiki/xmlrpc/PagesTest.java > Log: > [Minor] Fixed a stability bug of the page history test. > > The problem was due to the fact that if pages are stored too fast, > they will have the same timestamp in the modification list (the > granularity is 1 sec.) and they will be returned in an arbitrary > order (depending on the server side query result). > > This means that the modified page in the test, even if it's present > in the modification list, could not be returned as the first item of > that list, causing the assertion to fail. > > The solution was to wait 2 seconds before storing the page. This > will guarantee that the timestamp will surely be different from any > previous modification (and that the page will be on the top of the > list if things work well) > > Modified: enterprise/trunk/distribution-test/xmlrpc-tests/src/test/ > it/org/xwiki/xmlrpc/PagesTest.java > =================================================================== > --- enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/ > xwiki/xmlrpc/PagesTest.java 2009-01-30 10:27:52 UTC (rev 15897) > +++ enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/ > xwiki/xmlrpc/PagesTest.java 2009-01-30 11:37:35 UTC (rev 15898) > @@ -663,13 +663,33 @@ > > TestUtils.banner("TEST: > getAllModifiedPageHistoryCorrectness()"); > > + /* > + * Wait 2 seconds before making the modification. This is > necessary because if pages are stored in the same > + * second, they will have the same timestamp and they could > be returned in an arbitrary order making the > + * following assert fail randomly > + */ > + try { > + Thread.sleep(2000); > + } catch (InterruptedException e) { > + > + } ouch this is bad... We need to find a better way IMO, like changing the date and adding 1 second after it's stored or something but not using timers. -Vincent > > + > XWikiPage page = this.rpc.getPage(pages.get(0).getId()); > > + System.out.format("Modifying: %s\n", page); > + > page.setContent(String.format("Modified %d", > System.currentTimeMillis())); > page = rpc.storePage(page); > > - List<XWikiPageHistorySummary> modifications = > rpc.getModifiedPagesHistory(1, 0); > + System.out.format("Modified: %s\n", page); > > + List<XWikiPageHistorySummary> modifications = > rpc.getModifiedPagesHistory(3, 0); > + > + System.out.format("Modifications:\n"); > + for (XWikiPageHistorySummary modification : modifications) { > + System.out.format("%s\n", modification); > + } > + > assertEquals(page.getId(), > modifications.get(0).getBasePageId()); > assertEquals(page.getModified(), > modifications.get(0).getModified()); > }

15 years, 10 months

[xwiki-devs] [Proposal] XWiki javascript APIs deprecation/compatibility strategy

by Jerome Velociter

Hello devs, We need a deprecation/compatibility strategy for our javascript APIs, as we do have one for Java (see http://lists.xwiki.org/pipermail/devs/2008-February/005067.html and http://dev.xwiki.org/xwiki/bin/view/Community/DevelopmentPractices#HBackwar…). I propose we embrace the same idea: keep backward compatibility separate from actual code, creating a file "compatibility.js". Since it's a compatibility layer, our releases should work properly without including this file. We should discuss if we want include it by default or not. As we are doing with the velocity uberspector, I propose we also log a warning for every call to a deprecated JS API to help our users update their code. For this I propose we have a depreciate method in compatibility.js with the following signature : function depreciate(scope, method, since, useInstead); That method would weave the warning log before the actual call to the method. A typicall deprecation would then look like this, in compatibility.js : window.checkAdvancedContent = XWiki.isAdvancedContent // keep compatbility depreciate(window, checkAdvancedContent, "1.8M2", "XWiki.isAdvancedContent"); // but log every call to checkAdvancedContent As for Java APIs, I propose we keep compatibility at least 2 full releases after the current version is released as final before we allow ourselves to remove deprecated methods. As for what should go through this deprecation cycle, I would say everything that is now in xwiki.js. There are methods we publicly advertise, for example updateName (http://www.theserverside.com/tt/articles/article.tss?l=XWiki). For our other files (usersandgroups.js, ajaxSuggest.js, fullscreenEdit.js, etc.) I think we can refactor them without going through a deprecation cycle. In any case, for the future we should be more careful and expose as APIs only what we plan to support. My +1 for this strategy WDYT ? Jerome

15 years, 10 months

[xwiki-devs] [VOTE] Deprecation strategy

by Vincent Massol

We need a deprecation strategy, i.e. decide for how long we keep @deprecated methods/classes. I propose to keep them for 2 full releases after the current version is released as final. For example if a method is deprecated in, say Core 1.3M2 then the method will be removed in 1.6M1. Of course any major new release can deprecate anything so a XWiki 2.0 is expected to break backward compatibility. So for methods deprecated in 1.0 we can remove them in 1.3M1, M2, etc. WDYT? If ok then I'll add this to our dev practice guide too. Note that for this to be easy anyone deprecating methods should add the information of when it was deprecated. For example: /** * @param time the time in milliseconds * @return the time delta in milliseconds between the current date and the time passed * as parameter * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTimeDelta(long)} since 1.3M2 */ public int XWiki.getTimeDelta(long time) { return this.util.getTimeDelta(time); } Here's my +1 Thanks -Vincent

15 years, 10 months

Re: [xwiki-devs] [Issue] Issue Comment Edited: (XWIKI-2882) Implement RSS macro for new rendering

by Dan Miron

Thomas Mortagne (JIRA) wrote: > [ http://jira.xwiki.org/jira/browse/XWIKI-2882?page=com.atlassian.jira.plugin… ] > > Thomas Mortagne edited comment on XWIKI-2882 at 1/28/09 3:40 PM: > ----------------------------------------------------------------- > > * this macro should not depends on radeox, expecially if it's just to use org.radeox.util.Encoder. You should directly generate the List<Block> and not generate a html string and call html macro to do it in RssMacro.renderSearch. > > * in RssMacro.renderEntries() you should use ParserUtils.parseInlineNonWiki to parse the description, WordBlock is supposed to contains only one work and not an entire paragraph. > > * never use wiki syntax in macros > -- macro is supposed to not be syntax dependent > -- a macro is supposed to work on XDOM level > -- create directly the right block is way faster > If the problem is that you can't pass List<Block> for the title to BoxMacroParameters, do it another way: > -- you could define a protected List<Box> getTitle() methods in AbstractBoxMacro like you have getClassProperty() and extend it with a RSSEntryMacro class > -- you could also add a set/getBlockTitle in BoxMacroParameters based on List<Block> which can be used from java (we could even imagine to be able to use it from wiki syntax with the tight BeanUtil converter) > -- ... Regarding the last issue, about whether to use or not wiki syntax for rendering the title I must say I'm a bit puzzled. I thought that the point of allowing wiki syntax to be specified in the title for the boxMacro was right this, to properly render the titles of the rss entries in the RssMacro. ................................ [15:42:26] Vincent Massol: now re the links I'm not sure yet [15:42:37] … there are different ways of doing that I guess [15:43:29] … one idea (brainstorming): we could allow inline wiki syntax to be used the title parameter maybe [15:44:14] Dan Miron: yes, it could be a way [15:44:17] Thomas Mortagne: I like that yes [15:46:45] Vincent Massol: hmm I wonder if this is something we'd want for all macros [15:47:09] … not sure [15:47:17] Thomas Mortagne: at wors we can add a isTitleWiki [15:47:19] Vincent Massol: even for this use case I'm stil not fully sure [15:47:51] … it sounds good but I wonder if we'd get side effects [15:48:09] … actually we wan't do that in a generic way for all macros [15:48:20] … since it's not going to generate text [15:48:25] … but Blocks [15:48:32] … so the macro needs to handle that [15:48:50] … s/Wan't/can't/ [15:49:33] … ok I think I'm +1 for making the image and title params allow inline wiki syntax here for this macro [15:49:45] … (it's a good experiment, we'll see how it goes) [15:49:49] … wdyt? [15:49:53] Thomas Mortagne: +1 [15:50:03] Jean-Vincent Drean: +1 .................................. Anyway, if we need to quit using wiki syntax in the title, i'd prefer the second choice, "add a set/getBlockTitle in BoxMacroParameters based on List<Block> which can be used from java". Should I go on with this? Tnx, Dan

15 years, 10 months

[xwiki-devs] ExtendedTodoApplication

by M Rawash

I've made quite a few improvements to the original TodoApplication, and was told to send it here for review. First, here's a list of introduced features: * extended Todo class * revamped class sheet/template * revamped webhome (many improvements) * ability to add todo's right from side-panel * ability to show completeness percentage * more.. The naming was suggested by 'jvelociter' (on irc) due to the fact that the TodoApplication is used for a tutorial and must be kept simple.. suggestions are welcome, I've tinkered with the todo panel to make it more compatible with toucan and albatross based skins just before i sent this to you, so tell me if you have any takes (i.e. if it looks ugly)..

15 years, 10 months

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

by Vincent Massol

Hi Fabio, Just one small process detail: the XWIKI-3102 issue has already been released so these 2 commits will appear in that release fisheye tab thus making readers think these changes are in XE 1.8M1. In general our practice is to not reuse issues that have been closed. So in this case you could either create a new jira issue or just commit without a jira issue if the changes are not user-visible and thus users don't need to see a jira issue in the release notes. -Vincent PS: Rules are here: http://dev.xwiki.org/xwiki/bin/view/Community/DevelopmentPractices#HIterati… On Jan 28, 2009, at 10:29 PM, fmancinelli (SVN) wrote: > Author: fmancinelli > Date: 2009-01-28 22:29:35 +0100 (Wed, 28 Jan 2009) > New Revision: 15848 > > Modified: > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/AbstractHttpTest.java > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/CommentsResourceTest.java > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/PageResourceTest.java > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/PagesResourceTest.java > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/RootResourceTest.java > enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/SpacesResourceTest.java > Log: > XWIKI-3102: Develop the initial feature set of the REST API > > Replaced assertTrue with assertEquals in order to get information > about expected output in case of failure. > Added comments and page at previous version tests. > Improved link checking tests. > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/ > org/xwiki/rest/it/AbstractHttpTest.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/AbstractHttpTest.java 2009-01-28 21:20:34 UTC (rev > 15847) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/AbstractHttpTest.java 2009-01-28 21:29:35 UTC (rev > 15848) > @@ -153,7 +153,7 @@ > public String getWiki() throws Exception > { > GetMethod getMethod = > executeGet(getFullUri(getUriPatternForResource(WikisResource.class))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Wikis wikis = (Wikis) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -169,7 +169,7 @@ > for (Link link : linkCollection.getLinks()) { > System.out.format("Relation '%s': ", link.getRel()); > GetMethod getMethod = executeGet(link.getHref()); > - assertTrue(getMethod.getStatusCode() == > HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, > getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > } > } > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/ > org/xwiki/rest/it/CommentsResourceTest.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/CommentsResourceTest.java 2009-01-28 21:20:34 UTC (rev > 15847) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/CommentsResourceTest.java 2009-01-28 21:29:35 UTC (rev > 15848) > @@ -29,7 +29,12 @@ > import org.xwiki.rest.Utils; > import org.xwiki.rest.model.Comment; > import org.xwiki.rest.model.Comments; > +import org.xwiki.rest.model.History; > +import org.xwiki.rest.model.HistorySummary; > +import org.xwiki.rest.model.Page; > +import org.xwiki.rest.model.Relations; > import org.xwiki.rest.resources.comments.CommentsResource; > +import org.xwiki.rest.resources.pages.PageHistoryResource; > > public class CommentsResourceTest extends AbstractHttpTest > { > @@ -40,11 +45,13 @@ > public void testRepresentation() throws Exception > { > TestUtils.banner("testRepresentation()"); > - /* Everything is done in testCreateComments() */ > + /* Everything is done in test methods */ > } > > public void testCreateComments() throws Exception > { > + TestUtils.banner("testCreateComments()"); > + > Map<String, String> parametersMap = new HashMap<String, > String>(); > parametersMap.put(Constants.WIKI_NAME_PARAMETER, getWiki()); > parametersMap.put(Constants.SPACE_NAME_PARAMETER, SPACE_NAME); > @@ -54,7 +61,7 @@ > > getFullUri > (Utils > .formatUriTemplate(getUriPatternForResource(CommentsResource.class), > parametersMap)); > > GetMethod getMethod = executeGet(commentsUri); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Comments comments = (Comments) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -68,20 +75,22 @@ > comment.setText("Comment"); > > PostMethod postMethod = executePost(commentsUri, comment, > "Admin", "admin"); > - assertTrue(postMethod.getStatusCode() == > HttpStatus.SC_CREATED); > + assertEquals(HttpStatus.SC_CREATED, > postMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(postMethod); > > getMethod = executeGet(commentsUri); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > comments = (Comments) > xstream.fromXML(getMethod.getResponseBodyAsString()); > > - assertTrue(comments.getCommentList().size() == > numberOfComments + 1); > + assertEquals(numberOfComments + 1, > comments.getCommentList().size()); > } > > public void testGetComment() throws Exception > { > + TestUtils.banner("testGetComment()"); > + > Map<String, String> parametersMap = new HashMap<String, > String>(); > parametersMap.put(Constants.WIKI_NAME_PARAMETER, getWiki()); > parametersMap.put(Constants.SPACE_NAME_PARAMETER, SPACE_NAME); > @@ -91,16 +100,47 @@ > > getFullUri > (Utils > .formatUriTemplate(getUriPatternForResource(CommentsResource.class), > parametersMap)); > > GetMethod getMethod = executeGet(commentsUri); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Comments comments = (Comments) > xstream.fromXML(getMethod.getResponseBodyAsString()); > > if (comments.getCommentList() != null) { > for (Comment comment : comments.getCommentList()) { > - checkLinks(comments); > + checkLinks(comment); > } > } > } > > + public void testCommentsAtPreviousVersions() throws Exception > + { > + TestUtils.banner("testCommentsAtPreviousVersions"); > + > + Map<String, String> parametersMap = new HashMap<String, > String>(); > + parametersMap.put(Constants.WIKI_NAME_PARAMETER, getWiki()); > + parametersMap.put(Constants.SPACE_NAME_PARAMETER, > SPACE_NAME); > + parametersMap.put(Constants.PAGE_NAME_PARAMETER, PAGE_NAME); > + > + String pageHistoryUri = > + > getFullUri > (Utils > .formatUriTemplate > (getUriPatternForResource(PageHistoryResource.class), parametersMap)); > + > + GetMethod getMethod = executeGet(pageHistoryUri); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > + TestUtils.printHttpMethodInfo(getMethod); > + > + History history = (History) > xstream.fromXML(getMethod.getResponseBodyAsString()); > + > + for (HistorySummary historySummary : > history.getHistorySummaryList()) { > + getMethod = > executeGet > (historySummary.getFirstLinkByRelation(Relations.PAGE).getHref()); > + assertEquals(HttpStatus.SC_OK, > getMethod.getStatusCode()); > + TestUtils.printHttpMethodInfo(getMethod); > + > + Page page = (Page) > xstream.fromXML(getMethod.getResponseBodyAsString()); > + getMethod = > executeGet(page.getFirstLinkByRelation(Relations.COMMENTS).getHref()); > + assertEquals(HttpStatus.SC_OK, > getMethod.getStatusCode()); > + TestUtils.printHttpMethodInfo(getMethod); > + } > + > + } > + > } > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/ > org/xwiki/rest/it/PageResourceTest.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/PageResourceTest.java 2009-01-28 21:20:34 UTC (rev > 15847) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/PageResourceTest.java 2009-01-28 21:29:35 UTC (rev > 15848) > @@ -29,6 +29,8 @@ > import org.apache.commons.httpclient.methods.PutMethod; > import org.xwiki.rest.Constants; > import org.xwiki.rest.Utils; > +import org.xwiki.rest.model.History; > +import org.xwiki.rest.model.HistorySummary; > import org.xwiki.rest.model.Link; > import org.xwiki.rest.model.Page; > import org.xwiki.rest.model.PageSummary; > @@ -38,6 +40,7 @@ > import org.xwiki.rest.model.Spaces; > import org.xwiki.rest.model.Wiki; > import org.xwiki.rest.model.Wikis; > +import org.xwiki.rest.resources.pages.PageHistoryResource; > import org.xwiki.rest.resources.pages.PageResource; > import org.xwiki.rest.resources.pages.PageTranslationResource; > import org.xwiki.rest.resources.wikis.WikisResource; > @@ -47,7 +50,7 @@ > private Page getPage() throws Exception > { > GetMethod getMethod = > executeGet(getFullUri(getUriPatternForResource(WikisResource.class))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Wikis wikis = (Wikis) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -58,7 +61,7 @@ > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Spaces spaces = (Spaces) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -70,7 +73,7 @@ > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Pages pages = (Pages) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -81,7 +84,7 @@ > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Page page = (Page) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -115,7 +118,7 @@ > > GetMethod getMethod = > > executeGet > (getFullUri > (Utils > .formatUriTemplate(getUriPatternForResource(PageResource.class), > parametersMap))); > - assertTrue(getMethod.getStatusCode() == > HttpStatus.SC_NOT_FOUND); > + assertEquals(HttpStatus.SC_NOT_FOUND, > getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > } > > @@ -136,7 +139,7 @@ > assertNotNull(link); > > PutMethod putMethod = executePut(link.getHref(), newPage, > "Admin", "admin"); > - assertTrue(putMethod.getStatusCode() == > HttpStatus.SC_ACCEPTED); > + assertEquals(HttpStatus.SC_ACCEPTED, > putMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(putMethod); > > String body = putMethod.getResponseBodyAsString(); > @@ -157,7 +160,7 @@ > assertNotNull(link); > > PutMethod putMethod = executePut(link.getHref(), page); > - assertTrue(putMethod.getStatusCode() == > HttpStatus.SC_FORBIDDEN); > + assertEquals(HttpStatus.SC_FORBIDDEN, > putMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(putMethod); > } > > @@ -185,15 +188,15 @@ > executePut( > > getFullUri > (Utils > .formatUriTemplate(getUriPatternForResource(PageResource.class), > parametersMap)), page, > "Admin", "admin"); > - assertTrue(putMethod.getStatusCode() == > HttpStatus.SC_CREATED); > + assertEquals(HttpStatus.SC_CREATED, > putMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(putMethod); > > String body = putMethod.getResponseBodyAsString(); > Page modifiedPage = (Page) xstream.fromXML(body); > > - assertEquals(modifiedPage.getContent(), CONTENT); > - assertEquals(modifiedPage.getTitle(), TITLE); > - assertEquals(modifiedPage.getParent(), PARENT); > + assertEquals(CONTENT, modifiedPage.getContent()); > + assertEquals(TITLE, modifiedPage.getTitle()); > + assertEquals(PARENT, modifiedPage.getParent()); > } > > public void testPUTWithInvalidRepresentation() throws Exception > @@ -204,7 +207,7 @@ > Link link = page.getFirstLinkByRelation(Relations.SELF); > > PutMethod putMethod = executePut(link.getHref(), > Utils.getResourceAsString(TestConstants.INVALID_PAGE_XML)); > - assertTrue(putMethod.getStatusCode() == > HttpStatus.SC_NOT_ACCEPTABLE); > + assertEquals(HttpStatus.SC_NOT_ACCEPTABLE, > putMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(putMethod); > } > > @@ -226,11 +229,11 @@ > page.setContent(content); > > PutMethod putMethod = executePut(uri, page, "Admin", > "admin"); > - assertTrue(putMethod.getStatusCode() == > HttpStatus.SC_CREATED); > + assertEquals(HttpStatus.SC_CREATED, > putMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(putMethod); > > getMethod = executeGet(uri); > - assertTrue(getMethod.getStatusCode() == > HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, > getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > System.out.format("Page %s.%s created.\n", spaceName, > pageName); > } else { > @@ -258,7 +261,7 @@ > PutMethod putMethod = > > executePut > (getFullUri > (Utils > .formatUriTemplate > (getUriPatternForResource(PageTranslationResource.class), > parametersMap)), page, "Admin", "admin"); > - assertTrue(putMethod.getStatusCode() == > HttpStatus.SC_CREATED); > + assertEquals(HttpStatus.SC_CREATED, > putMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(putMethod); > > parametersMap = new HashMap<String, String>(); > @@ -270,12 +273,12 @@ > GetMethod getMethod = > > executeGet > (getFullUri > (Utils > .formatUriTemplate > (getUriPatternForResource(PageTranslationResource.class), > parametersMap))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Page modifiedPage = (Page) > xstream.fromXML(getMethod.getResponseBodyAsString()); > - assertTrue(languageId.equals(modifiedPage.getLanguage())); > - assertTrue(languageId.equals(modifiedPage.getLanguage())); > + assertEquals(languageId, modifiedPage.getLanguage()); > + assertEquals(languageId, modifiedPage.getLanguage()); > } > > public void testGETTranslations() throws Exception > @@ -289,7 +292,7 @@ > > GetMethod getMethod = > > executeGet > (getFullUri > (Utils > .formatUriTemplate(getUriPatternForResource(PageResource.class), > parametersMap))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Page page = (Page) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -300,12 +303,12 @@ > for (Link translationLink : translationLinks) { > System.out.format("Translation link: %s\n", > translationLink.getHref()); > getMethod = executeGet(translationLink.getHref()); > - assertTrue(getMethod.getStatusCode() == > HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, > getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > page = (Page) > xstream.fromXML(getMethod.getResponseBodyAsString()); > > - > assertTrue(page.getLanguage().equals(translationLink.getHrefLang())); > + assertEquals(page.getLanguage(), > translationLink.getHrefLang()); > } > > checkLinks(page.getTranslations()); > @@ -322,7 +325,7 @@ > > GetMethod getMethod = > > executeGet > (getFullUri > (Utils > .formatUriTemplate(getUriPatternForResource(PageResource.class), > parametersMap))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > parametersMap = new HashMap<String, String>(); > @@ -334,7 +337,7 @@ > getMethod = > > executeGet > (getFullUri > (Utils > .formatUriTemplate > (getUriPatternForResource(PageTranslationResource.class), > parametersMap))); > - assertTrue(getMethod.getStatusCode() == > HttpStatus.SC_NOT_FOUND); > + assertEquals(HttpStatus.SC_NOT_FOUND, > getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > } > > @@ -354,13 +357,74 @@ > DeleteMethod deleteMethod = > > executeDelete > (getFullUri > (Utils.formatUriTemplate(getUriPatternForResource(PageResource.class), > parametersMap))); > - assertTrue(deleteMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, deleteMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(deleteMethod); > > GetMethod getMethod = > > executeGet > (getFullUri > (Utils > .formatUriTemplate(getUriPatternForResource(PageResource.class), > parametersMap))); > - assertTrue(getMethod.getStatusCode() == > HttpStatus.SC_NOT_FOUND); > + assertEquals(HttpStatus.SC_NOT_FOUND, > getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > } > > + public void testPageHistory() throws Exception > + { > + TestUtils.banner("testPageHistory"); > + > + Page originalPage = getPage(); > + > + Map<String, String> parametersMap = new HashMap<String, > String>(); > + parametersMap.put(Constants.WIKI_NAME_PARAMETER, getWiki()); > + parametersMap.put(Constants.SPACE_NAME_PARAMETER, > originalPage.getSpace()); > + parametersMap.put(Constants.PAGE_NAME_PARAMETER, > originalPage.getName()); > + > + String pageHistoryUri = > + > getFullUri > (Utils > .formatUriTemplate > (getUriPatternForResource(PageHistoryResource.class), parametersMap)); > + > + GetMethod getMethod = executeGet(pageHistoryUri); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > + TestUtils.printHttpMethodInfo(getMethod); > + > + History history = (History) > xstream.fromXML(getMethod.getResponseBodyAsString()); > + > + for (HistorySummary historySummary : > history.getHistorySummaryList()) { > + getMethod = > executeGet > (historySummary.getFirstLinkByRelation(Relations.PAGE).getHref()); > + assertEquals(HttpStatus.SC_OK, > getMethod.getStatusCode()); > + TestUtils.printHttpMethodInfo(getMethod); > + > + Page page = (Page) > xstream.fromXML(getMethod.getResponseBodyAsString()); > + > + checkLinks(page); > + } > + } > + > + public void testPageTranslationHistory() throws Exception > + { > + TestUtils.banner("testPageTranslationHistory"); > + > + Map<String, String> parametersMap = new HashMap<String, > String>(); > + parametersMap.put(Constants.WIKI_NAME_PARAMETER, getWiki()); > + parametersMap.put(Constants.SPACE_NAME_PARAMETER, > TestConstants.TEST_SPACE_NAME); > + parametersMap.put(Constants.PAGE_NAME_PARAMETER, > TestConstants.TRANSLATIONS_PAGE_NAME); > + > + String pageHistoryUri = > + > getFullUri > (Utils > .formatUriTemplate > (getUriPatternForResource(PageHistoryResource.class), parametersMap)); > + > + GetMethod getMethod = executeGet(pageHistoryUri); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > + TestUtils.printHttpMethodInfo(getMethod); > + > + History history = (History) > xstream.fromXML(getMethod.getResponseBodyAsString()); > + > + for (HistorySummary historySummary : > history.getHistorySummaryList()) { > + getMethod = > executeGet > (historySummary.getFirstLinkByRelation(Relations.PAGE).getHref()); > + assertEquals(HttpStatus.SC_OK, > getMethod.getStatusCode()); > + TestUtils.printHttpMethodInfo(getMethod); > + > + Page page = (Page) > xstream.fromXML(getMethod.getResponseBodyAsString()); > + > + checkLinks(page); > + checkLinks(page.getTranslations()); > + } > + } > + > } > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/ > org/xwiki/rest/it/PagesResourceTest.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/PagesResourceTest.java 2009-01-28 21:20:34 UTC (rev > 15847) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/PagesResourceTest.java 2009-01-28 21:29:35 UTC (rev > 15848) > @@ -37,7 +37,7 @@ > TestUtils.banner("testRepresentation()"); > > GetMethod getMethod = > executeGet(getFullUri(getUriPatternForResource(WikisResource.class))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Wikis wikis = (Wikis) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -48,7 +48,7 @@ > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Spaces spaces = (Spaces) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -59,7 +59,7 @@ > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Pages pages = (Pages) > xstream.fromXML(getMethod.getResponseBodyAsString()); > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/ > org/xwiki/rest/it/RootResourceTest.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/RootResourceTest.java 2009-01-28 21:20:34 UTC (rev > 15847) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/RootResourceTest.java 2009-01-28 21:29:35 UTC (rev > 15848) > @@ -33,7 +33,7 @@ > TestUtils.banner("testRepresentation()"); > > GetMethod getMethod = > executeGet(getFullUri(getUriPatternForResource(RootResource.class))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > XWikiRoot xwikiRoot = (XWikiRoot) > xstream.fromXML(getMethod.getResponseBodyAsString()); > > Modified: enterprise/trunk/distribution-test/rest-tests/src/test/it/ > org/xwiki/rest/it/SpacesResourceTest.java > =================================================================== > --- enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/SpacesResourceTest.java 2009-01-28 21:20:34 UTC (rev > 15847) > +++ enterprise/trunk/distribution-test/rest-tests/src/test/it/org/ > xwiki/rest/it/SpacesResourceTest.java 2009-01-28 21:29:35 UTC (rev > 15848) > @@ -35,7 +35,7 @@ > TestUtils.banner("testRepresentation()"); > > GetMethod getMethod = > executeGet(getFullUri(getUriPatternForResource(WikisResource.class))); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Wikis wikis = (Wikis) > xstream.fromXML(getMethod.getResponseBodyAsString()); > @@ -46,7 +46,7 @@ > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > - assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + assertEquals(HttpStatus.SC_OK, getMethod.getStatusCode()); > TestUtils.printHttpMethodInfo(getMethod); > > Spaces spaces = (Spaces) > xstream.fromXML(getMethod.getResponseBodyAsString());

15 years, 10 months

Re: [xwiki-devs] [xwiki-notifications] r15814 - in platform/core/branches/xwiki-core-1.7/xwiki-rendering/src: main/java/org/xwiki/rendering/renderer test/java/org/xwiki/rendering test/resources/escape

by Vincent Massol

On Jan 28, 2009, at 11:52 AM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-01-28 11:52:19 +0100 (Wed, 28 Jan 2009) > New Revision: 15814 > > Added: > platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/test/ > resources/escape/escape14.test > Modified: > platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/ > java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java > platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/test/ > java/org/xwiki/rendering/RenderingTests.java > Log: > XWIKI-3170: Custom parameter ending syntax characters are not > escaped inside xwiki/2.0 custom parameter values > XWIKI-3143: Quotes are not escaped inside xwiki/2.0 custom parameter > values > > Modified: platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/ > main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java > =================================================================== > --- platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/ > java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java > 2009-01-28 10:51:35 UTC (rev 15813) > +++ platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/ > java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java > 2009-01-28 10:52:19 UTC (rev 15814) > @@ -934,8 +934,8 @@ > if (!parameters.isEmpty()) { > StringBuffer buffer = new StringBuffer("(%"); > for (Map.Entry<String, String> entry : > parameters.entrySet()) { > - buffer.append(' > ').append > (entry.getKey()).append('=').append('\"').append(entry.getValue()) > - .append('\"'); > + buffer.append(' > ').append(entry.getKey()).append('=').append('\"').append( > + entry.getValue().replaceAll("[\\\\\"]", "\\\\ > $0").replaceAll("\\%\\)", "~%)")).append('\"'); I think this requires a bit of comments to explain why this magic is done :) [snip] > Added: platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/ > test/resources/escape/escape14.test > =================================================================== > --- platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/test/ > resources/escape/escape14.test (rev 0) > +++ platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/test/ > resources/escape/escape14.test 2009-01-28 10:52:19 UTC (rev 15814) > @@ -0,0 +1,26 @@ > + > .#--------------------------------------------------------------------------------------------------------- > +.input|xwiki/2.0 I think a comment here would be good to explain what this test is about since it's not that obvious. > > + > .#--------------------------------------------------------------------------------------------------------- > +(% style="font-(%weight: bold; ~%)font-family: \"monospace\"; font- > size: 14pt;" %) > +foobar > +.#----------------------------------------------------- > +.expect|event > +.#----------------------------------------------------- > +beginDocument > +beginParagraph [[style]=[font-(%weight: bold; %)font-family: > "monospace"; font-size: 14pt;]] > +onWord [foobar] > +endParagraph [[style]=[font-(%weight: bold; %)font-family: > "monospace"; font-size: 14pt;]] > +endDocument > +.#----------------------------------------------------- > +.expect|xhtml > +.#----------------------------------------------------- > + "monospace"; font-size: 14pt;">foobar > +.#----------------------------------------------------- > +.expect|xwiki > +.#----------------------------------------------------- > +(% style="font-(%weight: bold; ~%)font-family: \"monospace\"; font- > size: 14pt;" %) > +foobar > +.#----------------------------------------------------- > +.input|xhtml/1.0 > +.#----------------------------------------------------- > + "monospace"; font-size: 14pt;">foobar > \ No newline at end of file Thanks -Vincent http://xwiki.com http://xwiki.org http://massol.net

15 years, 10 months

Re: [xwiki-devs] [xwiki-notifications] r15808 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api

by Vincent Massol

On Jan 28, 2009, at 6:28 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2009-01-28 06:28:25 +0100 (Wed, 28 Jan 2009) > New Revision: 15808 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > Document.java > Log: > XWIKI-3168: Changing the document syntax without saving the document > can cause an invalid document state > Fixed. > > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > api/Document.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > Document.java 2009-01-27 23:34:55 UTC (rev 15807) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > Document.java 2009-01-28 05:28:25 UTC (rev 15808) > @@ -273,6 +273,15 @@ > } > > /** > + * @return the Syntax id representing the syntax used for the > current document. For example "xwiki/1.0" represents > + * the first version XWiki syntax while "xwiki/2.0" > represents version 2.0 of the XWiki Syntax. > + */ > + public String getSyntaxId() > + { > + return this.doc.getSyntaxId(); should this be getDoc().getSyntaxId()? Should all methods use getDoc() instead of this.doc? > + } > + > + /** > * return the language of the document if it's a traduction, > otherwise, it return default > */ > public String getLanguage() > @@ -1498,6 +1507,10 @@ > getDoc().setContent(content); > } > > + /** > + * @param syntaxId the Syntax id representing the syntax used > for the current document. For example "xwiki/1.0" represents > + * the first version XWiki syntax while "xwiki/2.0" > represents version 2.0 of the XWiki Syntax. > + */ > public void setSyntaxId(String syntaxId) > { > getDoc().setSyntaxId(syntaxId); > @@ -1900,15 +1913,6 @@ > } > > /** > - * @return the Syntax id representing the syntax used for the > current document. For example "xwiki/1.0" represents > - * the first version XWiki syntax while "xwiki/2.0" > represents version 2.0 of the XWiki Syntax. > - */ > - public String getSyntaxId() > - { > - return this.doc.getSyntaxId(); > - } > - > - /** > * Convert the current document content from its current syntax > to the new syntax passed as parameter. > * > * @param targetSyntaxId the syntax to convert to (eg "xwiki/ > 2.0", "xhtml/1.0", etc) > @@ -1917,7 +1921,7 @@ > public boolean convertSyntax(String targetSyntaxId) throws > XWikiException > { > try { > - this.doc.convertSyntax(targetSyntaxId); > + getDoc().convertSyntax(targetSyntaxId); > } catch (Exception ex) { > return false; > } Thanks -Vincent http://xwiki.com http://xwiki.org http://massol.net

15 years, 10 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs January 2009