From a110e1c0286c1562746adf88131c1247df521f70 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 17 Jun 2020 14:20:01 +0200
Subject: [PATCH] OO-4747: Don't update the last coach/user modified if fully
assessed is set
---
.../course/assessment/AssessmentManager.java | 3 +-
.../assessment/CourseAssessmentService.java | 2 +-
.../manager/CourseAssessmentManagerImpl.java | 19 ++++------
.../manager/CourseAssessmentServiceImpl.java | 4 +-
.../ConditionNodeAccessProvider.java | 7 ++--
.../LearningPathNodeAccessProvider.java | 22 +++++------
.../course/nodeaccess/NodeAccessProvider.java | 7 ++--
.../course/nodeaccess/NodeAccessService.java | 10 ++---
.../manager/NodeAccessServiceImpl.java | 13 +++----
.../run/preview/PreviewAssessmentManager.java | 2 +-
.../LearningPathNodeAccessProviderTest.java | 37 +++++++++----------
11 files changed, 55 insertions(+), 71 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/AssessmentManager.java b/src/main/java/org/olat/course/assessment/AssessmentManager.java
index 7e6a66238d6..526acdf55f8 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentManager.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentManager.java
@@ -112,10 +112,9 @@ public interface AssessmentManager {
* @param userCourseEnvironment
* @param fullyAssessed
* @param status
- * @param by
*/
public void updateFullyAssessed(CourseNode courseNode, UserCourseEnvironment userCourseEnvironment,
- Boolean fullyAssessed, AssessmentEntryStatus status, Role by);
+ Boolean fullyAssessed, AssessmentEntryStatus status);
/**
* Save an assessment comment for this node for a user. If there is already a comment property available,
diff --git a/src/main/java/org/olat/course/assessment/CourseAssessmentService.java b/src/main/java/org/olat/course/assessment/CourseAssessmentService.java
index 040c074c7a0..3e6d3d6eeea 100644
--- a/src/main/java/org/olat/course/assessment/CourseAssessmentService.java
+++ b/src/main/java/org/olat/course/assessment/CourseAssessmentService.java
@@ -130,7 +130,7 @@ public interface CourseAssessmentService {
Double completion, AssessmentEntryStatus status, Role by);
public void updateFullyAssessed(CourseNode courseNode, UserCourseEnvironment userCourseEnvironment,
- Boolean fullyAssessed, AssessmentEntryStatus status, Role by);
+ Boolean fullyAssessed, AssessmentEntryStatus status);
/**
* @param courseNode
diff --git a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
index 460504dd49c..bd205fc4e97 100644
--- a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
+++ b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
@@ -440,7 +440,7 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
assessmentService.updateAssessmentEntry(nodeAssessment);
DBFactory.getInstance().commit();
- nodeAccessService.onStatusUpdated(courseNode, userCourseEnvironment, status, by);
+ nodeAccessService.onStatusUpdated(courseNode, userCourseEnvironment, status);
DBFactory.getInstance().commit();
ScoreAccounting scoreAccounting = userCourseEnvironment.getScoreAccounting();
@@ -450,7 +450,7 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
@Override
public void updateFullyAssessed(CourseNode courseNode, UserCourseEnvironment userCourseEnvironment, Boolean fullyAssessed,
- AssessmentEntryStatus status, Role by) {
+ AssessmentEntryStatus status) {
Identity assessedIdentity = userCourseEnvironment.getIdentityEnvironment().getIdentity();
ICourse course = CourseFactory.loadCourse(cgm.getCourseEntry());
Boolean entryRoot = isEntryRoot(course, courseNode);
@@ -460,11 +460,6 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
return;
}
- if (by == Role.coach) {
- nodeAssessment.setLastCoachModified(new Date());
- } else if (by == Role.user) {
- nodeAssessment.setLastUserModified(new Date());
- }
nodeAssessment.setAssessmentStatus(status);
nodeAssessment.setFullyAssessed(fullyAssessed);
@@ -533,9 +528,9 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
assessmentEntry = assessmentService.updateAssessmentEntry(assessmentEntry);
DBFactory.getInstance().commit();
- nodeAccessService.onScoreUpdated(courseNode, userCourseEnv, score, assessmentEntry.getUserVisibility(), by);
- nodeAccessService.onPassedUpdated(courseNode, userCourseEnv, passed, assessmentEntry.getUserVisibility(), by);
- nodeAccessService.onStatusUpdated(courseNode, userCourseEnv, assessmentEntry.getAssessmentStatus(), by);
+ nodeAccessService.onScoreUpdated(courseNode, userCourseEnv, score, assessmentEntry.getUserVisibility());
+ nodeAccessService.onPassedUpdated(courseNode, userCourseEnv, passed, assessmentEntry.getUserVisibility());
+ nodeAccessService.onStatusUpdated(courseNode, userCourseEnv, assessmentEntry.getAssessmentStatus());
DBFactory.getInstance().commit();
//reevalute the tree
@@ -608,7 +603,7 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
assessmentEntry = assessmentService.updateAssessmentEntry(assessmentEntry);
DBFactory.getInstance().commit();
- nodeAccessService.onPassedUpdated(rootNode, userCourseEnvironment, passed, Boolean.TRUE, Role.coach);
+ nodeAccessService.onPassedUpdated(rootNode, userCourseEnvironment, passed, Boolean.TRUE);
DBFactory.getInstance().commit();
ScoreAccounting scoreAccounting = userCourseEnvironment.getScoreAccounting();
@@ -646,7 +641,7 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
DBFactory.getInstance().commit();
Boolean passed = assessmentEntry.getPassed();
- nodeAccessService.onPassedUpdated(rootNode, userCourseEnvironment, passed, Boolean.TRUE, Role.coach);
+ nodeAccessService.onPassedUpdated(rootNode, userCourseEnvironment, passed, Boolean.TRUE);
DBFactory.getInstance().commit();
ScoreAccounting scoreAccounting = userCourseEnvironment.getScoreAccounting();
diff --git a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
index 7515312791d..757c85e150c 100644
--- a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
+++ b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
@@ -196,11 +196,11 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
public void updateFullyAssessed(CourseNode courseNode, UserCourseEnvironment userCourseEnvironment,
- Boolean fullyAssessed, AssessmentEntryStatus status, Role by) {
+ Boolean fullyAssessed, AssessmentEntryStatus status) {
if (!userCourseEnvironment.isParticipant()) return;
AssessmentManager am = userCourseEnvironment.getCourseEnvironment().getAssessmentManager();
- am.updateFullyAssessed(courseNode, userCourseEnvironment, fullyAssessed, status, by);
+ am.updateFullyAssessed(courseNode, userCourseEnvironment, fullyAssessed, status);
}
@Override
diff --git a/src/main/java/org/olat/course/condition/ConditionNodeAccessProvider.java b/src/main/java/org/olat/course/condition/ConditionNodeAccessProvider.java
index f3c46dcbc60..82fbfbe78f0 100644
--- a/src/main/java/org/olat/course/condition/ConditionNodeAccessProvider.java
+++ b/src/main/java/org/olat/course/condition/ConditionNodeAccessProvider.java
@@ -35,7 +35,6 @@ import org.olat.course.run.CoursePaginationController;
import org.olat.course.run.userview.CourseTreeModelBuilder;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.course.tree.CourseEditorTreeModel;
-import org.olat.modules.assessment.Role;
import org.olat.modules.assessment.model.AssessmentEntryStatus;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
@@ -135,17 +134,17 @@ public class ConditionNodeAccessProvider implements NodeAccessProvider {
@Override
public void onScoreUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Float score,
- Boolean userVisibility, Role by) {
+ Boolean userVisibility) {
// nothing to do
}
@Override
- public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Boolean userVisibility, Role by) {
+ public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Boolean userVisibility) {
// nothing to do
}
@Override
public void onStatusUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv,
- AssessmentEntryStatus status, Role by) {
+ AssessmentEntryStatus status) {
// nothing to do
}
diff --git a/src/main/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProvider.java b/src/main/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProvider.java
index f7c7fa8672b..55253f6011c 100644
--- a/src/main/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProvider.java
+++ b/src/main/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProvider.java
@@ -39,7 +39,6 @@ import org.olat.course.run.CoursePaginationController;
import org.olat.course.run.userview.CourseTreeModelBuilder;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.course.tree.CourseEditorTreeModel;
-import org.olat.modules.assessment.Role;
import org.olat.modules.assessment.model.AssessmentEntryStatus;
import org.olat.repository.RepositoryEntry;
import org.springframework.beans.factory.annotation.Autowired;
@@ -135,7 +134,7 @@ public class LearningPathNodeAccessProvider implements NodeAccessProvider {
AssessmentEntryStatus status = getStatus(courseNode, userCourseEnv, result.isDone(),
result.isFullyAssessed());
courseAssessmentService.updateFullyAssessed(courseNode, userCourseEnv,
- Boolean.valueOf(result.isFullyAssessed()), status, Role.user);
+ Boolean.valueOf(result.isFullyAssessed()), status);
return true;
}
return false;
@@ -152,38 +151,37 @@ public class LearningPathNodeAccessProvider implements NodeAccessProvider {
@Override
public void onAssessmentConfirmed(CourseNode courseNode, UserCourseEnvironment userCourseEnv, boolean confirmed) {
FullyAssessedResult result = getConfigs(courseNode).isFullyAssessedOnConfirmation(confirmed);
- updateFullyAssessed(courseNode, userCourseEnv, Role.user, result);
+ updateFullyAssessed(courseNode, userCourseEnv, result);
}
@Override
public void onScoreUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Float score,
- Boolean userVisibility, Role by) {
+ Boolean userVisibility) {
FullyAssessedResult result = getConfigs(courseNode).isFullyAssessedOnScore(score, userVisibility);
- updateFullyAssessed(courseNode, userCourseEnv, by, result);
+ updateFullyAssessed(courseNode, userCourseEnv, result);
}
@Override
public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed,
- Boolean userVisibility, Role by) {
+ Boolean userVisibility) {
FullyAssessedResult result = getConfigs(courseNode).isFullyAssessedOnPassed(passed, userVisibility);
- updateFullyAssessed(courseNode, userCourseEnv, by, result);
+ updateFullyAssessed(courseNode, userCourseEnv, result);
}
@Override
public void onStatusUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv,
- AssessmentEntryStatus status, Role by) {
+ AssessmentEntryStatus status) {
FullyAssessedResult result = getConfigs(courseNode).isFullyAssessedOnStatus(status);
- updateFullyAssessed(courseNode, userCourseEnv, by, result);
+ updateFullyAssessed(courseNode, userCourseEnv, result);
}
- void updateFullyAssessed(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Role by,
- FullyAssessedResult result) {
+ void updateFullyAssessed(CourseNode courseNode, UserCourseEnvironment userCourseEnv, FullyAssessedResult result) {
boolean participant = userCourseEnv.isParticipant();
if (participant && result.isEnabled()) {
AssessmentEntryStatus status = getStatus(courseNode, userCourseEnv, result.isDone(),
result.isFullyAssessed());
courseAssessmentService.updateFullyAssessed(courseNode, userCourseEnv,
- Boolean.valueOf(result.isFullyAssessed()), status, by);
+ Boolean.valueOf(result.isFullyAssessed()), status);
}
}
diff --git a/src/main/java/org/olat/course/nodeaccess/NodeAccessProvider.java b/src/main/java/org/olat/course/nodeaccess/NodeAccessProvider.java
index 2005e63454a..2787ff100cf 100644
--- a/src/main/java/org/olat/course/nodeaccess/NodeAccessProvider.java
+++ b/src/main/java/org/olat/course/nodeaccess/NodeAccessProvider.java
@@ -28,7 +28,6 @@ import org.olat.course.run.CoursePaginationController;
import org.olat.course.run.userview.CourseTreeModelBuilder;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.course.tree.CourseEditorTreeModel;
-import org.olat.modules.assessment.Role;
import org.olat.modules.assessment.model.AssessmentEntryStatus;
/**
@@ -63,12 +62,12 @@ public interface NodeAccessProvider extends NodeAccessProviderIdentifier {
public void onAssessmentConfirmed(CourseNode courseNode, UserCourseEnvironment userCourseEnv, boolean confirmed);
public void onScoreUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Float score,
- Boolean userVisibility, Role by);
+ Boolean userVisibility);
- public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Boolean userVisibility, Role by);
+ public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Boolean userVisibility);
public void onStatusUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv,
- AssessmentEntryStatus status, Role by);
+ AssessmentEntryStatus status);
public void onCoursePublished(ICourse course);
diff --git a/src/main/java/org/olat/course/nodeaccess/NodeAccessService.java b/src/main/java/org/olat/course/nodeaccess/NodeAccessService.java
index 50f27cd077e..0eddafa3f48 100644
--- a/src/main/java/org/olat/course/nodeaccess/NodeAccessService.java
+++ b/src/main/java/org/olat/course/nodeaccess/NodeAccessService.java
@@ -31,7 +31,6 @@ import org.olat.course.run.CoursePaginationController;
import org.olat.course.run.userview.CourseTreeModelBuilder;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.course.tree.CourseEditorTreeModel;
-import org.olat.modules.assessment.Role;
import org.olat.modules.assessment.model.AssessmentEntryStatus;
/**
@@ -126,10 +125,9 @@ public interface NodeAccessService {
* @param userCourseEnv
* @param score
* @param userVisibility
- * @param by
*/
public void onScoreUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Float score,
- Boolean userVisibility, Role by);
+ Boolean userVisibility);
/**
* Hook after the update of the passed value of an assessment changed.
@@ -138,10 +136,9 @@ public interface NodeAccessService {
* @param userCourseEnv
* @param passed
* @param userVisibility
- * @param by
*/
public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed,
- Boolean userVisibility, Role by);
+ Boolean userVisibility);
/**
* Hook after the assessment status is updated.
@@ -149,10 +146,9 @@ public interface NodeAccessService {
* @param courseNode
* @param userCourseEnv
* @param status
- * @param by
*/
public void onStatusUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv,
- AssessmentEntryStatus status, Role by);
+ AssessmentEntryStatus status);
/**
* Hook after a course was published.
diff --git a/src/main/java/org/olat/course/nodeaccess/manager/NodeAccessServiceImpl.java b/src/main/java/org/olat/course/nodeaccess/manager/NodeAccessServiceImpl.java
index 55f679578f1..91a91648ea8 100644
--- a/src/main/java/org/olat/course/nodeaccess/manager/NodeAccessServiceImpl.java
+++ b/src/main/java/org/olat/course/nodeaccess/manager/NodeAccessServiceImpl.java
@@ -38,7 +38,6 @@ import org.olat.course.run.navigation.NodeVisitedListener;
import org.olat.course.run.userview.CourseTreeModelBuilder;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.course.tree.CourseEditorTreeModel;
-import org.olat.modules.assessment.Role;
import org.olat.modules.assessment.model.AssessmentEntryStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -138,23 +137,23 @@ public class NodeAccessServiceImpl implements NodeAccessService, NodeVisitedList
@Override
public void onScoreUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Float score,
- Boolean userVisibility, Role by) {
+ Boolean userVisibility) {
NodeAccessType type = NodeAccessType.of(userCourseEnv);
- getNodeAccessProvider(type).onScoreUpdated(courseNode, userCourseEnv, score, userVisibility, by);
+ getNodeAccessProvider(type).onScoreUpdated(courseNode, userCourseEnv, score, userVisibility);
}
@Override
public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed,
- Boolean userVisibility, Role by) {
+ Boolean userVisibility) {
NodeAccessType type = NodeAccessType.of(userCourseEnv);
- getNodeAccessProvider(type).onPassedUpdated(courseNode, userCourseEnv, passed, userVisibility, by);
+ getNodeAccessProvider(type).onPassedUpdated(courseNode, userCourseEnv, passed, userVisibility);
}
@Override
public void onStatusUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv,
- AssessmentEntryStatus status, Role by) {
+ AssessmentEntryStatus status) {
NodeAccessType type = NodeAccessType.of(userCourseEnv);
- getNodeAccessProvider(type).onStatusUpdated(courseNode, userCourseEnv, status, by);
+ getNodeAccessProvider(type).onStatusUpdated(courseNode, userCourseEnv, status);
}
@Override
diff --git a/src/main/java/org/olat/course/run/preview/PreviewAssessmentManager.java b/src/main/java/org/olat/course/run/preview/PreviewAssessmentManager.java
index bf693687f13..c8b835bf950 100644
--- a/src/main/java/org/olat/course/run/preview/PreviewAssessmentManager.java
+++ b/src/main/java/org/olat/course/run/preview/PreviewAssessmentManager.java
@@ -161,7 +161,7 @@ final class PreviewAssessmentManager implements AssessmentManager {
@Override
public void updateFullyAssessed(CourseNode courseNode, UserCourseEnvironment userCourseEnvironment, Boolean fullyAssessed,
- AssessmentEntryStatus status, Role by) {
+ AssessmentEntryStatus status) {
//
}
diff --git a/src/test/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProviderTest.java b/src/test/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProviderTest.java
index 21472eeb8be..08e52210cb1 100644
--- a/src/test/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProviderTest.java
+++ b/src/test/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProviderTest.java
@@ -39,7 +39,6 @@ import org.olat.course.learningpath.LearningPathNodeHandler;
import org.olat.course.nodes.CourseNode;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.modules.assessment.AssessmentEntry;
-import org.olat.modules.assessment.Role;
import org.olat.modules.assessment.model.AssessmentEntryImpl;
import org.olat.modules.assessment.model.AssessmentEntryStatus;
@@ -92,7 +91,7 @@ public class LearningPathNodeAccessProviderTest {
sut.onNodeVisited(courseNodeMock, participantCourseEnv);
verify(courseAssessmentService).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.done, Role.user);
+ AssessmentEntryStatus.done);
}
@Test
@@ -106,7 +105,7 @@ public class LearningPathNodeAccessProviderTest {
sut.onNodeVisited(courseNodeMock, participantCourseEnv);
verify(courseAssessmentService, never()).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.done, Role.user);
+ AssessmentEntryStatus.done);
}
@Test
@@ -120,7 +119,7 @@ public class LearningPathNodeAccessProviderTest {
sut.onNodeVisited(courseNodeMock, coachCourseEnv);
verify(courseAssessmentService, never()).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.done, Role.user);
+ AssessmentEntryStatus.done);
}
@Test
@@ -166,49 +165,49 @@ public class LearningPathNodeAccessProviderTest {
public void shouldNotSetFullyAssessedIfNotEnabled() {
FullyAssessedResult result = fullyAssessed(false, true, true);
- sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, Role.auto, result);
+ sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, result);
verify(courseAssessmentService, never()).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.done, Role.auto);
+ AssessmentEntryStatus.done);
}
@Test
public void shouldNotSetFullyAssessedIfNotParticipant() {
FullyAssessedResult result = fullyAssessed(false, true, true);
- sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, Role.auto, result);
+ sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, result);
verify(courseAssessmentService, never()).updateFullyAssessed(courseNodeMock, coachCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.done, Role.auto);
+ AssessmentEntryStatus.done);
}
@Test
public void shouldSetFullyAssessedToTrue() {
FullyAssessedResult result = fullyAssessed(true, true, true);
- sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, Role.auto, result);
+ sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, result);
verify(courseAssessmentService).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.done, Role.auto);
+ AssessmentEntryStatus.done);
}
@Test
public void shouldSetFullyAssessedToFalse() {
FullyAssessedResult result = fullyAssessed(true, false, true);
- sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, Role.auto, result);
+ sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, result);
verify(courseAssessmentService).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.FALSE,
- AssessmentEntryStatus.notStarted, Role.auto);
+ AssessmentEntryStatus.notStarted);
}
@Test
public void shouldSetStatusDone() {
FullyAssessedResult result = fullyAssessed(true, true, true);
- sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, Role.auto, result);
+ sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, result);
verify(courseAssessmentService).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.done, Role.auto);
+ AssessmentEntryStatus.done);
}
@Test
@@ -219,10 +218,10 @@ public class LearningPathNodeAccessProviderTest {
.thenReturn(assessmentEntry);
FullyAssessedResult result = fullyAssessed(true, true, false);
- sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, Role.auto, result);
+ sut.updateFullyAssessed(courseNodeMock, participantCourseEnv, result);
verify(courseAssessmentService).updateFullyAssessed(courseNodeMock, participantCourseEnv, Boolean.TRUE,
- AssessmentEntryStatus.inReview, Role.auto);
+ AssessmentEntryStatus.inReview);
}
@Test
@@ -234,21 +233,21 @@ public class LearningPathNodeAccessProviderTest {
@Test
public void shouldInvokeScoreConfig() {
- sut.onScoreUpdated(courseNodeMock, coachCourseEnv, null, null, null);
+ sut.onScoreUpdated(courseNodeMock, coachCourseEnv, null, null);
verify(configMock).isFullyAssessedOnScore(any(), any());
}
@Test
public void shouldInvokePassedConfig() {
- sut.onPassedUpdated(courseNodeMock, coachCourseEnv, null, null, null);
+ sut.onPassedUpdated(courseNodeMock, coachCourseEnv, null, null);
verify(configMock).isFullyAssessedOnPassed(any(), any());
}
@Test
public void onStatusUpdated() {
- sut.onStatusUpdated(courseNodeMock, coachCourseEnv, null, null);
+ sut.onStatusUpdated(courseNodeMock, coachCourseEnv, null);
verify(configMock).isFullyAssessedOnStatus(any());
}
--
GitLab