diff --git a/src/test/java/edu/tamu/app/cache/service/ActiveSprintsScheduledCacheServiceTest.java b/src/test/java/edu/tamu/app/cache/service/ActiveSprintsScheduledCacheServiceTest.java index 0c7b36ca..e9224bb9 100644 --- a/src/test/java/edu/tamu/app/cache/service/ActiveSprintsScheduledCacheServiceTest.java +++ b/src/test/java/edu/tamu/app/cache/service/ActiveSprintsScheduledCacheServiceTest.java @@ -48,7 +48,7 @@ public class ActiveSprintsScheduledCacheServiceTest { private static final String TEST_PROJECT_TOKEN2 = "9876543210"; private static final RemoteProjectManager TEST_REMOTE_PROJECT_MANAGER1 = new RemoteProjectManager("Test Remote Project Manager 1", ServiceType.VERSION_ONE, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); - private static final RemoteProjectManager TEST_REMOTE_PROJECT_MANAGER2 = new RemoteProjectManager("Test Remote Project Manager 2", ServiceType.GITHUB, TEST_PROJECT_URL2, TEST_PROJECT_TOKEN2); + private static final RemoteProjectManager TEST_REMOTE_PROJECT_MANAGER2 = new RemoteProjectManager("Test Remote Project Manager 2", ServiceType.GITHUB_PROJECT, TEST_PROJECT_URL2, TEST_PROJECT_TOKEN2); private static final RemoteProjectInfo TEST_REMOTE_PROJECT_INFO1 = new RemoteProjectInfo(TEST_PROJECT_SCOPE1, TEST_REMOTE_PROJECT_MANAGER1); private static final RemoteProjectInfo TEST_REMOTE_PROJECT_INFO2 = new RemoteProjectInfo(TEST_PROJECT_SCOPE2, TEST_REMOTE_PROJECT_MANAGER2); diff --git a/src/test/java/edu/tamu/app/model/ModelTest.java b/src/test/java/edu/tamu/app/model/ModelTest.java index 503d4814..ad1be925 100644 --- a/src/test/java/edu/tamu/app/model/ModelTest.java +++ b/src/test/java/edu/tamu/app/model/ModelTest.java @@ -49,7 +49,7 @@ public abstract class ModelTest { protected static final Date TEST_INTERNAL_REQUEST_CREATED_ON2 = new Date(System.currentTimeMillis() + 100); protected static final RemoteProjectManager TEST_REMOTE_PROJECT_MANAGER1 = new RemoteProjectManager(TEST_REMOTE_PROJECT_MANAGER1_NAME, ServiceType.VERSION_ONE, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); - protected static final RemoteProjectManager TEST_REMOTE_PROJECT_MANAGER2 = new RemoteProjectManager(TEST_REMOTE_PROJECT_MANAGER2_NAME, ServiceType.GITHUB, TEST_PROJECT_URL2, TEST_PROJECT_TOKEN2); + protected static final RemoteProjectManager TEST_REMOTE_PROJECT_MANAGER2 = new RemoteProjectManager(TEST_REMOTE_PROJECT_MANAGER2_NAME, ServiceType.GITHUB_PROJECT, TEST_PROJECT_URL2, TEST_PROJECT_TOKEN2); protected static final RemoteProjectInfo TEST_REMOTE_PROJECT_INFO1 = new RemoteProjectInfo(TEST_PROJECT_SCOPE1, TEST_REMOTE_PROJECT_MANAGER1); protected static final RemoteProjectInfo TEST_REMOTE_PROJECT_INFO2 = new RemoteProjectInfo(TEST_PROJECT_SCOPE2, TEST_REMOTE_PROJECT_MANAGER1); diff --git a/src/test/java/edu/tamu/app/model/RemoteProjectManagerTest.java b/src/test/java/edu/tamu/app/model/RemoteProjectManagerTest.java index aa6c6988..24f7ed3f 100644 --- a/src/test/java/edu/tamu/app/model/RemoteProjectManagerTest.java +++ b/src/test/java/edu/tamu/app/model/RemoteProjectManagerTest.java @@ -22,14 +22,14 @@ public class RemoteProjectManagerTest extends ModelTest { @Test public void testCreate() { RemoteProjectManager remoteProjectManager1 = remoteProjectManagerRepo.create(new RemoteProjectManager(TEST_REMOTE_PROJECT_MANAGER1_NAME, ServiceType.VERSION_ONE, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1)); - RemoteProjectManager remoteProjectManager2 = remoteProjectManagerRepo.create(new RemoteProjectManager(TEST_REMOTE_PROJECT_MANAGER2_NAME, ServiceType.GITHUB, TEST_PROJECT_URL2, TEST_PROJECT_TOKEN2)); + RemoteProjectManager remoteProjectManager2 = remoteProjectManagerRepo.create(new RemoteProjectManager(TEST_REMOTE_PROJECT_MANAGER2_NAME, ServiceType.GITHUB_PROJECT, TEST_PROJECT_URL2, TEST_PROJECT_TOKEN2)); assertEquals("Remote project manager repo had incorrect number of remote project managers!", 2, remoteProjectManagerRepo.count()); assertEquals("Remote project manager had incorrect name!", TEST_REMOTE_PROJECT_MANAGER1_NAME, remoteProjectManager1.getName()); assertEquals("Remote project manager had incorrect service type!", ServiceType.VERSION_ONE, remoteProjectManager1.getType()); assertEquals("Remote project manager had incorrect url!", TEST_PROJECT_URL1, remoteProjectManager1.getUrl()); assertEquals("Remote project manager had incorrect token!", TEST_PROJECT_TOKEN1, remoteProjectManager1.getToken()); assertEquals("Remote project manager had incorrect name!", TEST_REMOTE_PROJECT_MANAGER2_NAME, remoteProjectManager2.getName()); - assertEquals("Remote project manager had incorrect service type!", ServiceType.GITHUB, remoteProjectManager2.getType()); + assertEquals("Remote project manager had incorrect service type!", ServiceType.GITHUB_PROJECT, remoteProjectManager2.getType()); assertEquals("Remote project manager had incorrect url!", TEST_PROJECT_URL2, remoteProjectManager2.getUrl()); assertEquals("Remote project manager had incorrect token!", TEST_PROJECT_TOKEN2, remoteProjectManager2.getToken()); } diff --git a/src/test/java/edu/tamu/app/service/manager/GitHubServiceTest.java b/src/test/java/edu/tamu/app/service/manager/GitHubServiceTest.java index 50fd1981..50e30e5f 100644 --- a/src/test/java/edu/tamu/app/service/manager/GitHubServiceTest.java +++ b/src/test/java/edu/tamu/app/service/manager/GitHubServiceTest.java @@ -1,9 +1,9 @@ package edu.tamu.app.service.manager; -import static edu.tamu.app.service.manager.GitHubService.DEFECT_LABEL; -import static edu.tamu.app.service.manager.GitHubService.FEATURE_LABEL; -import static edu.tamu.app.service.manager.GitHubService.ISSUE_LABEL; -import static edu.tamu.app.service.manager.GitHubService.REQUEST_LABEL; +import static edu.tamu.app.service.manager.GitHubProjectService.DEFECT_LABEL; +import static edu.tamu.app.service.manager.GitHubProjectService.FEATURE_LABEL; +import static edu.tamu.app.service.manager.GitHubProjectService.ISSUE_LABEL; +import static edu.tamu.app.service.manager.GitHubProjectService.REQUEST_LABEL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Answers.RETURNS_DEEP_STUBS; @@ -78,6 +78,9 @@ public class GitHubServiceTest extends CacheMockTests { private static final String TEST_USER3_AVATAR_PATH = "https://avatars2.githubusercontent.com/u/3333333?v=4"; private static final String TEST_USER1_AVATAR_NAME = "1234567"; private static final String TEST_COLUMN1_NAME = "Test Column 1"; + private static final String TEST_PROJECT1_NAME = "Test Project 1 Sprint Name"; + private static final String TEST_PROJECT2_NAME = "Test Project 2 Sprint Name"; + private static final String TEST_PROJECT3_NAME = "Test Project 3 Sprint Name"; private static final Long TEST_REPOSITORY1_ID = 1L; private static final Long TEST_USER1_ID = 3L; @@ -170,13 +173,13 @@ public class GitHubServiceTest extends CacheMockTests { private GitHubBuilder ghBuilder; - private GitHubService gitHubService; + private GitHubProjectService gitHubProjectService; private GitHub github; @Before public void setUp() throws Exception { - ManagementService managementService = new RemoteProjectManager("GitHub", ServiceType.GITHUB, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); + ManagementService managementService = new RemoteProjectManager("GitHub", ServiceType.GITHUB_PROJECT, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); CardTypeRepo cardTypeRepo = mock(CardTypeRepo.class); @@ -191,7 +194,7 @@ public void setUp() throws Exception { ghBuilder = mock(GitHubBuilder.class); - gitHubService = mock(GitHubService.class, Mockito.CALLS_REAL_METHODS); + gitHubProjectService = mock(GitHubProjectService.class, Mockito.CALLS_REAL_METHODS); github = mock(GitHub.class); @@ -219,6 +222,10 @@ public void setUp() throws Exception { when(TEST_PROJECT2.listColumns().asList()).thenReturn(TEST_PROJECT_COLUMNS); when(TEST_PROJECT3.listColumns().asList()).thenReturn(TEST_PROJECT_COLUMNS); + when(TEST_PROJECT1.getName()).thenReturn(TEST_PROJECT1_NAME); + when(TEST_PROJECT2.getName()).thenReturn(TEST_PROJECT2_NAME); + when(TEST_PROJECT3.getName()).thenReturn(TEST_PROJECT3_NAME); + when(TEST_COLUMN1.listCards().asList()).thenReturn(TEST_COLUMN1_CARDS); when(TEST_COLUMN2.listCards().asList()).thenReturn(TEST_COLUMN2_CARDS); when(TEST_COLUMN3.listCards().asList()).thenReturn(TEST_COLUMN3_CARDS); @@ -335,19 +342,19 @@ public Optional answer(InvocationOnMock invocation) { setField(statusMappingService, "serviceMappingRepo", statusRepo); setField(estimateMappingService, "serviceMappingRepo", estimateRepo); - setField(gitHubService, "ghBuilder", ghBuilder); - setField(gitHubService, "managementService", managementService); - setField(gitHubService, "cardTypeMappingService", cardTypeMappingService); - setField(gitHubService, "statusMappingService", statusMappingService); - setField(gitHubService, "estimateMappingService", estimateMappingService); - setField(gitHubService, "github", github); - setField(gitHubService, "members", new HashMap()); - setField(gitHubService, "restTemplate", restTemplate); + setField(gitHubProjectService, "ghBuilder", ghBuilder); + setField(gitHubProjectService, "managementService", managementService); + setField(gitHubProjectService, "cardTypeMappingService", cardTypeMappingService); + setField(gitHubProjectService, "statusMappingService", statusMappingService); + setField(gitHubProjectService, "estimateMappingService", estimateMappingService); + setField(gitHubProjectService, "github", github); + setField(gitHubProjectService, "members", new HashMap()); + setField(gitHubProjectService, "restTemplate", restTemplate); } @Test public void testGetRemoteProjects() throws Exception { - List remoteProjects = gitHubService.getRemoteProject(); + List remoteProjects = gitHubProjectService.getRemoteProject(); assertEquals("Didn't get all the remote projects", 2, remoteProjects.size()); assertEquals("Number of Requests was incorrect", 1, remoteProjects.get(0).getRequestCount()); assertEquals("Number of Issues was incorrect", 2, remoteProjects.get(0).getIssueCount()); @@ -357,7 +364,7 @@ public void testGetRemoteProjects() throws Exception { @Test public void testGetRemoteProjectByScopeId() throws Exception { - RemoteProject project = gitHubService.getRemoteProjectByScopeId(String.valueOf(TEST_REPOSITORY1_ID)); + RemoteProject project = gitHubProjectService.getRemoteProjectByScopeId(String.valueOf(TEST_REPOSITORY1_ID)); assertNotNull("Didn't get the remote project", project); assertEquals("Did not get the expected project", String.valueOf(TEST_REPOSITORY1_ID), project.getId()); assertEquals("Number of Requests was incorrect", 1, project.getRequestCount()); @@ -368,25 +375,25 @@ public void testGetRemoteProjectByScopeId() throws Exception { @Test public void testGetActiveSprintsByProjectId() throws Exception { - List activeSprints = gitHubService.getActiveSprintsByScopeId(String.valueOf(TEST_REPOSITORY1_ID)); + List activeSprints = gitHubProjectService.getActiveSprintsByScopeId(String.valueOf(TEST_REPOSITORY1_ID)); assertEquals("Didn't get all active sprints", 3, activeSprints.size()); } @Test public void testGetAdditionalActiveSprints() throws Exception { - List additionalSprints = gitHubService.getAdditionalActiveSprints(); + List additionalSprints = gitHubProjectService.getAdditionalActiveSprints(); assertEquals("Didn't get all additional sprints", 3, additionalSprints.size()); } @Test public void testPush() throws Exception { - String id = gitHubService.push(TEST_FEATURE_REQUEST); + String id = gitHubProjectService.push(TEST_FEATURE_REQUEST); assertNotNull(id); } @Test public void testGetMember() throws IOException { - Member member = gitHubService.getMember(TEST_USER1); + Member member = gitHubProjectService.getMember(TEST_USER1); assertEquals("Member ID is incorrect", String.valueOf(TEST_USER1_ID), member.getId()); assertEquals("Member Name is incorrect", TEST_USER1_NAME, member.getName()); assertEquals("Member Avatar URL is incorrect", TEST_USER1_AVATAR_NAME, member.getAvatar()); @@ -394,12 +401,12 @@ public void testGetMember() throws IOException { @Test public void testGetGitHubInstanceWithInvalidServiceEndpoint() throws IOException { - ManagementService invalidManagementService = new RemoteProjectManager("GitHub", ServiceType.GITHUB, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); + ManagementService invalidManagementService = new RemoteProjectManager("GitHub", ServiceType.GITHUB_PROJECT, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); - setField(gitHubService, "managementService", invalidManagementService); + setField(gitHubProjectService, "managementService", invalidManagementService); try { - gitHubService.getGitHubInstance(); + gitHubProjectService.getGitHubInstance(); } catch (RuntimeException e) { assertEquals(e.getMessage(), "GitHub service endpoint was not defined"); } @@ -407,12 +414,12 @@ public void testGetGitHubInstanceWithInvalidServiceEndpoint() throws IOException @Test public void testGetGitHubInstanceWithInvalidToken() throws IOException { - ManagementService invalidManagementService = new RemoteProjectManager("GitHub", ServiceType.GITHUB, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); + ManagementService invalidManagementService = new RemoteProjectManager("GitHub", ServiceType.GITHUB_PROJECT, TEST_PROJECT_URL1, TEST_PROJECT_TOKEN1); - setField(gitHubService, "managementService", invalidManagementService); + setField(gitHubProjectService, "managementService", invalidManagementService); try { - gitHubService.getGitHubInstance(); + gitHubProjectService.getGitHubInstance(); } catch (RuntimeException e) { assertEquals(e.getMessage(), "GitHub token was not defined"); } @@ -420,14 +427,14 @@ public void testGetGitHubInstanceWithInvalidToken() throws IOException { @Test public void testGetGitHubInstanceByToken() throws IOException { - GitHub gitHubInstance = gitHubService.getGitHubInstance(); + GitHub gitHubInstance = gitHubProjectService.getGitHubInstance(); assertNotNull("GitHub object was not created", gitHubInstance); } @Test public void testGetCardsWithNote() throws Exception { when(TEST_CARD1.getContent()).thenReturn(null); - List sprints = gitHubService.getAdditionalActiveSprints(); + List sprints = gitHubProjectService.getAdditionalActiveSprints(); assertEquals("Didn't get expected number of cards", 5, sprints.get(0).getCards().size()); } } \ No newline at end of file