XWIKI-13338: Add ability to override the character symbols used to represent...

XWIKI-13338: Add ability to override the character symbols used to represent an Entity Reference as a string
* Fix more tests

xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509CertificateWikiStoreTest.java

@@ -44,6 +44,7 @@
 import org.xwiki.crypto.store.wiki.internal.query.AbstractX509StoreQuery;
 import org.xwiki.crypto.store.wiki.internal.query.AbstractX509SubjectQuery;
 import org.xwiki.model.EntityType;
+import org.xwiki.model.internal.reference.DefaultSymbolScheme;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.EntityReference;
 import org.xwiki.model.reference.EntityReferenceProvider;
@@ -79,8 +80,12 @@
  * @version $Id$
  * @since 6.0
  */
-@ComponentList({CurrentReferenceDocumentReferenceResolver.class, CurrentReferenceEntityReferenceResolver.class,
-                CurrentStringEntityReferenceResolver.class})
+@ComponentList({
+    CurrentReferenceDocumentReferenceResolver.class,
+    CurrentReferenceEntityReferenceResolver.class,
+    CurrentStringEntityReferenceResolver.class,
+    DefaultSymbolScheme.class
+})
 public class X509CertificateWikiStoreTest
 {
     private static final byte[] CERTIFICATE = "certificate".getBytes();
@@ -150,8 +155,7 @@ public void setUp() throws Exception
 
         mocker.registerComponent(EntityReferenceProvider.class, "current", valueProvider);
 
-        Provider<XWikiContext> xcontextProvider =
-            mocker.registerMockComponent(XWikiContext.TYPE_PROVIDER);
+        Provider<XWikiContext> xcontextProvider = mocker.registerMockComponent(XWikiContext.TYPE_PROVIDER);
         xcontext = mock(XWikiContext.class);
         when(xcontextProvider.get()).thenReturn(xcontext);
         xwiki = mock(com.xpn.xwiki.XWiki.class);

xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509KeyWikiStoreTest.java

@@ -41,6 +41,7 @@
 import org.xwiki.crypto.store.StoreReference;
 import org.xwiki.crypto.store.WikiStoreReference;
 import org.xwiki.model.EntityType;
+import org.xwiki.model.internal.reference.DefaultSymbolScheme;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.EntityReference;
 import org.xwiki.model.reference.EntityReferenceProvider;
@@ -74,8 +75,12 @@
  * @version $Id$
  * @since 6.0
  */
-@ComponentList({CurrentReferenceDocumentReferenceResolver.class, CurrentReferenceEntityReferenceResolver.class,
-    CurrentStringEntityReferenceResolver.class})
+@ComponentList({
+    CurrentReferenceDocumentReferenceResolver.class,
+    CurrentReferenceEntityReferenceResolver.class,
+    CurrentStringEntityReferenceResolver.class,
+    DefaultSymbolScheme.class
+})
 public class X509KeyWikiStoreTest
 {
     private static final byte[] PASSWORD = "password".getBytes();
@@ -106,8 +111,7 @@ public class X509KeyWikiStoreTest
     private static final StoreReference SPACE_STORE_REF = new WikiStoreReference(SPACE_STORE_ENTREF);
 
     @Rule
-    public MockitoComponentMockingRule<KeyStore> mocker =
-        new MockitoComponentMockingRule<KeyStore>(X509KeyWikiStore.class);
+    public MockitoComponentMockingRule<KeyStore> mocker = new MockitoComponentMockingRule<>(X509KeyWikiStore.class);
 
     private XWikiContext xcontext;
     private XWiki xwiki;
@@ -183,7 +187,7 @@ public void setUp() throws Exception
     }
 
     @Test
-    public void testStoringPrivateKeyToEmptyDocument() throws Exception
+    public void storingPrivateKeyToEmptyDocument() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -207,7 +211,7 @@ public void testStoringPrivateKeyToEmptyDocument() throws Exception
     }
 
     @Test
-    public void testStoringPrivateKeyToCertificateDocument() throws Exception
+    public void storingPrivateKeyToCertificateDocument() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -229,7 +233,7 @@ public void testStoringPrivateKeyToCertificateDocument() throws Exception
     }
 
     @Test
-    public void testStoringPrivateKeyToEmptySpace() throws Exception
+    public void storingPrivateKeyToEmptySpace() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, ENCODED_SUBJECTKEYID), xcontext)).thenReturn(storeDoc);
@@ -253,7 +257,7 @@ public void testStoringPrivateKeyToEmptySpace() throws Exception
     }
 
     @Test
-    public void testStoringPrivateKeyToCertificateSpace() throws Exception
+    public void storingPrivateKeyToCertificateSpace() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, ENCODED_SUBJECTKEYID), xcontext)).thenReturn(storeDoc);
@@ -275,7 +279,7 @@ public void testStoringPrivateKeyToCertificateSpace() throws Exception
     }
 
     @Test
-    public void testStoringEncryptedPrivateKey() throws Exception
+    public void storingEncryptedPrivateKey() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -299,7 +303,7 @@ public void testStoringEncryptedPrivateKey() throws Exception
     }
 
     @Test
-    public void testUpdatingPrivateKey() throws Exception
+    public void updatingPrivateKey() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -321,7 +325,7 @@ public void testUpdatingPrivateKey() throws Exception
     }
 
     @Test
-    public void testRetrievePrivateKeyFromDocument() throws Exception
+    public void retrievePrivateKeyFromDocument() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -341,7 +345,7 @@ public void testRetrievePrivateKeyFromDocument() throws Exception
     }
 
     @Test
-    public void testRetrieveEncryptedPrivateKeyFromDocument() throws Exception
+    public void retrieveEncryptedPrivateKeyFromDocument() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -361,7 +365,7 @@ public void testRetrieveEncryptedPrivateKeyFromDocument() throws Exception
     }
 
     @Test
-    public void testRetrievePrivateKeyFromSpace() throws Exception
+    public void retrievePrivateKeyFromSpace() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, ENCODED_SUBJECTKEYID), xcontext)).thenReturn(storeDoc);
@@ -379,7 +383,7 @@ public void testRetrievePrivateKeyFromSpace() throws Exception
     }
 
     @Test
-    public void testRetrieveEncryptedPrivateKeyFromSpace() throws Exception
+    public void retrieveEncryptedPrivateKeyFromSpace() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, ENCODED_SUBJECTKEYID), xcontext)).thenReturn(storeDoc);
@@ -397,7 +401,7 @@ public void testRetrieveEncryptedPrivateKeyFromSpace() throws Exception
     }
 
     @Test
-    public void testRetrieveMissingPrivateKeyFromDocument() throws Exception
+    public void retrieveMissingPrivateKeyFromDocument() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -411,7 +415,7 @@ public void testRetrieveMissingPrivateKeyFromDocument() throws Exception
     }
 
     @Test
-    public void testRetrieveMissingCertificateFromDocument() throws Exception
+    public void retrieveMissingCertificateFromDocument() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, DOCUMENT), xcontext)).thenReturn(storeDoc);
@@ -425,7 +429,7 @@ public void testRetrieveMissingCertificateFromDocument() throws Exception
     }
 
     @Test
-    public void testRetrieveMissingPrivateKeyFromSpace() throws Exception
+    public void retrieveMissingPrivateKeyFromSpace() throws Exception
     {
         XWikiDocument storeDoc = mock(XWikiDocument.class);
         when(xwiki.getDocument(new DocumentReference(WIKI, SPACE, ENCODED_SUBJECTKEYID), xcontext)).thenReturn(storeDoc);
@@ -437,7 +441,7 @@ public void testRetrieveMissingPrivateKeyFromSpace() throws Exception
     }
 
     @Test
-    public void testRetrieveMissingCertificateFromSpace() throws Exception
+    public void retrieveMissingCertificateFromSpace() throws Exception
     {
         CertifiedKeyPair keyPair = store.retrieve(SPACE_STORE_REF, certificate);
         assertThat(keyPair, nullValue());

xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/test/java/org/xwiki/search/solr/internal/reference/SolrReferenceResolverTest.java

@@ -43,6 +43,7 @@
 import org.xwiki.model.internal.reference.DefaultStringDocumentReferenceResolver;
 import org.xwiki.model.internal.reference.DefaultStringEntityReferenceResolver;
 import org.xwiki.model.internal.reference.DefaultStringEntityReferenceSerializer;
+import org.xwiki.model.internal.reference.DefaultSymbolScheme;
 import org.xwiki.model.internal.reference.ExplicitStringEntityReferenceResolver;
 import org.xwiki.model.internal.reference.LocalStringEntityReferenceSerializer;
 import org.xwiki.model.internal.reference.RelativeStringEntityReferenceResolver;
@@ -90,16 +91,32 @@
  * 
  * @version $Id$
  */
-@ComponentList({DefaultModelContext.class, DefaultModelConfiguration.class, LocalStringEntityReferenceSerializer.class,
-RelativeStringEntityReferenceResolver.class, CurrentReferenceDocumentReferenceResolver.class,
-CurrentReferenceEntityReferenceResolver.class, CurrentEntityReferenceProvider.class,
-CurrentMixedStringDocumentReferenceResolver.class, CurrentMixedEntityReferenceProvider.class,
-DefaultEntityReferenceProvider.class, CompactWikiStringEntityReferenceSerializer.class,
-DefaultStringDocumentReferenceResolver.class, DefaultStringEntityReferenceResolver.class,
-DefaultStringEntityReferenceSerializer.class, DefaultExecution.class, AttachmentSolrReferenceResolver.class,
-DefaultSolrReferenceResolver.class, DocumentSolrReferenceResolver.class, ObjectPropertySolrReferenceResolver.class,
-ObjectSolrReferenceResolver.class, SpaceSolrReferenceResolver.class, WikiSolrReferenceResolver.class,
-ExplicitStringEntityReferenceResolver.class})
+@ComponentList({
+    DefaultModelContext.class,
+    DefaultModelConfiguration.class,
+    LocalStringEntityReferenceSerializer.class,
+    RelativeStringEntityReferenceResolver.class,
+    CurrentReferenceDocumentReferenceResolver.class,
+    CurrentReferenceEntityReferenceResolver.class,
+    CurrentEntityReferenceProvider.class,
+    CurrentMixedStringDocumentReferenceResolver.class,
+    CurrentMixedEntityReferenceProvider.class,
+    DefaultEntityReferenceProvider.class,
+    CompactWikiStringEntityReferenceSerializer.class,
+    DefaultStringDocumentReferenceResolver.class,
+    DefaultStringEntityReferenceResolver.class,
+    DefaultStringEntityReferenceSerializer.class,
+    DefaultExecution.class,
+    AttachmentSolrReferenceResolver.class,
+    DefaultSolrReferenceResolver.class,
+    DocumentSolrReferenceResolver.class,
+    ObjectPropertySolrReferenceResolver.class,
+    ObjectSolrReferenceResolver.class,
+    SpaceSolrReferenceResolver.class,
+    WikiSolrReferenceResolver.class,
+    ExplicitStringEntityReferenceResolver.class,
+    DefaultSymbolScheme.class
+})
 public class SolrReferenceResolverTest
 {
     @Rule

xwiki-platform-core/xwiki-platform-watchlist/xwiki-platform-watchlist-api/src/test/java/org/xwiki/watchlist/internal/api/WatchListEventTest.java

@@ -27,6 +27,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.xwiki.model.internal.reference.DefaultStringEntityReferenceSerializer;
+import org.xwiki.model.internal.reference.DefaultSymbolScheme;
 import org.xwiki.model.internal.reference.LocalStringEntityReferenceSerializer;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.test.annotation.ComponentList;
@@ -40,7 +41,11 @@
  * @version $Id$
  * @since 7.1M1
  */
-@ComponentList({LocalStringEntityReferenceSerializer.class, DefaultStringEntityReferenceSerializer.class})
+@ComponentList({
+    LocalStringEntityReferenceSerializer.class,
+    DefaultStringEntityReferenceSerializer.class,
+    DefaultSymbolScheme.class
+})
 public class WatchListEventTest
 {
     @Rule