maece/HSG-MCS-HS21_tapas
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects Releases 6 Wiki Activity

Exercise 8 PR #95

Merged
reynisson merged 68 commits from dev into main 2021-11-29 06:46:44 +00:00
Conversation 6 Commits 68 Files Changed 136 +34 -27
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit af74eaaeeb - Show all commits

1
roster/src/main/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskController.java
View File

@@ -17,6 +17,7 @@ public class ApplyForTaskController {
this.applyForTaskUseCase = applyForTaskUseCase;
}
// TODO fix return type
/**
* Checks if task is available for the requesting executor.
* @return a task or null if no task found

2
roster/src/test/java/ch/unisg/roster/roster/AddNewAssignmentToRosterServiceSystemTest.java
View File

@@ -28,7 +28,7 @@ public class AddNewAssignmentToRosterServiceSystemTest {
String rosterItemId = "TEST-ID";
String executorType = "TEST-TYPE";
String executorURI = "TEST-URI";
String executorURI = "http://localhost:6969";
ResponseEntity response = whenAddNewAssignmentToRoster(rosterItemId, executorType, executorURI);

6
roster/src/test/java/ch/unisg/roster/roster/adapter/in/web/ApplyForTaskControllerTest.java
View File

@@ -37,12 +37,12 @@ public class ApplyForTaskControllerTest {
void testApplyForTask() throws Exception{
String executorType = "TEST-TYPE";
String executorURI = "TEST-URI";
String executorURI = "http://localhost:6969";
String taskId = "TEST-ID";
String jsonPayLoad = new JSONObject()
.put("executorType", executorType )
.put("executorUri",executorURI)
.put("executorURI",executorURI)
.toString();
RosterItem rosterItem = new RosterItem(taskId, executorType,
@@ -60,7 +60,7 @@ public class ApplyForTaskControllerTest {
mockMvc.perform(post("/task/apply/")
.contentType("application/json")
.content(jsonPayLoad))
.andExpect(status().isCreated());
.andExpect(status().is2xxSuccessful());
//TODO: No idea why this does not work yet
then(applyForTaskUseCase).should()

12
roster/src/test/java/ch/unisg/roster/roster/adapter/out/persistence/mongodb/RosterPersistenceAdapterTest.java
View File

@@ -10,9 +10,11 @@ import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataM
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import java.util.UUID;
import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@AutoConfigureDataMongo
@Import({RosterPersistenceAdapter.class, RosterMapper.class})
public class RosterPersistenceAdapterTest {
@@ -26,7 +28,7 @@ public class RosterPersistenceAdapterTest {
@Test
void addsNewRosterItem(){
String taskId = "TEST-ID";
String taskId = UUID.randomUUID().toString();
String executorType = "TEST-TYPE";
String executorURI = "TEST-URI";
@@ -35,6 +37,8 @@ public class RosterPersistenceAdapterTest {
executorType,
new ExecutorURI(executorURI)
);
adapterUnderTest.addRosterItem(testRosterItem);
MongoRosterDocument retrievedDoc = rosterRepository.findByTaskId(taskId);
@@ -48,7 +52,7 @@ public class RosterPersistenceAdapterTest {
@Test
void retrievesRosterItem(){
String taskId = "TEST-ID";
String taskId = UUID.randomUUID().toString();
String executorType = "TEST-TYPE";
String executorURI = "TEST-URI";
@@ -59,6 +63,6 @@ public class RosterPersistenceAdapterTest {
assertThat(retrievedRosterItem.getTaskID()).isEqualTo(taskId);
assertThat(retrievedRosterItem.getTaskType()).isEqualTo(executorType);
assertThat(retrievedRosterItem.getExecutorURI()).isEqualTo(executorURI);
assertThat(retrievedRosterItem.getExecutorURI().getValue().toString()).isEqualTo(executorURI);
}
}

2
roster/src/test/resources/application-test.properties
View File

@@ -1,2 +1,2 @@
spring.data.mongodb.uri=mongodb://127.0.0.1:27017
spring.data.mongodb.database=tapas-tasks
spring.data.mongodb.database=tapas-roster

38
tapas-tasks/src/test/java/ch/unisg/tapastasks/tasks/adapter/out/persistence/mongodb/TaskPersistenceAdapterTest.java
View File

@@ -26,28 +26,30 @@ public class TaskPersistenceAdapterTest {
@Test
void addsNewTask() {
// String testTaskId = UUID.randomUUID().toString();
// String testTaskName = "adds-persistence-task-name";
// String testTaskType = "adds-persistence-task-type";
// String testTaskOuri = "adds-persistence-test-task-ouri";
// String testTaskStatus = Task.Status.OPEN.toString();
// String testTaskListName = "tapas-tasks-tutors";
String testTaskId = UUID.randomUUID().toString();
String testTaskName = "adds-persistence-task-name";
String testTaskType = "adds-persistence-task-type";
String testTaskOuri = "adds-persistence-test-task-ouri";
String testTaskStatus = Task.Status.OPEN.toString();
String testTaskListName = "tapas-tasks-tutors";
// Task testTask = new Task(
// new Task.TaskId(testTaskId),
// new Task.TaskName(testTaskName),
// new Task.TaskType(testTaskType),
// new Task.OriginalTaskUri(testTaskOuri),
// new Task.TaskStatus(Task.Status.valueOf(testTaskStatus))
// );
// adapterUnderTest.addTask(testTask);
Task testTask = new Task(
new Task.TaskId(testTaskId),
new Task.TaskName(testTaskName),
new Task.TaskType(testTaskType),
new Task.OriginalTaskUri(testTaskOuri),
new Task.TaskStatus(Task.Status.valueOf(testTaskStatus)),
new Task.InputData("asd"),
new Task.OutputData("")
);
adapterUnderTest.addTask(testTask);
// MongoTaskDocument retrievedDoc = taskRepository.findByTaskId(testTaskId,testTaskListName);
MongoTaskDocument retrievedDoc = taskRepository.findByTaskId(testTaskId,testTaskListName);
// assertThat(retrievedDoc.taskId).isEqualTo(testTaskId);
// assertThat(retrievedDoc.taskName).isEqualTo(testTaskName);
// assertThat(retrievedDoc.taskListName).isEqualTo(testTaskListName);
assertThat(retrievedDoc.taskId).isEqualTo(testTaskId);
assertThat(retrievedDoc.taskName).isEqualTo(testTaskName);
assertThat(retrievedDoc.taskListName).isEqualTo(testTaskListName);
}