From 8cc3363c9d7ca0042be1f646ea7cd76ab0245da7 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 6 Apr 2017 11:11:25 +0200 Subject: [PATCH] AbstractParserTest: Use CONSTANT_CASE for static final field Change-Id: Ica831987e94fda4e7d365c5e2f0c920416dd5a07 Signed-off-by: Edwin Kempin --- .../mail/receive/AbstractParserTest.java | 2 +- .../mail/receive/GenericHtmlParserTest.java | 18 ++++++------ .../mail/receive/GmailHtmlParserTest.java | 18 ++++++------ .../server/mail/receive/HtmlParserTest.java | 8 +++--- .../server/mail/receive/TextParserTest.java | 28 +++++++++---------- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/AbstractParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/AbstractParserTest.java index 271323cba9..19ad8bb40c 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/AbstractParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/AbstractParserTest.java @@ -27,7 +27,7 @@ import org.junit.Ignore; @Ignore public class AbstractParserTest { - protected static final String changeURL = "https://gerrit-review.googlesource.com/#/changes/123"; + protected static final String CHANGE_URL = "https://gerrit-review.googlesource.com/#/changes/123"; protected static void assertChangeMessage(String message, MailComment comment) { assertThat(comment.fileName).isNull(); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java index faf7451a30..f78953d54a 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java @@ -30,7 +30,7 @@ public class GenericHtmlParserTest extends HtmlParserTest { + "
foobar posted comments on this change.

" + "

View Change

Patch Set 2: CR-1\n" + "\n" @@ -38,13 +38,13 @@ public class GenericHtmlParserTest extends HtmlParserTest { + "

" + // File #1: test.txt "" + "File gerrit-server/test.txt:

" + commentBlock(f1) + "

  • " + "" + "Patch Set #2:

    " + "
    Some inline comment from Gerrit
    " @@ -53,7 +53,7 @@ public class GenericHtmlParserTest extends HtmlParserTest { + commentBlock(fc1) + "

  • " + "" + "Patch Set #2, Line 31:

    " + "
    Some inline comment from Gerrit
    " @@ -64,7 +64,7 @@ public class GenericHtmlParserTest extends HtmlParserTest { + // Inline comment #2 "

  • " + "" + "Patch Set #2, Line 47:

    " + "
    Some comment posted on Gerrit
    " @@ -73,7 +73,7 @@ public class GenericHtmlParserTest extends HtmlParserTest { + commentBlock(c2) + "

  • " + "" + "Patch Set #2, Line 115: some code

    " + "

    some comment

    • " @@ -81,13 +81,13 @@ public class GenericHtmlParserTest extends HtmlParserTest { + "

  • " + // File #2: test.txt "" + "File gerrit-server/readme.txt:

    " + commentBlock(f2) + "

  • " + "" + "Patch Set #2, Line 31:

    " + "
    Some inline comment from Gerrit
    " @@ -100,7 +100,7 @@ public class GenericHtmlParserTest extends HtmlParserTest { + "" + // Footer "

    To view, visit this change. " + "To unsubscribe, visit settings." + "

    Gerrit-MessageType: comment
    " diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java index d253af56ac..c0e8050615 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java @@ -29,7 +29,7 @@ public class GmailHtmlParserTest extends HtmlParserTest { + "

    foobar posted comments on this change.

    " + "

    View Change

    Patch Set 2: CR-1\n" + "\n" @@ -37,13 +37,13 @@ public class GmailHtmlParserTest extends HtmlParserTest { + "

    " + // File #1: test.txt "" + "File gerrit-server/test.txt:

    " + commentBlock(f1) + "

  • " + "" + "Patch Set #2:

    " + "
    Some inline comment from Gerrit
    " @@ -52,7 +52,7 @@ public class GmailHtmlParserTest extends HtmlParserTest { + commentBlock(fc1) + "

  • " + "" + "Patch Set #2, Line 31:

    " + "
    Some inline comment from Gerrit
    " @@ -63,7 +63,7 @@ public class GmailHtmlParserTest extends HtmlParserTest { + // Inline comment #2 "

  • " + "" + "Patch Set #2, Line 47:

    " + "
    Some comment posted on Gerrit
    " @@ -72,7 +72,7 @@ public class GmailHtmlParserTest extends HtmlParserTest { + commentBlock(c2) + "

  • " + "" + "Patch Set #2, Line 115: some code

    " + "

    some comment

    • " @@ -80,13 +80,13 @@ public class GmailHtmlParserTest extends HtmlParserTest { + "

  • " + // File #2: test.txt "" + "File gerrit-server/readme.txt:

    " + commentBlock(f2) + "

  • " + "" + "Patch Set #2, Line 31:

    " + "
    Some inline comment from Gerrit
    " @@ -99,7 +99,7 @@ public class GmailHtmlParserTest extends HtmlParserTest { + "" + // Footer "

    To view, visit this change. " + "To unsubscribe, visit settings." + "

    Gerrit-MessageType: comment
    " diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/HtmlParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/HtmlParserTest.java index 11bc4ff4a6..62bc580974 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/HtmlParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/HtmlParserTest.java @@ -49,7 +49,7 @@ public abstract class HtmlParserTest extends AbstractParserTest { null)); List comments = defaultComments(); - List parsedComments = HtmlParser.parse(b.build(), comments, changeURL); + List parsedComments = HtmlParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(3); assertChangeMessage("Looks good to me", parsedComments.get(0)); @@ -71,7 +71,7 @@ public abstract class HtmlParserTest extends AbstractParserTest { null)); List comments = defaultComments(); - List parsedComments = HtmlParser.parse(b.build(), comments, changeURL); + List parsedComments = HtmlParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(3); assertChangeMessage("Looks good to me", parsedComments.get(0)); @@ -85,7 +85,7 @@ public abstract class HtmlParserTest extends AbstractParserTest { b.htmlContent(newHtmlBody(null, null, null, null, null, null, null)); List comments = defaultComments(); - List parsedComments = HtmlParser.parse(b.build(), comments, changeURL); + List parsedComments = HtmlParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).isEmpty(); } @@ -98,7 +98,7 @@ public abstract class HtmlParserTest extends AbstractParserTest { null, null, null, "Also have a comment here.", "This is a nice file", null, null)); List comments = defaultComments(); - List parsedComments = HtmlParser.parse(b.build(), comments, changeURL); + List parsedComments = HtmlParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(2); assertFileComment("This is a nice file", parsedComments.get(0), comments.get(1).key.filename); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java index a98835b409..0a5381eea7 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java @@ -40,7 +40,7 @@ public class TextParserTest extends AbstractParserTest { b.textContent("Looks good to me\n" + quotedFooter); List comments = defaultComments(); - List parsedComments = TextParser.parse(b.build(), comments, changeURL); + List parsedComments = TextParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(1); assertChangeMessage("Looks good to me", parsedComments.get(0)); @@ -61,7 +61,7 @@ public class TextParserTest extends AbstractParserTest { + quotedFooter); List comments = defaultComments(); - List parsedComments = TextParser.parse(b.build(), comments, changeURL); + List parsedComments = TextParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(3); assertChangeMessage("Looks good to me", parsedComments.get(0)); @@ -84,7 +84,7 @@ public class TextParserTest extends AbstractParserTest { + quotedFooter); List comments = defaultComments(); - List parsedComments = TextParser.parse(b.build(), comments, changeURL); + List parsedComments = TextParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(3); assertChangeMessage("Looks good to me", parsedComments.get(0)); @@ -98,7 +98,7 @@ public class TextParserTest extends AbstractParserTest { b.textContent(newPlaintextBody(null, null, null, null, null, null, null) + quotedFooter); List comments = defaultComments(); - List parsedComments = TextParser.parse(b.build(), comments, changeURL); + List parsedComments = TextParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).isEmpty(); } @@ -112,7 +112,7 @@ public class TextParserTest extends AbstractParserTest { + quotedFooter); List comments = defaultComments(); - List parsedComments = TextParser.parse(b.build(), comments, changeURL); + List parsedComments = TextParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(2); assertFileComment("This is a nice file", parsedComments.get(0), comments.get(1).key.filename); @@ -135,7 +135,7 @@ public class TextParserTest extends AbstractParserTest { .replace("> ", ">> ")); List comments = defaultComments(); - List parsedComments = TextParser.parse(b.build(), comments, changeURL); + List parsedComments = TextParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(3); assertChangeMessage("Looks good to me", parsedComments.get(0)); @@ -158,7 +158,7 @@ public class TextParserTest extends AbstractParserTest { + quotedFooter); List comments = defaultComments(); - List parsedComments = TextParser.parse(b.build(), comments, changeURL); + List parsedComments = TextParser.parse(b.build(), comments, CHANGE_URL); assertThat(parsedComments).hasSize(2); assertChangeMessage("Looks good to me", parsedComments.get(0)); @@ -184,7 +184,7 @@ public class TextParserTest extends AbstractParserTest { + " wrote: \n" + "> Foo Bar has posted comments on this change. ( \n" + "> " - + changeURL + + CHANGE_URL + "/1 )\n" + "> \n" + "> Change subject: Test change\n" @@ -196,7 +196,7 @@ public class TextParserTest extends AbstractParserTest { + "> (3 comments)\n" + "> \n" + "> " - + changeURL + + CHANGE_URL + "/1/gerrit-server/test.txt\n" + "> File \n" + "> gerrit-server/test.txt:\n" @@ -204,14 +204,14 @@ public class TextParserTest extends AbstractParserTest { + "> \n" + "> Patch Set #4:\n" + "> " - + changeURL + + CHANGE_URL + "/1/gerrit-server/test.txt\n" + "> \n" + "> Some comment" + "> \n" + (fc1 == null ? "" : fc1 + "\n") + "> " - + changeURL + + CHANGE_URL + "/1/gerrit-server/test.txt@2\n" + "> PS1, Line 2: throw new Exception(\"Object has unsupported: \" +\n" + "> : entry.getValue() +\n" @@ -222,7 +222,7 @@ public class TextParserTest extends AbstractParserTest { + ">\n" + "> \n" + "> " - + changeURL + + CHANGE_URL + "/1/gerrit-server/test.txt@3\n" + "> PS1, Line 3: throw new Exception(\"Object has: \" +\n" + "> : entry.getValue().getClass() +\n" @@ -232,14 +232,14 @@ public class TextParserTest extends AbstractParserTest { + (c2 == null ? "" : c2 + "\n") + "> \n" + "> " - + changeURL + + CHANGE_URL + "/1/gerrit-server/readme.txt\n" + "> File \n" + "> gerrit-server/readme.txt:\n" + (f2 == null ? "" : f2 + "\n") + "> \n" + "> " - + changeURL + + CHANGE_URL + "/1/gerrit-server/readme.txt@3\n" + "> PS1, Line 3: E\n" + "> Should this be EEE like in other places?\n"