diff options
8 files changed, 12 insertions, 12 deletions
diff --git a/server/sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java index 82c46dab8b2..80d151efc86 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java @@ -40,7 +40,7 @@ public class RubyTextServiceTest { @Test public void markdownToHtml() { String html = text.markdownToHtml("some *markdown*"); - assertThat(html).isEqualTo("some <em>markdown</em>"); + assertThat(html).isEqualTo("some <strong>markdown</strong>"); } @Test diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json index 09515d61e50..f88d1338b27 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_comments.json @@ -8,7 +8,7 @@ { "key": "COMMENT-ABCD", "login": "john", - "htmlText": "\u003cem\u003eMy comment\u003c/em\u003e", + "htmlText": "\u003cstrong\u003eMy comment\u003c/strong\u003e", "markdown": "*My comment*", "updatable": true, "createdAt": "2014-09-09T12:00:00+0000" diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_comments.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_comments.json index 8c143219aa2..e6c86120a6a 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_comments.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_comments.json @@ -17,7 +17,7 @@ "key": "COMMENT-ABCD", "userName": "John", "raw": "*My comment*", - "html": "<em>My comment</em>", + "html": "<strong>My comment</strong>", "createdAt": "2014-02-22T19:10:03+0100", "fCreatedAge": "9 days", "updatable": false diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json index b4a4ecd5153..68a29b47e65 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/get_note_as_markdown_and_html.json @@ -3,7 +3,7 @@ "rules": [ { "key": "xoo:x1", - "htmlNote": "this is <em>bold</em>", + "htmlNote": "this is <strong>bold</strong>", "mdNote": "this is *bold*" } ]} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json index 0dcbe93c49f..6ae36b21898 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/SearchActionMediumTest/search_2_rules_fields.json @@ -7,7 +7,7 @@ "key": "xoo:x2", "name": "Rule x2", "mdDesc": "A *Xoo* rule", - "htmlDesc": "A <em>Xoo</em> rule" + "htmlDesc": "A <strong>Xoo</strong> rule" }, { "key": "xoo:x1", diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json index a80d4e3fb39..8712b74c2b7 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json @@ -13,7 +13,7 @@ "params": [ { "key": "regex", - "htmlDesc": "Reg <em>exp</em>", + "htmlDesc": "Reg <strong>exp</strong>", "defaultValue": ".*" } ] diff --git a/sonar-markdown/src/main/java/org/sonar/markdown/HtmlEmphasisChannel.java b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlEmphasisChannel.java index d400800b9cd..6990608a496 100644 --- a/sonar-markdown/src/main/java/org/sonar/markdown/HtmlEmphasisChannel.java +++ b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlEmphasisChannel.java @@ -34,8 +34,8 @@ class HtmlEmphasisChannel extends RegexChannel<MarkdownOutput> { @Override protected void consume(CharSequence token, MarkdownOutput output) { - output.append("<em>"); + output.append("<strong>"); output.append(token.subSequence(1, token.length() - 1)); - output.append("</em>"); + output.append("</strong>"); } } diff --git a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java index 8a538d08ed9..314e924c0a0 100644 --- a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java +++ b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java @@ -101,14 +101,14 @@ public class MarkdownTest { @Test public void shouldEmphaseText() { - assertThat(Markdown.convertToHtml("This is *important*")).isEqualTo("This is <em>important</em>"); + assertThat(Markdown.convertToHtml("This is *important*")).isEqualTo("This is <strong>important</strong>"); assertThat(Markdown.convertToHtml("This should not be * \n emphase")).isEqualTo("This should not be * <br/> emphase"); - assertThat(Markdown.convertToHtml("This is *very* very *important*")).isEqualTo("This is <em>very</em> very <em>important</em>"); + assertThat(Markdown.convertToHtml("This is *very* very *important*")).isEqualTo("This is <strong>very</strong> very <strong>important</strong>"); assertThat(Markdown.convertToHtml("Not * emphase * because of whitespaces")).isEqualTo("Not * emphase * because of whitespaces"); assertThat(Markdown.convertToHtml("Not *emphase * because of whitespace")).isEqualTo("Not *emphase * because of whitespace"); assertThat(Markdown.convertToHtml("Not * emphase* because of whitespace")).isEqualTo("Not * emphase* because of whitespace"); - assertThat(Markdown.convertToHtml("emphase*inside*word")).isEqualTo("emphase<em>inside</em>word"); - assertThat(Markdown.convertToHtml("*Emphase many words*")).isEqualTo("<em>Emphase many words</em>"); + assertThat(Markdown.convertToHtml("emphase*inside*word")).isEqualTo("emphase<strong>inside</strong>word"); + assertThat(Markdown.convertToHtml("*Emphase many words*")).isEqualTo("<strong>Emphase many words</strong>"); } @Test |