From 59167ae045c3f3b518ab46d0e6d85a61c8049fd0 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Thu, 19 May 2016 13:38:23 +0200
Subject: [PATCH] XWIKI-12474: Make it possible to configure available syntaxes
at runtime using the Admin UI * Fix test
---
.../test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
index 7189ddcc212..0f4fa673944 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
@@ -30,6 +30,8 @@
import org.xwiki.display.internal.DisplayConfiguration;
import org.xwiki.model.reference.DocumentReference;
import org.xwiki.model.reference.EntityReferenceSerializer;
+import org.xwiki.rendering.configuration.RenderingConfiguration;
+import org.xwiki.rendering.internal.configuration.DefaultRenderingConfiguration;
import org.xwiki.rendering.syntax.Syntax;
import org.xwiki.security.authorization.Right;
import org.xwiki.velocity.VelocityEngine;
@@ -164,6 +166,13 @@ protected void setUp() throws Exception
this.baseObject.setStringListValue("stringlist", Arrays.asList("VALUE1", "VALUE2"));
this.mockXWikiStoreInterface.stubs().method("search").will(returnValue(new ArrayList<XWikiDocument>()));
+
+ // Set the default link label generator format to %np for some tests below.
+ // We need to do this since we don't depend on xwiki-platform-rendering-configuration-default (which contains
+ // an overridden RenderingConfiguration impl that sets the format to %np by default).
+ DefaultRenderingConfiguration renderingConfiguration =
+ getComponentManager().getInstance(RenderingConfiguration.class);
+ renderingConfiguration.setLinkLabelFormat("%np");
}
@Override
--
GitLab