Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,12 @@ private List<StudentWorkAnnotation> getStudentDataForReferenceComponent(PeerGrou
String nodeId, String componentId, String fieldName) throws Exception {
Run run = peerGroup.getPeerGrouping().getRun();
ReferenceComponent component = getReferenceComponent(run, nodeId, componentId, fieldName);
String referenceComponentType = getProjectComponent(run, component.nodeId,
component.componentId).getType();
ProjectComponent referenceProjectComponent = component == null ? null
: getProjectComponent(run, component.nodeId, component.componentId);
if (referenceProjectComponent == null) {
return new ArrayList<StudentWorkAnnotation>();
}
String referenceComponentType = referenceProjectComponent.getType();
if (referenceComponentType.equals("MultipleChoice")) {
return getStudentDataForMultipleChoice(peerGroup, component);
} else if (referenceComponentType.equals("OpenResponse")) {
Expand Down Expand Up @@ -92,6 +96,9 @@ private List<StudentWorkAnnotation> getStudentDataForOpenResponse(PeerGroup peer
private ReferenceComponent getReferenceComponent(Run run, String nodeId, String componentId,
String fieldName) throws IOException, JSONException, ObjectNotFoundException {
ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId);
if (projectComponent == null) {
return null;
}
JSONObject referenceComponentJSON = projectComponent.getJSONObject(fieldName);
return new ReferenceComponent(referenceComponentJSON);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ protected boolean isTeacherOfRun(Authentication auth, Run run) {
protected boolean isComponentType(Run run, String nodeId, String componentId,
String expectedComponentType) throws IOException, JSONException, ObjectNotFoundException {
ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId);
return projectComponent.getString("type").equals(expectedComponentType);
return projectComponent != null
&& projectComponent.getString("type").equals(expectedComponentType);
}

protected ProjectComponent getProjectComponent(Run run, String nodeId, String componentId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ private boolean isValidGraphComponent(Run run, String nodeId, String componentId
String showWorkNodeId, String showWorkComponentId, String showClassmateWorkSource)
throws IOException, JSONException, ObjectNotFoundException {
ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId);
return isGraphComponent(projectComponent) && hasMatchingConnectedComponent(projectComponent,
showWorkNodeId, showWorkComponentId, showClassmateWorkSource);
return projectComponent != null && isGraphComponent(projectComponent)
&& hasMatchingConnectedComponent(projectComponent, showWorkNodeId, showWorkComponentId,
showClassmateWorkSource);
}

private boolean isGraphComponent(ProjectComponent projectComponent) throws JSONException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ private boolean isValidShowPeerGroupWorkComponent(Run run, String nodeId, String
String showWorkNodeId, String showWorkComponentId)
throws JSONException, IOException, ObjectNotFoundException {
ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId);
return projectComponent.getString("type").equals(SHOW_PEER_GROUP_WORK_TYPE)
return projectComponent != null
&& projectComponent.getString("type").equals(SHOW_PEER_GROUP_WORK_TYPE)
&& projectComponent.getString("showWorkNodeId").equals(showWorkNodeId)
&& projectComponent.getString("showWorkComponentId").equals(showWorkComponentId);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,54 @@ public void getStudentDataForDynamicPrompt_InvalidDynamicPromptContent_Exception
verifyAll();
}

@Test
public void getStudentDataForDynamicPrompt_ComponentNotInProject_ReturnEmptyList()
throws Exception {
expectUserInPeerGroup();
expectInvalidDynamicPromptContent();
replayAll();
List<StudentWorkAnnotation> studentWorkAnnotation = controller
.getStudentDataForDynamicPrompt(peerGroup1, run1Node2Id, run1Component1Id, studentAuth);
assertTrue(studentWorkAnnotation.isEmpty());
verifyAll();
}

@Test
public void getStudentDataForQuestionBank_ReferenceComponentNotInProject_ReturnEmptyList()
throws Exception {
expectUserInPeerGroup();
String project_with_missing_reference_component = """
{
"nodes": [
{
"id": "%s",
"type": "node",
"components": [
{
"id": "%s",
"type": "OpenResponse",
"questionBank": {
"peerGroupingTag": "%s",
"referenceComponent": {
"nodeId": "%s",
"componentId": "%s"
}
}
}
]
}
]
}""".formatted(run1Node2Id, run1Component2Id, peerGrouping1Tag, run1Node1Id,
run1Component1Id);
expect(projectService.getProjectContent(project1))
.andReturn(project_with_missing_reference_component).times(2);
replayAll();
List<StudentWorkAnnotation> studentWorkAnnotation = controller
.getStudentDataForQuestionBank(peerGroup1, run1Node2Id, run1Component2Id, studentAuth);
assertTrue(studentWorkAnnotation.isEmpty());
verifyAll();
}

private void expectInvalidDynamicPromptContent() throws IOException {
String project_sans_reference_component = """
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,29 @@ public void getClassmateDiscussionWork_NotDiscussionComponent_ThrowException()
verifyAll();
}

@Test
public void getClassmateDiscussionWork_ComponentNotInProject_ThrowException()
throws IOException, NoSuchMethodException, ObjectNotFoundException {
setupStudent1InRunAndInPeriod();
expectComponentType(controller.DISCUSSION_TYPE);
replayAll();
assertThrows(AccessDeniedException.class, () -> controller
.getClassmateDiscussionWork(studentAuth, run1, run1Period1Id, NODE_ID1, "null"));
verifyAll();
}

@Test
public void getClassmateDiscussionAnnotations_NodeNotInProject_ThrowException()
throws IOException, NoSuchMethodException, ObjectNotFoundException {
setupStudent1InRunAndInPeriod();
expectComponentType(controller.DISCUSSION_TYPE);
replayAll();
assertThrows(AccessDeniedException.class, () -> controller
.getClassmateDiscussionAnnotations(studentAuth, run1, run1Period1Id, OTHER_NODE_ID,
COMPONENT_ID1));
verifyAll();
}

@Test
public void getClassmateDiscussionWork_InRunDiscussionComponent_ReturnWork()
throws IOException, NoSuchMethodException, ObjectNotFoundException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@ public void getClassmateGraphWorkInPeriod_NotGraphComponent_ThrowException()
verifyAll();
}

@Test
public void getClassmateGraphWorkInPeriod_ComponentNotInProject_ThrowException()
throws IOException, NoSuchMethodException, ObjectNotFoundException {
setupStudent1InRunAndInPeriod();
expectComponentType(controller.GRAPH_TYPE);
replayAll();
assertThrows(AccessDeniedException.class,
() -> controller.getClassmateGraphWorkInPeriod(studentAuth, run1, NODE_ID1,
OTHER_COMPONENT_ID, SHOW_WORK_NODE_ID, SHOW_WORK_COMPONENT_ID, run1Period1Id));
verifyAll();
}

@Test
public void getClassmateGraphWorkInPeriod_InvalidNodeId_ThrowException()
throws IOException, NoSuchMethodException, ObjectNotFoundException {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.wise.portal.presentation.web.controllers.student;

import static org.junit.jupiter.api.Assertions.*;

import java.io.IOException;

import org.easymock.EasyMockExtension;
import org.easymock.TestSubject;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.security.access.AccessDeniedException;
import org.wise.portal.dao.ObjectNotFoundException;
import org.wise.portal.presentation.web.controllers.peergroup.AbstractPeerGroupWorkControllerTest;

@ExtendWith(EasyMockExtension.class)
public class PeerGroupWorkControllerTest extends AbstractPeerGroupWorkControllerTest {

@TestSubject
private PeerGroupWorkController controller = new PeerGroupWorkController();

@Test
public void getPeerGroupWork_NotShowGroupWorkComponent_ThrowException()
throws IOException, ObjectNotFoundException {
expectUserInPeerGroup();
expectComponentType(run1Node1Id, run1Component1Id, "OpenResponse");
replayAll();
assertThrows(AccessDeniedException.class, () -> controller.getPeerGroupWork(studentAuth,
peerGroup1, run1Node1Id, run1Component1Id, run1Node2Id, run1Component2Id));
verifyAll();
}

@Test
public void getPeerGroupWork_ComponentNotInProject_ThrowException()
throws IOException, ObjectNotFoundException {
expectUserInPeerGroup();
expectComponentType(run1Node1Id, run1Component1Id,
controller.SHOW_PEER_GROUP_WORK_TYPE);
replayAll();
assertThrows(AccessDeniedException.class, () -> controller.getPeerGroupWork(studentAuth,
peerGroup1, run1Node1Id, run1Component2Id, run1Node2Id, run1Component2Id));
verifyAll();
}
}
Loading