Skip to content
Snippets Groups Projects
Commit 2aa6e14a authored by Eduard Moraru's avatar Eduard Moraru
Browse files

XWIKI-12920: Hiding WebHome in wiki link syntax

- Fixed more test setups.
parent c1de917a
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@
import org.xwiki.model.internal.reference.RelativeStringEntityReferenceResolver;
import org.xwiki.rendering.block.XDOM;
import org.xwiki.rendering.internal.macro.chart.source.DataSource;
import org.xwiki.rendering.internal.parser.reference.XWikiUntypedLinkReferenceParser;
import org.xwiki.rendering.internal.parser.reference.DefaultUntypedLinkReferenceParser;
import org.xwiki.rendering.internal.parser.reference.type.AttachmentResourceReferenceTypeParser;
import org.xwiki.rendering.internal.parser.reference.type.DocumentResourceReferenceTypeParser;
import org.xwiki.rendering.internal.parser.reference.type.SpaceResourceReferenceTypeParser;
......@@ -63,11 +63,11 @@
PlainTextRendererFactory.class,
XWiki20Parser.class,
XWiki20LinkReferenceParser.class,
DefaultUntypedLinkReferenceParser.class,
URLResourceReferenceTypeParser.class,
XWiki20ImageReferenceParser.class,
PlainTextRenderer.class,
DefaultLinkLabelGenerator.class,
XWikiUntypedLinkReferenceParser.class,
DefaultEntityReferenceProvider.class,
DefaultModelConfiguration.class,
DocumentResourceReferenceTypeParser.class,
......
......@@ -46,7 +46,6 @@
import org.xwiki.rendering.internal.macro.display.DisplayMacro;
import org.xwiki.rendering.internal.transformation.macro.MacroTransformation;
import org.xwiki.rendering.listener.MetaData;
import org.xwiki.rendering.listener.reference.ResourceReference;
import org.xwiki.rendering.macro.Macro;
import org.xwiki.rendering.macro.MacroExecutionException;
import org.xwiki.rendering.macro.display.DisplayMacroParameters;
......@@ -168,13 +167,6 @@ public void testDisplayMacroWhenDisplayingDocumentWithRelativeReferences() throw
final DocumentReference displayedDocumentReference =
new DocumentReference("displayedWiki", "displayedSpace", "displayedPage");
getMockery().checking(new Expectations()
{
{
oneOf(mockSetup.wikiModel).isDocumentAvailable(with(any(ResourceReference.class)));
will(returnValue(true));
}
});
setUpDocumentMock("displayedWiki:displayedSpace.displayedPage", displayedDocumentReference,
"[[page]] [[attach:test.png]] image:test.png");
getMockery().checking(new Expectations()
......
......@@ -46,7 +46,6 @@
import org.xwiki.rendering.internal.macro.include.IncludeMacro;
import org.xwiki.rendering.internal.transformation.macro.MacroTransformation;
import org.xwiki.rendering.listener.MetaData;
import org.xwiki.rendering.listener.reference.ResourceReference;
import org.xwiki.rendering.macro.Macro;
import org.xwiki.rendering.macro.MacroExecutionException;
import org.xwiki.rendering.macro.include.IncludeMacroParameters;
......@@ -209,13 +208,6 @@ public void testIncludeMacroWhenIncludingDocumentWithRelativeReferences() throws
final DocumentReference includedDocumentReference =
new DocumentReference("includedWiki", "includedSpace", "includedPage");
getMockery().checking(new Expectations()
{
{
oneOf(mockSetup.wikiModel).isDocumentAvailable(with(any(ResourceReference.class)));
will(returnValue(true));
}
});
setUpDocumentMock("includedWiki:includedSpace.includedPage", includedDocumentReference,
"[[page]] [[attach:test.png]] image:test.png");
getMockery().checking(new Expectations()
......
......@@ -48,7 +48,7 @@
import org.xwiki.rendering.internal.parser.DefaultContentParser;
import org.xwiki.rendering.internal.parser.plain.PlainTextBlockParser;
import org.xwiki.rendering.internal.parser.plain.PlainTextStreamParser;
import org.xwiki.rendering.internal.parser.reference.XWikiUntypedLinkReferenceParser;
import org.xwiki.rendering.internal.parser.reference.DefaultUntypedLinkReferenceParser;
import org.xwiki.rendering.internal.parser.reference.type.AttachmentResourceReferenceTypeParser;
import org.xwiki.rendering.internal.parser.reference.type.DocumentResourceReferenceTypeParser;
import org.xwiki.rendering.internal.parser.reference.type.SpaceResourceReferenceTypeParser;
......@@ -146,7 +146,7 @@
XWiki20Parser.class,
XWiki20LinkReferenceParser.class,
XWiki20ImageReferenceParser.class,
XWikiUntypedLinkReferenceParser.class,
DefaultUntypedLinkReferenceParser.class,
DocumentResourceReferenceTypeParser.class,
SpaceResourceReferenceTypeParser.class,
AttachmentResourceReferenceTypeParser.class,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment