refactor completed

Author: braintelligencePL

src/main/kotlin/pl/braintelligence/projectmanager/core/projects/ports/incoming/ProjectQueryPort.kt

@@ -6,4 +6,5 @@ interface ProjectQueryPort {
 
  fun getProject(id: String): Project
 
+ fun getProjects(): List<Project>
 }

src/test/groovy/pl/braintelligence/projectmanager/base/BaseUnitTest.groovy

@@ -1,28 +1,8 @@
 package pl.braintelligence.projectmanager.base
 
-import pl.braintelligence.projectmanager.core.projects.domain.ProjectFactory
-import pl.braintelligence.projectmanager.core.projects.domain.configuration.InMemoryProjectRepository
-import pl.braintelligence.projectmanager.core.projects.domain.configuration.ProjectConfiguration
-import pl.braintelligence.projectmanager.core.projects.ports.incoming.ProjectCreatorPort
-import pl.braintelligence.projectmanager.core.projects.ports.incoming.ProjectQueryPort
-import pl.braintelligence.projectmanager.core.team.domain.configuration.TeamConfiguration
-import pl.braintelligence.projectmanager.core.team.ports.incoming.TeamManager
+
 import spock.lang.Specification
 
 class BaseUnitTest extends Specification implements BaseDtoObjects {
 
- // teams
- protected TeamManager teamService = new TeamConfiguration().teamManager()
-
- // projects
- protected InMemoryProjectRepository inMemoryProjectRepository = new InMemoryProjectRepository()
-
- protected ProjectCreatorPort projectCreator =
- new ProjectConfiguration()
- .buildProjectCreator(Mock(ProjectFactory), inMemoryProjectRepository)
-
- protected ProjectQueryPort projectQuery =
- new ProjectConfiguration()
- .buildProjectQuery(inMemoryProjectRepository)
-
 }

src/test/groovy/pl/braintelligence/projectmanager/project/ProjectAcceptanceTest.groovy

@@ -1,6 +1,6 @@
 package pl.braintelligence.projectmanager.project
 
-import org.springframework.core.ParameterizedTypeReference
+
 import org.springframework.http.HttpStatus
 import pl.braintelligence.projectmanager.base.BaseIntegrationTest
 import pl.braintelligence.projectmanager.core.projects.domain.Project

src/test/groovy/pl/braintelligence/projectmanager/project/base/BaseProjectUnitTest.groovy

@@ -0,0 +1,47 @@
+package pl.braintelligence.projectmanager.project.base
+
+import pl.braintelligence.projectmanager.base.BaseUnitTest
+import pl.braintelligence.projectmanager.core.projects.domain.Project
+import pl.braintelligence.projectmanager.core.projects.domain.ProjectFactory
+import pl.braintelligence.projectmanager.core.projects.domain.Status
+import pl.braintelligence.projectmanager.core.projects.domain.configuration.InMemoryProjectRepository
+import pl.braintelligence.projectmanager.core.projects.domain.configuration.ProjectConfiguration
+import pl.braintelligence.projectmanager.core.projects.ports.incoming.ProjectCreatorPort
+import pl.braintelligence.projectmanager.core.projects.ports.incoming.ProjectQueryPort
+
+class BaseProjectUnitTest extends BaseUnitTest {
+
+ protected InMemoryProjectRepository inMemoryProjectRepository = new InMemoryProjectRepository()
+
+ protected ProjectCreatorPort projectCreator =
+ new ProjectConfiguration()
+ .buildProjectCreator(Mock(ProjectFactory), inMemoryProjectRepository)
+
+ protected ProjectQueryPort projectQuery =
+ new ProjectConfiguration()
+ .buildProjectQuery(inMemoryProjectRepository)
+
+ protected void verifyProjectDraft(Project project) {
+ assert with(project) {
+ id != null
+ name == newProjectDraftDto.projectName
+ status == Status.TO_DO
+ teamAssigned == ""
+ features == []
+ }
+ }
+
+ protected void verifyProjectWithFeatures(Project project) {
+ assert with(project) {
+ id != null
+ name == newProjectWithFeaturesDto.projectName
+ status == Status.TO_DO
+ teamAssigned.isBlank()
+ with(features[0]) {
+ name == newProjectWithFeaturesDto.features[0].name
+ status == newProjectWithFeaturesDto.features[0].status
+ priorityLevel == newProjectWithFeaturesDto.features[0].priorityLevel
+ }
+ }
+ }
+}

src/test/groovy/pl/braintelligence/projectmanager/project/domain/ProjectCreationTest.groovy

@@ -1,44 +1,23 @@
 package pl.braintelligence.projectmanager.project.domain
 
-import pl.braintelligence.projectmanager.base.BaseUnitTest
-import pl.braintelligence.projectmanager.core.projects.domain.Status
 
-class ProjectCreationTest extends BaseUnitTest {
+import pl.braintelligence.projectmanager.project.base.BaseProjectUnitTest
+
+class ProjectCreationTest extends BaseProjectUnitTest {
 
  def "Should create a project draft and browse for it"() {
  when:
  def project = projectCreator.createProjectDraft(newProjectDraftDto)
 
  then:
- project != null
+ verifyProjectDraft(project)
  }
 
- def "Should create project with features"() {
+ def "Should create project with features and browse it"() {
  when:
  def project = projectCreator.createProjectWithFeatures(newProjectWithFeaturesDto)
 
  then:
- project != null
- }
-
- def "Should browse for project with features (defaults)"() {
- given:
- def project = projectCreator.createProjectWithFeatures(newProjectWithFeaturesDto)
-
- when:
- def response = projectQuery.getProject(project.id)
-
- then:
- with(response) {
- id != null
- name == newProjectWithFeaturesDto.projectName
- status == Status.TO_DO
- teamAssigned.isBlank()
- with(features[0]) {
- name == newProjectWithFeaturesDto.features[0].name
- status == newProjectWithFeaturesDto.features[0].status
- priorityLevel == newProjectWithFeaturesDto.features[0].priorityLevel
- }
- }
+ verifyProjectWithFeatures(project)
  }
 }

src/test/groovy/pl/braintelligence/projectmanager/project/domain/ProjectQueryTest.groovy

@@ -0,0 +1,18 @@
+package pl.braintelligence.projectmanager.project.domain
+
+import pl.braintelligence.projectmanager.project.base.BaseProjectUnitTest
+
+class ProjectQueryTest extends BaseProjectUnitTest {
+
+ def "Should browse for project"() {
+ given:
+ def project = projectCreator.createProjectWithFeatures(newProjectWithFeaturesDto)
+
+ when:
+ def response = projectQuery.getProject(project.id)
+
+ then:
+ verifyProjectWithFeatures(response)
+ }
+
+}

src/test/groovy/pl/braintelligence/projectmanager/team/base/BaseTeamUnitTest.groovy

@@ -0,0 +1,11 @@
+package pl.braintelligence.projectmanager.team.base
+
+import pl.braintelligence.projectmanager.base.BaseUnitTest
+import pl.braintelligence.projectmanager.core.team.domain.configuration.TeamConfiguration
+import pl.braintelligence.projectmanager.core.team.ports.incoming.TeamManager
+
+class BaseTeamUnitTest extends BaseUnitTest {
+
+ protected TeamManager teamService = new TeamConfiguration().teamManager()
+
+}

src/test/groovy/pl/braintelligence/projectmanager/team/domain/AddingTeamMembersToTeamTest.groovy

@@ -1,9 +1,9 @@
 package pl.braintelligence.projectmanager.team.domain
 
 
-import pl.braintelligence.projectmanager.base.BaseUnitTest
+import pl.braintelligence.projectmanager.team.base.BaseTeamUnitTest
 
-class AddingTeamMembersToTeamTest extends BaseUnitTest {
+class AddingTeamMembersToTeamTest extends BaseTeamUnitTest {
 
  def "Should add member to a team"() {
  given: "new team is created"

src/test/groovy/pl/braintelligence/projectmanager/team/domain/TeamCreationTest.groovy

@@ -1,9 +1,8 @@
 package pl.braintelligence.projectmanager.team.domain
 
+import pl.braintelligence.projectmanager.team.base.BaseTeamUnitTest
 
-import pl.braintelligence.projectmanager.base.BaseUnitTest
-
-class TeamCreationTest extends BaseUnitTest {
+class TeamCreationTest extends BaseTeamUnitTest {
 
  def "Should create a team (with default values)"() {
  given:

src/test/groovy/pl/braintelligence/projectmanager/team/domain/TeamMembersValidationTest.groovy

@@ -1,11 +1,12 @@
 package pl.braintelligence.projectmanager.team.domain
 
-import pl.braintelligence.projectmanager.base.BaseUnitTest
+
 import pl.braintelligence.projectmanager.core.team.domain.InvalidTeamMemberException
 import pl.braintelligence.projectmanager.infrastructure.adapter.incoming.rest.dto.TeamMember
+import pl.braintelligence.projectmanager.team.base.BaseTeamUnitTest
 import spock.lang.Unroll
 
-class TeamMembersValidationTest extends BaseUnitTest {
+class TeamMembersValidationTest extends BaseTeamUnitTest {
 
  def "Should add member to a team"() {
  given: "team is created"