Migrate repository and pull request services to v3.

Searching for repositories still uses the v2 API which is why
the two repository models are now required.

Change-Id: I18700446790337031be2faf9114ff2bb581fdeb3
Signed-off-by: Kevin Sawicki <kevin@github.com>

6 files changed, 46 insertions, 41 deletions

diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java
index 5434871b..0bd1bb6b 100644
--- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java
+++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java
@@ -14,7 +14,7 @@ import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 
-import org.eclipse.egit.github.core.Repository;
+import org.eclipse.egit.github.core.SearchRepository;
 import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.PullRequestService;
 import org.junit.Before;
@@ -34,7 +34,7 @@ public class PullRequestServiceTest {
 	private GitHubClient gitHubClient;
 
 	@Mock
-	private Repository repository;
+	private SearchRepository repository;
 
 	private PullRequestService pullRequestService;
 
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 0cf7000a..3574b8b7 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
@@ -35,22 +35,6 @@ public class PullRequestTest {
 	}

 

 	@Test

-	public void getIssueCreatedAt_ReferenceMutableObject() {

-		PullRequest pullRequest = gson.fromJson(

-				"{issueCreatedAt : '2003-10-10'}", PullRequest.class);

-		pullRequest.getIssueCreatedAt().setTime(0);

-		assertTrue(pullRequest.getIssueCreatedAt().getTime() != 0);

-	}

-

-	@Test

-	public void getIssueUpdatedAt_ReferenceMutableObject() {

-		PullRequest pullRequest = gson.fromJson(

-				"{issueUpdatedAt : '2003-10-10'}", PullRequest.class);

-		pullRequest.getIssueUpdatedAt().setTime(0);

-		assertTrue(pullRequest.getIssueUpdatedAt().getTime() != 0);

-	}

-

-	@Test

 	public void getMergedAt_ReferenceMutableObject() {

 		PullRequest pullRequest = gson.fromJson("{mergedAt : '2003-10-10'}",

 				PullRequest.class);

diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryTest.java
index e0feb281..3601db21 100755
--- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryTest.java
+++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/RepositoryTest.java
@@ -12,14 +12,14 @@ package org.eclipse.egit.github.core.tests;
 

 import static org.junit.Assert.assertTrue;

 

-import org.eclipse.egit.github.core.Repository;

+import org.eclipse.egit.github.core.SearchRepository;

 import org.junit.Test;

 

 import com.google.gson.Gson;

 import com.google.gson.GsonBuilder;

 

 /**

- * Tests for {@link Repository}.

+ * Tests for {@link SearchRepository}.

  */

 public class RepositoryTest {

 

@@ -28,16 +28,16 @@ public class RepositoryTest {
 

 	@Test

 	public void getCreatedAt_ReferenceMutableObject() {

-		Repository repository = gson.fromJson("{createdAt : '2003-10-10'}",

-				Repository.class);

+		SearchRepository repository = gson.fromJson("{createdAt : '2003-10-10'}",

+				SearchRepository.class);

 		repository.getCreatedAt().setTime(0);

 		assertTrue(repository.getCreatedAt().getTime() != 0);

 	}

 

 	@Test

 	public void getPushedAt_ReferenceMutableObject() {

-		Repository repository = gson.fromJson("{pushedAt : '2003-10-10'}",

-				Repository.class);

+		SearchRepository repository = gson.fromJson("{pushedAt : '2003-10-10'}",

+				SearchRepository.class);

 		repository.getPushedAt().setTime(0);

 		assertTrue(repository.getPushedAt().getTime() != 0);

 	}

diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/LiveTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/LiveTest.java
index b47ff6cb..f7927bac 100644
--- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/LiveTest.java
+++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/LiveTest.java
@@ -67,6 +67,11 @@ public abstract class LiveTest {
 		return configure(client);
 	}
 
+	/**
+	 * Set up live unit test
+	 * 
+	 * @throws Exception
+	 */
 	@Before
 	public void setUp() throws Exception {
 		String testUrl = System.getProperty("github.test.url");
diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/PullRequestTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/PullRequestTest.java
index 381e513a..c9a7a31f 100644
--- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/PullRequestTest.java
+++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/PullRequestTest.java
@@ -17,11 +17,11 @@ import java.io.IOException;
 import java.util.List;
 
 import org.eclipse.egit.github.core.PullRequest;
-import org.eclipse.egit.github.core.PullRequestDiscussion;
 import org.eclipse.egit.github.core.PullRequestMarker;
 import org.eclipse.egit.github.core.Repository;
+import org.eclipse.egit.github.core.SearchRepository;
 import org.eclipse.egit.github.core.User;
-import org.eclipse.egit.github.core.client.IGitHubConstants;
+import org.eclipse.egit.github.core.service.IssueService;
 import org.eclipse.egit.github.core.service.PullRequestService;
 import org.junit.Test;
 
@@ -38,7 +38,7 @@ public class PullRequestTest extends LiveTest {
 
 		User user = marker.getUser();
 		assertNotNull(user);
-		assertNotNull(user.getName());
+		assertNotNull(user.getLogin());
 
 		Repository repo = marker.getRepository();
 		assertNotNull(repo);
@@ -53,9 +53,8 @@ public class PullRequestTest extends LiveTest {
 	 */
 	@Test
 	public void fetch() throws IOException {
-		PullRequestService service = new PullRequestService(
-				createClient(IGitHubConstants.URL_API_V2));
-		PullRequest request = service.getPullRequest(new Repository(
+		PullRequestService service = new PullRequestService(client);
+		PullRequest request = service.getPullRequest(new SearchRepository(
 				"technoweenie", "faraday"), "15");
 		assertNotNull(request);
 		assertNotNull(request.getHtmlUrl());
@@ -63,9 +62,28 @@ public class PullRequestTest extends LiveTest {
 		assertNotNull(request.getPatchUrl());
 		checkMarker(request.getHead());
 		checkMarker(request.getBase());
+	}
 
-		List<PullRequestDiscussion> discussion = request.getDiscussion();
-		assertNotNull(discussion);
-		assertFalse(discussion.isEmpty());
+	/**
+	 * Test fetching all pull requests
+	 * 
+	 * @throws IOException
+	 */
+	@Test
+	public void fetchAll() throws IOException {
+		PullRequestService service = new PullRequestService(client);
+		List<PullRequest> requests = service.getPullRequests(
+				new SearchRepository("technoweenie", "faraday"),
+				IssueService.STATE_CLOSED);
+		assertNotNull(requests);
+		assertFalse(requests.isEmpty());
+		for (PullRequest request : requests) {
+			assertNotNull(request);
+			assertNotNull(request.getUpdatedAt());
+			assertNotNull(request.getCreatedAt());
+			assertNotNull(request.getHtmlUrl());
+			assertNotNull(request.getDiffUrl());
+			assertNotNull(request.getPatchUrl());
+		}
 	}
 }
diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/RepositoryTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/RepositoryTest.java
index d3b46667..33534862 100644
--- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/RepositoryTest.java
+++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/live/RepositoryTest.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.eclipse.egit.github.core.Repository;
-import org.eclipse.egit.github.core.client.IGitHubConstants;
+import org.eclipse.egit.github.core.User;
 import org.eclipse.egit.github.core.service.RepositoryService;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -37,8 +37,7 @@ public class RepositoryTest extends LiveTest {
 	 */
 	@Test
 	public void fetchRepositories() throws IOException {
-		RepositoryService service = new RepositoryService(
-				createClient(IGitHubConstants.URL_API_V2));
+		RepositoryService service = new RepositoryService(client);
 		List<Repository> repos = service.getRepositories("defunkt");
 		assertNotNull(repos);
 		assertFalse(repos.isEmpty());
@@ -46,7 +45,6 @@ public class RepositoryTest extends LiveTest {
 			assertNotNull(repo);
 			assertNotNull(repo.getName());
 			assertNotNull(repo.getOwner());
-			assertNotNull(repo.getId());
 			assertNotNull(repo.getUrl());
 			assertNotNull(repo.getCreatedAt());
 			assertTrue(repo.getSize() >= 0);
@@ -65,10 +63,10 @@ public class RepositoryTest extends LiveTest {
 	@Ignore
 	public void createRepository() throws IOException {
 		assertNotNull("Client user is required", client.getUser());
-		RepositoryService service = new RepositoryService(
-				createClient(IGitHubConstants.URL_API_V2));
-		Repository repository = new Repository(client.getUser(), "test-create-"
-				+ System.currentTimeMillis());
+		RepositoryService service = new RepositoryService(client);
+		Repository repository = new Repository();
+		repository.setOwner(new User().setLogin(client.getUser()));
+		repository.setName("test-create-" + System.currentTimeMillis());
 		repository.setPrivate(true);
 		Repository created = service.createRepository(repository);
 		assertNotNull(created);