diff options
author | Kevin Sawicki | 2011-12-16 16:54:44 +0000 |
---|---|---|
committer | Kevin Sawicki | 2011-12-16 17:32:53 +0000 |
commit | 10ec41bff246bb6900e91c1543c661139fe743d3 (patch) | |
tree | 211e4ebdf4c922e5ed6452ce35bfae9e1c3f9eef | |
parent | 5562b470378843d9e26f9829459a0839c8190521 (diff) | |
download | egit-github-10ec41bff246bb6900e91c1543c661139fe743d3.tar.gz egit-github-10ec41bff246bb6900e91c1543c661139fe743d3.tar.xz egit-github-10ec41bff246bb6900e91c1543c661139fe743d3.zip |
Add missing bodyText and bodyHtml fields
These fields are present when certain values are specified
in the Accept header of the request
Change-Id: Idccdaeb8fa01848e172bb7549fd1ece3dec18092
6 files changed, 120 insertions, 0 deletions
diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommentTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommentTest.java index a661c08c..5ff0cfa7 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommentTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/CommentTest.java @@ -32,6 +32,8 @@ public class CommentTest { public void defaultState() { Comment comment = new Comment(); assertNull(comment.getBody()); + assertNull(comment.getBodyHtml()); + assertNull(comment.getBodyText()); assertNull(comment.getCreatedAt()); assertEquals(0, comment.getId()); assertNull(comment.getUpdatedAt()); @@ -46,6 +48,8 @@ public class CommentTest { public void updateFields() { Comment comment = new Comment(); assertEquals("body", comment.setBody("body").getBody()); + assertEquals("<body>", comment.setBodyHtml("<body>").getBodyHtml()); + assertEquals("text", comment.setBodyText("text").getBodyText()); assertEquals(new Date(1234), comment.setCreatedAt(new Date(1234)) .getCreatedAt()); assertEquals(100, comment.setId(100).getId()); diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueTest.java index a2322509..a7ba3cdf 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/IssueTest.java @@ -38,6 +38,8 @@ public class IssueTest { Issue issue = new Issue(); assertNull(issue.getAssignee()); assertNull(issue.getBody()); + assertNull(issue.getBodyHtml()); + assertNull(issue.getBodyText()); assertNull(issue.getClosedAt()); assertEquals(0, issue.getComments()); assertNull(issue.getCreatedAt()); @@ -63,6 +65,8 @@ public class IssueTest { User assignee = new User().setLogin("assignee"); assertEquals(assignee, issue.setAssignee(assignee).getAssignee()); assertEquals("body", issue.setBody("body").getBody()); + assertEquals("<body>", issue.setBodyHtml("<body>").getBodyHtml()); + assertEquals("text", issue.setBodyText("text").getBodyText()); assertEquals(new Date(1000), issue.setClosedAt(new Date(1000)) .getClosedAt()); assertEquals(5, issue.setComments(5).getComments()); diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java index 4ed6f210..3ba15f01 100755 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java @@ -39,6 +39,8 @@ public class PullRequestTest { assertEquals(0, request.getAdditions());
assertNull(request.getBase());
assertNull(request.getBody());
+ assertNull(request.getBodyHtml());
+ assertNull(request.getBodyText());
assertEquals(0, request.getChangedFiles());
assertNull(request.getClosedAt());
assertEquals(0, request.getComments());
@@ -73,6 +75,8 @@ public class PullRequestTest { PullRequestMarker base = new PullRequestMarker();
assertEquals(base, request.setBase(base).getBase());
assertEquals("a pr", request.setBody("a pr").getBody());
+ assertEquals("<body>", request.setBodyHtml("<body>").getBodyHtml());
+ assertEquals("text", request.setBodyText("text").getBodyText());
assertEquals(20, request.setChangedFiles(20).getChangedFiles());
assertEquals(new Date(1000), request.setClosedAt(new Date(1000))
.getClosedAt());
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Comment.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Comment.java index f2bdacce..c807e28d 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Comment.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Comment.java @@ -29,6 +29,10 @@ public class Comment implements Serializable { private String body; + private String bodyHtml; + + private String bodyText; + private long id; private String url; @@ -84,6 +88,38 @@ public class Comment implements Serializable { } /** + * @return bodyHtml + */ + public String getBodyHtml() { + return bodyHtml; + } + + /** + * @param bodyHtml + * @return this comment + */ + public Comment setBodyHtml(String bodyHtml) { + this.bodyHtml = bodyHtml; + return this; + } + + /** + * @return bodyText + */ + public String getBodyText() { + return bodyText; + } + + /** + * @param bodyText + * @return this comment + */ + public Comment setBodyText(String bodyText) { + this.bodyText = bodyText; + return this; + } + + /** * @return id */ public long getId() { diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Issue.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Issue.java index 3aaee8c2..68bef6af 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Issue.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Issue.java @@ -43,6 +43,10 @@ public class Issue implements Serializable { private String body; + private String bodyHtml; + + private String bodyText; + private String htmlUrl; private String state; @@ -200,6 +204,38 @@ public class Issue implements Serializable { } /** + * @return bodyHtml + */ + public String getBodyHtml() { + return bodyHtml; + } + + /** + * @param bodyHtml + * @return this issue + */ + public Issue setBodyHtml(String bodyHtml) { + this.bodyHtml = bodyHtml; + return this; + } + + /** + * @return bodyText + */ + public String getBodyText() { + return bodyText; + } + + /** + * @param bodyText + * @return this issue + */ + public Issue setBodyText(String bodyText) { + this.bodyText = bodyText; + return this; + } + + /** * @return htmlUrl */ public String getHtmlUrl() { diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java index 4291b049..558c74f0 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java @@ -53,6 +53,10 @@ public class PullRequest implements Serializable { private String body; + private String bodyHtml; + + private String bodyText; + private String diffUrl; private String htmlUrl; @@ -312,6 +316,38 @@ public class PullRequest implements Serializable { } /** + * @return bodyHtml + */ + public String getBodyHtml() { + return bodyHtml; + } + + /** + * @param bodyHtml + * @return this pull request + */ + public PullRequest setBodyHtml(String bodyHtml) { + this.bodyHtml = bodyHtml; + return this; + } + + /** + * @return bodyText + */ + public String getBodyText() { + return bodyText; + } + + /** + * @param bodyText + * @return this pull request + */ + public PullRequest setBodyText(String bodyText) { + this.bodyText = bodyText; + return this; + } + + /** * @return diffUrl */ public String getDiffUrl() { |