XRENDERING-600: Faulty repeated insertion of 'class="wikiattachmentlink"' by WYSIWYG editing

  * Handle wikiattachmentlink the same way we handle wikiinternallink
    class
  * Add integration tests to cover the bug

(cherry picked from commit 0bae09bd)

xwiki-rendering-integration-tests/src/test/resources/simple/misc/misc10.test

+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+<p><!--startwikilink:true|-|attach|-|file.pdf--><span class="wikiattachmentlink"><a href="/xwiki/bin/download/Path/To/file.pdf">t<em>itl</em>e</a></span><!--stopwikilink--></p>
+.#-----------------------------------------------------
+.expect|xwiki/2.1
+.#-----------------------------------------------------
+[[t//itl//e>>attach:file.pdf]]
+.#-----------------------------------------------------
+.expect|event/1.0
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+beginLink [Typed = [true] Type = [attach] Reference = [file.pdf]] [false]
+onWord [t]
+beginFormat [ITALIC]
+onWord [itl]
+endFormat [ITALIC]
+onWord [e]
+endLink [Typed = [true] Type = [attach] Reference = [file.pdf]] [false]
+endParagraph
+endDocument
\ No newline at end of file

xwiki-rendering-integration-tests/src/test/resources/simple/misc/misc9.test

+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+<p><!--startwikilink:true|-|attach|-|file.pdf--><span class="wikiattachmentlink"><a href="/xwiki/bin/download/Path/To/file.pdf">title</a></span><!--stopwikilink--></p>
+.#-----------------------------------------------------
+.expect|xwiki/2.1
+.#-----------------------------------------------------
+[[title>>attach:file.pdf]]
+.#-----------------------------------------------------
+.expect|event/1.0
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+beginLink [Typed = [true] Type = [attach] Reference = [file.pdf]] [false]
+onWord [title]
+endLink [Typed = [true] Type = [attach] Reference = [file.pdf]] [false]
+endParagraph
+endDocument
\ No newline at end of file

xwiki-rendering-syntaxes/xwiki-rendering-syntax-xhtml/src/main/java/org/xwiki/rendering/internal/parser/xhtml/wikimodel/XWikiSpanTagHandler.java

@@ -62,15 +62,17 @@ protected void begin(TagContext context)
             // Ex: <a href="..."><span class="wikicreatelinktext">...</span><span class="wikicreatelinkqm">?</span></a>
             WikiParameter classParam = params.getParameter("class");
             if (classParam != null) {
-                if (classParam.getValue().contains("wikigeneratedlinkcontent"))
+                String classParamValue = classParam.getValue();
+                if (classParamValue.contains("wikigeneratedlinkcontent"))
                 {
                     setAccumulateContent(true);
-                } else if ("wikilink".equals(classParam.getValue())
-                    || "wikicreatelink".equals(classParam.getValue())
-                    || "wikiexternallink".equals(classParam.getValue()))
+                } else if ("wikilink".equals(classParamValue)
+                    || "wikicreatelink".equals(classParamValue)
+                    || "wikiexternallink".equals(classParamValue)
+                    || "wikiattachmentlink".equals(classParamValue))
                 {
                     // Nothing to do
-                } else if ("xwikirenderingerror".equals(classParam.getValue())) {
+                } else if ("xwikirenderingerror".equals(classParamValue)) {
                     setAccumulateContent(true);
                 } else {
                     super.begin(context);
@@ -89,15 +91,17 @@ protected void end(TagContext context)
         if (!nonGeneratedContent) {
             WikiParameter classParam = context.getParams().getParameter("class");
             if (classParam != null) {
-                if (classParam.getValue().contains("wikigeneratedlinkcontent"))
+                String classParamValue = classParam.getValue();
+                if (classParamValue.contains("wikigeneratedlinkcontent"))
                 {
                     setAccumulateContent(false);
-                } else if ("wikilink".equals(classParam.getValue())
-                    || "wikicreatelink".equals(classParam.getValue())
-                    || "wikiexternallink".equals(classParam.getValue()))
+                } else if ("wikilink".equals(classParamValue)
+                    || "wikicreatelink".equals(classParamValue)
+                    || "wikiexternallink".equals(classParamValue)
+                    || "wikiattachmentlink".equals(classParamValue))
                 {
                     // Nothing to do
-                } else if ("xwikirenderingerror".equals(classParam.getValue())) {
+                } else if ("xwikirenderingerror".equals(classParamValue)) {
                     setAccumulateContent(false);
                 } else {
                     super.end(context);